20191022 数据加密传输

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java

@@ -146,7 +146,7 @@ public class AccountController extends AccountBaseController {
     }
 
     @ApiOperation("H5端一键登录功能,无需完善信息")
-    @PostMapping("/login-register")
+    @PostMapping("/login-register/v1")
     public PicaResponse loginRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         this.checkMobilePhone(request.getMobile());
@@ -260,4 +260,49 @@ public class AccountController extends AccountBaseController {
         return newToken;
     }
 
+    /**
+     * 旧的注册接口，下个版本可以去掉
+     * @param req
+     * @return
+     */
+    @ApiOperation("H5端一键登录功能,无需完善信息 旧接口")
+    @PostMapping("/login-register")
+    public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
+        this.checkMobilePhone(req.getMobilePhone());
+        req.setPassword(null);  //登录或注册，只能使用验证码
+
+        //判断账号是否已经存在
+        Account account = accountService.getByMobilePhone(req.getMobilePhone());
+        if (account != null) {
+            return this.login(req);  //登录
+        } else {
+            return this.registerOld(req);  //注册
+        }
+    }
+
+    public PicaResponse<String> registerOld(@RequestBody AccountReq req) {
+        this.checkMobilePhone(req.getMobilePhone());
+        this.checkAuthCode(req);
+        String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
+        Account account = new Account();
+        account.setMobilePhone(req.getMobilePhone());
+        switch (deviceType) {  //注册来源
+            case "1":
+                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
+                break;
+            case "2":
+                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
+                break;
+            case "3":
+                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
+                break;
+            default:
+                account.setRegisterSource(7);  //H5注册
+        }
+        //创建账号
+        accountService.createAccount(account);
+        //生成token并返回
+        String newToken = this.generateToken(account, deviceType);
+        return PicaResponse.toResponse(newToken);
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/util/CryptoUtil.java

@@ -57,16 +57,16 @@ public class CryptoUtil {
      */
     public static <T> T decrypt(EncryptEntity encryptEntity, Class<T> zClass) throws Exception {
         //获取解密密钥
-//        String decryptKey = RSAUtil.decrypt(encryptEntity.getKey());
-//        //解密数据
-//        String content = AESUtil.aesDecrypt(encryptEntity.getContent(),decryptKey);
-//        //反序列化成对象
-//        T request = JSONObject.parseObject(content, zClass);
-//        return request;
-
-        T request = JSONObject.parseObject(encryptEntity.getContent(), zClass);
+        String decryptKey = RSAUtil.decrypt(encryptEntity.getKey());
+        //解密数据
+        String content = AESUtil.aesDecrypt(encryptEntity.getContent(),decryptKey);
+        //反序列化成对象
+        T request = JSONObject.parseObject(content, zClass);
         return request;
 
+//        T request = JSONObject.parseObject(encryptEntity.getContent(), zClass);
+//        return request;
+
     }
 
 }