Merge branch 'dev-tengxun-150' into 'release'

Dev tengxun 150

See merge request !146

server/pom.xml

@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-kafka</artifactId>
-            <version>1.4.2.2</version>
+            <version>1.5.0</version>
         </dependency>
         <!--<dependency>-->
         <!--<groupId>io.springfox</groupId>-->
@@ -142,9 +142,19 @@
                     <artifactId>jedis</artifactId>
                     <groupId>redis.clients</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                    <artifactId>pica-cloud-redis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.pica.cloud.foundation</groupId>
+            <artifactId>pica-cloud-redis</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>

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

@@ -4,10 +4,13 @@ package com.pica.cloud.account.account.server.util;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
+import com.pica.cloud.account.account.server.req.BaseRequest;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.reflections.Reflections.log;
+
 
 /**
  * 加解密工具类
@@ -55,7 +58,13 @@ public class CryptoUtil {
         //param.put("weChatLoginType", 1);
         //param.put("weChatCode", "071KMzjM1ge35a1oDekM1zptjM1KMzjO");
 
-        aa(JSON.toJSONString(param));
+//        aa(JSON.toJSONString(param));
+
+        EncryptEntity entity = new EncryptEntity();
+        entity.setKey("kvxhw2gmsUOG128gBpbvY5gEhdAH7onO2BCtAltxMWHQphiu9w0ug7DhREX4VmcGuN8BPB7y/hqaulGl2q2lXSCyiqr1dDufnzHcMnHupMNcbZaUxhZQuNFWn3Tip9Q6LNIL21y69aPz+OvIMW32RZlWBlVyowlGvdvkHn/wF6c=");
+        entity.setContent("Qgn4HeLY5YD2ZK/vQW4AFvQPpo509a7/WbBO09tW6AGWinUNqImiPHbDImYZiaCY62bmE334FhUwW2REO5Po78DwnaPatrgjvOH0b+XhSBc=");
+        BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+
     }
 
     /**
@@ -88,6 +97,7 @@ public class CryptoUtil {
         String content = AESUtil.aesDecrypt(encryptEntity.getContent(),decryptKey);
         //反序列化成对象
         T request = JSONObject.parseObject(content, zClass);
+        log.info("CryptoUtil.decrypt " + JSONObject.toJSONString(request));
         return request;
 
 //        T request = JSONObject.parseObject(encryptEntity.getContent(), zClass);

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

@@ -47,12 +47,6 @@ weChatURL=https://api.weixin.qq.com/sns/userinfo?
 #\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
-#rabbitmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-spring.rabbitmq.virtual-host=account-register-vhost
 
 management.security.enabled=false
 management.endpoint.health.show-details=always

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

@@ -36,7 +36,8 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
 #memcached.url=172.19.137.65:11211
-memcached.url=172.19.137.4:11211
+#memcached.url=172.19.137.4:11211
+memcached.url=172.19.137.74:11211
 
 #\u5FAE\u4FE1\u767B\u9646
 weChatAppID=wx5103ed453ef2dbe8
@@ -53,7 +54,7 @@ management.endpoint.health.show-details=always
 
 # Job config begin
 # \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D
-xxl.job.admin.addresses=http://172.19.137.74:7899/job,http://172.19.137.75:7899/job
+xxl.job.admin.addresses=http://172.19.137.74:7899/job
 
 #\u6267\u884C\u5668\u547D\u540D\u89C4\u5219job-exec-<\u7533\u8BF7Port>
 xxl.job.executor.appname=job-exec-7906

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

@@ -46,12 +46,6 @@ weChatURL=https://api.weixin.qq.com/sns/userinfo?
 #\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
-#rabbitmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-spring.rabbitmq.virtual-host=account-register-vhost
 
 # Job config begin
 # \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D

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

@@ -44,12 +44,6 @@ weChatURL=https://api.weixin.qq.com/sns/userinfo?
 #是否开启双写模式，是否需要向p_doctor表写数据
 doubleWritingMode=true
 
-#rabbitmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-spring.rabbitmq.virtual-host=account-register-vhost
 
 # Job config begin
 # 控制器地址：服务启动自动注册到控制器中

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

@@ -46,13 +46,6 @@ weChatURL=https://api.weixin.qq.com/sns/userinfo?
 #\u662F\u5426\u5F00\u542F\u53CC\u5199\u6A21\u5F0F\uFF0C\u662F\u5426\u9700\u8981\u5411p_doctor\u8868\u5199\u6570\u636E
 doubleWritingMode=true
 
-#rabbitmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-spring.rabbitmq.virtual-host=account-register-vhost
-
 # Job config begin
 # \u63A7\u5236\u5668\u5730\u5740\uFF1A\u670D\u52A1\u542F\u52A8\u81EA\u52A8\u6CE8\u518C\u5230\u63A7\u5236\u5668\u4E2D
 xxl.job.admin.addresses=http://192.168.110.141:7899/job