20191129 修改成加密的doctorId

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

@@ -15,8 +15,8 @@ import io.swagger.annotations.ApiModelProperty;
 public class LoginResult {
     @ApiModelProperty("token")
     private String token;
-    @ApiModelProperty("用户id,已经加密处理")
-    private String userId;
+    @ApiModelProperty("用户id,未加密处理Web需要")
+    private Long userId;
     @ApiModelProperty("是否绑定")
     private String bindFlag;
     @ApiModelProperty("联合登录id")
@@ -25,6 +25,8 @@ public class LoginResult {
     private int entireFlag;
     @ApiModelProperty("未加密手机号")
     private String mobile;
+    @ApiModelProperty("用户id,已经加密处理")
+    private String doctorId;
 
     public String getToken() {
         return token;
@@ -34,12 +36,12 @@ public class LoginResult {
         this.token = token;
     }
 
-    public String getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
-        this.userId = AESUtil.encryptV0(userId);
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
     public String getBindFlag() {
@@ -73,4 +75,12 @@ public class LoginResult {
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = AESUtil.encryptV0(doctorId);
+    }
 }

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

@@ -122,7 +122,7 @@ public class LoginServiceImpl implements LoginService {
                 String newToken = tokenUtils.generateToken(account);
                 LoginResult result = new LoginResult();
                 result.setToken(newToken);
-                result.setUserId(userId+"");
+                result.setUserId(userId.longValue());
                 result.setMobile(mobile);
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
@@ -171,7 +171,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.setMobile(baseRequest.getMobile());
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
@@ -213,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);
@@ -244,7 +244,7 @@ public class LoginServiceImpl implements LoginService {
                 //双写模式下,要在doctor表存储unionId
                 if (result.getUserId()!=null) {
                     Doctor doctor = new Doctor();
-                    doctor.setId(Integer.parseInt(result.getUserId()));
+                    doctor.setId(result.getUserId().intValue());
                     doctor.setUnionid(request.getUnionId());
                     doctorInfoMapper.updateByPrimaryKeySelective(doctor);
                 }

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

@@ -139,7 +139,7 @@ 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();

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

@@ -168,7 +168,8 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
-        String content = "13916000001";
+        String content = "13024112588";
+
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 

server/src/main/resources/bootstrap.properties

-spring.profiles.active=dev
\ No newline at end of file
+spring.profiles.active=uat
\ No newline at end of file