20190923 静态变量的注册问题解决

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

@@ -4,6 +4,7 @@ import com.pica.cloud.account.account.server.util.RSAUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,4 +26,5 @@ public class CipherController {
     public PicaResponse<String> getPublicKey() {
         return PicaResponse.toResponse(rsaPublicKey);
     }
+
 }

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

@@ -11,7 +11,7 @@ public interface DoctorMapper {
      * @param mobile 手机号
      * @return
      */
-    DoctorEntity getDoctorInfoByMobile(String mobile);
+    Doctor getDoctorInfoByMobile(String mobile);
 
 
     /**

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

@@ -8,10 +8,7 @@ import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
-import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
-import com.pica.cloud.account.account.server.mapper.AccountUnionMapper;
-import com.pica.cloud.account.account.server.mapper.AccountWeChatInfoMapper;
-import com.pica.cloud.account.account.server.mapper.DoctorMapper;
+import com.pica.cloud.account.account.server.mapper.*;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.LoginService;
 import com.pica.cloud.account.account.server.service.RegisterService;
@@ -46,6 +43,9 @@ public class LoginServiceImpl implements LoginService {
     @Autowired
     private AccountWeChatInfoMapper accountWeChatInfoMapper;
 
+    @Autowired
+    private AccountPatientInfoMapper accountPatientInfoMapper;
+
     @Autowired
     private AccountLogUtils picaLogUtils;
 
@@ -88,9 +88,16 @@ public class LoginServiceImpl implements LoginService {
                 Integer acctId = accountInfoEntity.getId();
                 int productType = request.getProductType();
                 int sourceType = request.getSourceType();
-                Long userId = accountUtils.getUserIdByAcctId(productType, acctId);
+                Doctor doctorInfo=doctorInfoMapper.getDoctorInfoByMobile(encrypt);
+                Integer userId = 0;
+                if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
+                    userId = doctorInfo.getId();
+                } else if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
+                    AccountPatientInfoEntity accountPatientInfoEntity = accountPatientInfoMapper.selectByAcctId(acctId);
+                    userId = accountPatientInfoEntity.getId();
+                }
                 Account account = new Account();
-                account.setId(userId);
+                account.setId(userId.longValue());
                 account.setAcctId(acctId);
                 account.setCreatTime(currentTime);
                 account.setMobilePhone(mobile);
@@ -100,10 +107,9 @@ public class LoginServiceImpl implements LoginService {
                 jsonObject.put(Constants.TOKEN, newToken);
                 jsonObject.put(Constants.USER_ID, userId);
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
-                    Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
-                    jsonObject.put(Constants.USER_ENTIRE_FLAG, doctorEntity.getEntireFlag());
+                    jsonObject.put(Constants.USER_ENTIRE_FLAG, doctorInfo.getEntireFlag());
                 }
-                LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, request.getSourceType(),
+                LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, sourceType,
                         AccountTypeEnum.LOGIN_PWD.getCode(), request.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
                         AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
                 picaLogUtils.info(entity);

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

@@ -2,7 +2,11 @@ package com.pica.cloud.account.account.server.util;
 
 
 import org.apache.tomcat.util.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.crypto.Cipher;
 import java.security.*;
 import java.security.interfaces.RSAPrivateKey;
@@ -16,24 +20,24 @@ import java.util.Map;
 /**
  * RSA加解密工具类
  */
+@Component
 public class RSAUtil {
-
-    //用于封装随机产生的公钥与私钥
     private static Map<Integer, String> keyMap = new HashMap<>();
 
-    private static final String rsaprivatekey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAO+zh8bnUA+elnRy1BHKEGrbTmh/" +
-            "r71zFboVTznwAuEzPnvOezQBOY+623mIXh86/cyCLlCRzbGm0Q5M3LSY6sTemNXtupVnb1lWwD1xDrSG0JsCgeS/weCLI9gHaknNuMfVlg+" +
-            "5esYcy2JlyG5ldcJahCgAOog2lJr4pLUSj8fJAgMBAAECgYEAiJIlnjJU71FQL/Ds22XhjMB/IBMAMlTL4EYb6crSGTV1OF0g3TSFc1rniY" +
-            "sk9W5LBKZ3dPhd1gZRvnAUn+EwgPh1bVBG0Z30vr2Ea0w9v+D3T96byeCKh+xoKQqG+Yp+u5w8v6MNNX6sVN2D0gks9YgY+2xGEeAf9kuF5" +
-            "gpHhAECQQD65WyV3dI8uO4tQEBnS6LRAWVFuEZEWp1W8MXm5DUz/Tnsd7eAdg3VRdS1rZJ17pLa9umFtL/FUVWmw++zeABhAkEA9JPOqXlr" +
-            "vB/GjLl9g3YJBpPjA7UhWHZ6vn8bUq55noengQQL0l2mrJfEFXVHLs0m9lV3tAURpgpuraLkd/ugaQJATFBITPVhozKkz4LBlCm/Zk9EXIa" +
-            "GaPge73jg2TAEtsGJQtHPMPW3k21gG7ql19UvOgbsVMz7n6rzoHvshuwzQQJAY92WnQy/OOmgoQV8gplHxi/Mmk7zdrOqGu67sV8cueaaNs" +
-            "v4J8WlsQOnRTvF/Q43wo3TeuY29p1749qHf5Z3QQJBANnZYSe93QlOT+6PFT1Dkv8osnOY/93CZYD2IvTpfXfqJnbBZ9bkSe7xcxIIqGO6M" +
-            "JWlZjItnYBZLLHP3JKVgOQ=";
+    private static String rsaprivatekey;
+
+    public static String rsapublickey;
 
-    public static final String rsapublickey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDvs4fG51APnpZ0ctQRyhBq205of6+9cxW6FU858" +
-            "ALhMz57zns0ATmPutt5iF4fOv3Mgi5Qkc2xptEOTNy0mOrE3pjV7bqVZ29ZVsA9cQ60htCbAoHkv8HgiyPYB2pJzbjH1ZYPuXrGHMtiZchu" +
-            "ZXXCWoQoADqINpSa+KS1Eo/HyQIDAQAB";
+    @Value("${rsaprivatekey}")
+    private String rsaprivatekeyTemp;
+    @Value("${rsapublickey}")
+    public String rsapublickeyTemp;
+
+    @PostConstruct
+    public void init() {
+        RSAUtil.rsaprivatekey = rsaprivatekeyTemp;
+        RSAUtil.rsapublickey = rsapublickeyTemp;
+    }
 
     /**
      * 加密方法
@@ -137,9 +141,9 @@ public class RSAUtil {
         String s1 = keyMap.get(1);
         System.out.println(s1);
 
-        String key1="";
+        String key1 = "";
 
-        String key2="";
+        String key2 = "";
 
 
     }