20190916

server/pom.xml

@@ -124,6 +124,21 @@
             <artifactId>spymemcached</artifactId>
             <version>2.12.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.pica.cloud.foundation</groupId>
+            <artifactId>pica-cloud-encryption-client</artifactId>
+            <version>1.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                    <artifactId>pica-cloud-entity</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                    <artifactId>pica-cloud-utils</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -143,6 +158,8 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 

server/src/main/java/com/pica/cloud/account/account/server/App.java

@@ -12,7 +12,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication(scanBasePackages = "com.pica.cloud", exclude = {XxlJobConfiguration.class})
 @EnableDiscoveryClient
 @EnableSwagger2
-@EnableFeignClients
+@EnableFeignClients(basePackages = "com.pica.cloud")
 @MapperScan("com.pica.cloud.account.account.server.mapper")
 @EnableTransactionManagement
 public class App {

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

@@ -5,6 +5,8 @@ import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.req.AccountReq;
 import com.pica.cloud.account.account.server.service.AccountService;
 import com.pica.cloud.account.account.server.service.CaptchaService;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
@@ -12,7 +14,6 @@ import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.constants.CommonConstants;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.CommonUtil;
-import com.pica.cloud.foundation.utils.utils.EncryptCreateUtil;
 import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import com.pica.cloud.foundation.utils.utils.json.Object2Map;
 import io.swagger.annotations.Api;
@@ -180,7 +181,7 @@ public class AccountController extends AccountBaseController {
 
     //获取验证码redis key
     private String getAuthCodeKey(String mobilePhone, String flag) {
-        return AUTH_CODE_PREFIX + flag + "-" + EncryptCreateUtil.encrypt(mobilePhone);
+        return AUTH_CODE_PREFIX + flag + "-" + EncryptUtils.encryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE);
     }
 
     //校验验证码
@@ -225,7 +226,7 @@ public class AccountController extends AccountBaseController {
                 picaUser.setToken(newToken);
                 picaUser.setId(account.getId().intValue());
                 picaUser.setMobile(account.getMobilePhone());
-                picaUser.setName(EncryptCreateUtil.dencrypt(account.getMobilePhone()).replaceAll("(\\d{3})\\d{4}(\\w{4})","$1****$2"));
+                picaUser.setName(EncryptUtils.decryptContent(account.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY).replaceAll("(\\d{3})\\d{4}(\\w{4})","$1****$2"));
                 picaUser.setCreated_time(account.getCreatTime());
                 Map<String, String> data = Object2Map.objectToMapString("yyyy-MM-dd HH:mm:ss", picaUser, new String[0]);
                 data.put("sysCode", "h5");

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

@@ -5,6 +5,8 @@ import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.service.AccountService;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.EncryptCreateUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -52,7 +54,7 @@ public class AccountServiceImpl implements AccountService {
     //根据手机号获取账号
     @Override
     public Account getByMobilePhone(String mobilePhone) {
-        String encryptMobilePhone = EncryptCreateUtil.encrypt(mobilePhone);
+        String encryptMobilePhone = EncryptUtils.encryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE);
         return accountMapper.getByMobilePhone(encryptMobilePhone);
     }
 
@@ -82,7 +84,7 @@ public class AccountServiceImpl implements AccountService {
         Integer acctId = accountInfo.getId();
         //doctor表,存入用户id
         if (doubleWritingMode) {
-            account.setMobilePhone(EncryptCreateUtil.encrypt(account.getMobilePhone()));  //手机号加密
+            account.setMobilePhone(EncryptUtils.encryptContent(account.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE));  //手机号加密
             account.setDeleteFlag(1);
             account.setCreatId(0L);
             account.setModifyId(0L);

server/src/main/resources/bootstrap-dev.properties

@@ -21,7 +21,7 @@ logging.path=c:/tomcat-log/${spring.application.name}
 #job settings
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-prod.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-test1.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-test2.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-uat.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------