20191108 返回手机号

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

 package com.pica.cloud.account.account.server.entity;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.pica.cloud.account.account.server.util.AESUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,15 +15,15 @@ import io.swagger.annotations.ApiModelProperty;
 public class LoginResult {
     @ApiModelProperty("token")
     private String token;
-    @ApiModelProperty("用户id")
-    private Long userId;
+    @ApiModelProperty("用户id,已经加密处理")
+    private String userId;
     @ApiModelProperty("是否绑定")
     private String bindFlag;
     @ApiModelProperty("联合登录id")
     private String unionId;
     @ApiModelProperty("是否完善过信息，1.信息未补全， 2信息已补全，3已补全密码")
     private int entireFlag;
-    @ApiModelProperty("加密手机号")
+    @ApiModelProperty("未加密手机号")
     private String mobile;
 
     public String getToken() {
@@ -33,12 +34,12 @@ public class LoginResult {
         this.token = token;
     }
 
-    public Long getUserId() {
+    public String getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setUserId(String userId) {
+        this.userId = AESUtil.encryptV0(userId);
     }
 
     public String getBindFlag() {

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -122,7 +122,8 @@ public class LoginServiceImpl implements LoginService {
                 String newToken = tokenUtils.generateToken(account);
                 LoginResult result = new LoginResult();
                 result.setToken(newToken);
-                result.setUserId(userId.longValue());
+                result.setUserId(userId+"");
+                result.setMobile(mobile);
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
                 }
@@ -170,7 +171,8 @@ public class LoginServiceImpl implements LoginService {
         String newToken = tokenUtils.generateToken(account);
         LoginResult result = new LoginResult();
         result.setToken(newToken);
-        result.setUserId(userId);
+        result.setUserId(userId+"");
+        result.setMobile(baseRequest.getMobile());
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
             Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
@@ -179,7 +181,6 @@ public class LoginServiceImpl implements LoginService {
         //记录登录日志
         LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, baseRequest.getProductType(), baseRequest.getSourceType(),
                 loginType, baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
-        ;
         picaLogUtils.info(entity);
         return result;
     }
@@ -212,7 +213,7 @@ public class LoginServiceImpl implements LoginService {
             String newToken = tokenUtils.generateToken(account);
             LoginResult result = new LoginResult();
             result.setToken(newToken);
-            result.setUserId(userId);
+            result.setUserId(userId+"");
             result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode()+"");
             if (request.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                 PICAPDoctor doctor = doctorInfoMapper.queryDoctor(userId);
@@ -243,7 +244,7 @@ public class LoginServiceImpl implements LoginService {
                 //双写模式下,要在doctor表存储unionId
                 if (result.getUserId()!=null) {
                     Doctor doctor = new Doctor();
-                    doctor.setId(result.getUserId().intValue());
+                    doctor.setId(Integer.parseInt(result.getUserId()));
                     doctor.setUnionid(request.getUnionId());
                     doctorInfoMapper.updateByPrimaryKeySelective(doctor);
                 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -139,8 +139,9 @@ public class RegisterServiceImpl implements RegisterService {
 
                     LoginResult result = new LoginResult();
                     result.setToken(newToken);
-                    result.setUserId(userId);
+                    result.setUserId(userId+"");
                     result.setEntireFlag(1);
+                    result.setMobile(mobile);
                   /*  ByteArrayOutputStream bos = new ByteArrayOutputStream();
                     DataOutputStream dos = new DataOutputStream(bos);
                     try {

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

@@ -168,18 +168,16 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
-        String content = "15607241351";
+        String content = "13916000001";
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 
-        System.out.println(
-        "-------------解密---------");
+        System.out.println("-------------解密---------");
         String encrypt = aesEncrypt(content, KEY);
         System.out.println("加密后：" + encrypt);
         String decrypt = aesDecrypt(encrypt, KEY);
         System.out.println("解密后：" + decrypt);
 
-
           //请求参数解密处理
 //        String key="Vi/4mtanXFW8huqyNi5/XMRWzTkMVFkHCDE53g49ye4AqUsaiKbINdmkFD+g+RyKeS2tEb+6ELukic3GCtZd0wT4iNzK9YVZoMDFQ9JaZwMn0HXSefnSGociozj5hRXHaim3oOuufRKmtJw372rVg4DEVuGLaIpBzdB5wNlaTbY=";
 //        String decrypt = RSAUtil.decrypt(key,privateKey);