Merge branch 'release' into 'master'

Release



See merge request !8

client/pom.xml

@@ -25,7 +25,7 @@
         <repository>
             <id>nexus</id>
             <name>Pica 3rdParty Repository</name>
-            <url>http://192.168.110.42:8082/repository/pica-3rdParty/</url>
+            <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>
         </repository>
     </distributionManagement>
 

common/pom.xml

@@ -38,7 +38,7 @@
         <repository>
             <id>nexus</id>
             <name>Pica 3rdParty Repository</name>
-            <url>http://192.168.110.42:8082/repository/pica-3rdParty/</url>
+            <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>
         </repository>
     </distributionManagement>
 

pom.xml

@@ -13,7 +13,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-utils</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.3.2-OLD</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

server/pom.xml

@@ -29,7 +29,6 @@
             <groupId>com.pica.cloud.wechat</groupId>
             <artifactId>pica-cloud-yunqueyilian-common</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -93,13 +92,19 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-entity</artifactId>
-            <version>1.0.0</version>
+            <version>1.3.2</version>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>com.pica.cloud.foundation</groupId>-->
+            <!--<artifactId>pica-cloud-redis</artifactId>-->
+            <!--<version>1.1.2</version>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-redis</artifactId>
-            <version>1.1.2</version>
+            <version>1.3.2</version>
         </dependency>
 
         <dependency>
@@ -126,14 +131,14 @@
             <version>5.1.39</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.cloud</groupId>-->
+            <!--<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.cloud</groupId>-->
+            <!--<artifactId>spring-cloud-starter-stream-rabbit</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
     <dependencyManagement>

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/App.java

@@ -4,12 +4,11 @@ import com.pica.cloud.wechat.yunqueyilian.server.configuration.MyTypeExcludeFilt
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@EnableCircuitBreaker
+//@EnableCircuitBreaker
 @SpringBootApplication(scanBasePackages = "com.pica.cloud")
 @EnableDiscoveryClient
 @EnableSwagger2

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/configuration/BeanConfiguration.java

 package com.pica.cloud.wechat.yunqueyilian.server.configuration;
 
-import org.springframework.beans.factory.annotation.Value;
+import com.pica.cloud.foundation.redis.CacheClient;
+import com.pica.cloud.foundation.redis.ICacheClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.pica.cloud.foundation.redis.RedisClient;
 
 @Configuration
 @RefreshScope
 public class BeanConfiguration {
-    @Value("${spring.redis.config}")
-    private String configStr;
+    @Autowired
+    SpringContextAware springContextAware;
 
     @Bean
-    public RedisClient redisClient() {
-        System.out.println(configStr);
-
-        return new RedisClient(configStr);
+    public ICacheClient cacheClient() {
+        return new CacheClient(springContextAware.getActiveProfile());
     }
 }

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/configuration/SpringContextAware.java

+package com.pica.cloud.wechat.yunqueyilian.server.configuration;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextAware implements ApplicationContextAware {
+    private ApplicationContext context = null;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext)
+            throws BeansException {
+        this.context = applicationContext;
+    }
+
+    public String getActiveProfile() {
+        return context.getEnvironment().getActiveProfiles()[0];
+    }
+
+    public String getApplicationName() {
+        return context.getApplicationName();
+    }
+}

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/CoreController.java

 package com.pica.cloud.wechat.yunqueyilian.server.controller;
 
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.controller.BaseController;
 import com.pica.cloud.wechat.yunqueyilian.server.service.CoreService;
 import io.swagger.annotations.ApiOperation;
@@ -9,8 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisSentinelPool;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 /**
  * @author: zhehao.chen
@@ -41,4 +49,48 @@ public class CoreController extends BaseController {
         // 创建一个ResponseBuilder
         return coreService.processRequest(request);// 返回Response
     }
+
+    @Autowired
+    private ICacheClient cacheClient;
+
+    @RequestMapping(value = "/redis", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+    public PicaResponse<Map<String, String>> redis() {
+        // http://localhost:11501/hospital/hospitals/redis
+        // cluster
+        String uuidValue = UUID.randomUUID().toString().substring(0, 8);
+        String uuidKey = UUID.randomUUID().toString().substring(0, 8);
+        System.out.println("cluster - key:" + uuidKey + " value:" + uuidValue);
+        cacheClient.set(uuidKey, uuidValue);
+        System.out.println("cluster - " + cacheClient.get(uuidKey));
+
+        // sentinel
+        Set<String> set1 = new HashSet<>();
+        set1.add("192.168.140.27:17000");
+        set1.add("192.168.140.28:17000");
+        set1.add("192.168.140.29:17000");
+        JedisSentinelPool pool1 = new JedisSentinelPool("master01", set1, "Uu49Kz1olY85HQBu");
+        Jedis jedis1 = pool1.getResource();
+        System.out.println("sentinel dev - " + jedis1.get(uuidKey));
+
+        Set<String> set2 = new HashSet<>();
+        set2.add("192.168.110.68:17000");
+        set2.add("192.168.110.69:17001");
+        set2.add("192.168.110.70:17002");
+        JedisSentinelPool pool2 = new JedisSentinelPool("master01", set2, "Uu49Kz1olY85HQBu");
+        Jedis jedis2 = pool2.getResource();
+        System.out.println("sentinel test - " + jedis2.get(uuidKey));
+
+        Set<String> set3 = new HashSet<>();
+        set3.add("192.168.110.177:17000");
+        set3.add("192.168.110.178:17000");
+        set3.add("192.168.110.179:17000");
+        JedisSentinelPool pool3 = new JedisSentinelPool("master01", set3, "Uu49Kz1olY85HQBu");
+        Jedis jedis3 = pool3.getResource();
+        System.out.println("sentinel uat - " + jedis3.get(uuidKey));
+
+        cacheClient.del(uuidKey);
+        System.out.println("cluster - " + cacheClient.get(uuidKey));
+
+        return PicaResponse.toResponse(uuidValue);
+    }
 }

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/service/impl/CoreServiceImpl.java

@@ -149,8 +149,8 @@ public class CoreServiceImpl implements CoreService {
                 wechatUserMapper.updateById(wechatUser);
             }
 
-            String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx1ee39338694703b0"
-                    + "&redirect_uri=https://test1-yunqueyilian.yunqueyi.com/goBind"
+            String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxcf79dbdc24cb684b"
+                    + "&redirect_uri=https://yunqueyilian.yunqueyi.com/goBind"
                     + "&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect";
             String resContent = "您好！欢迎关注云鹊医联公众号。\n绑定个人资料后可以预约挂号、查看随访记录；还可以收到公众号推送患教和通知。\n<a href='" + url + "'>立即去绑定</a>";
 

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

@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
 AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
 ribbon.ConnectTimeout=6000
 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4

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

@@ -29,9 +29,9 @@ AppID=wxcf79dbdc24cb684b
 AppSecret=febe33eec4d0c05d62a2393be35c35c4
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
 ribbon.ConnectTimeout=6000
 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4

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

@@ -24,14 +24,14 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 
-#\u5FAE\u4FE1\u767B\u5F55\u4FE1\u606F
-AppID=wx1ee39338694703b0
-AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
+#\u5FAE\u4FE1\u767B\u5F55\u4FE1\u606F \u5411\u6587
+AppID=wxb23b6ab41e13da6d
+AppSecret=0ddc5f4d893663d07885d0f99e61b097
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
 ribbon.ConnectTimeout=6000
 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4

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

@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
 AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
 ribbon.ConnectTimeout=6000
 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4

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

@@ -24,14 +24,14 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.username=picacloud
 spring.rabbitmq.password=123456
 
-#\u5FAE\u4FE1\u767B\u5F55\u4FE1\u606F
+#\u5FAE\u4FE1\u767B\u5F55\u4FE1\u606F \u54F2\u6D69
 AppID=wx1ee39338694703b0
 AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
+#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
 ribbon.ConnectTimeout=6000
 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4