upgrade redis client 1.3.2

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>
@@ -68,10 +67,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-feign</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-hystrix</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+        </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>
@@ -159,7 +164,7 @@
     <repositories>
         <repository>
             <id>nexus</id>
-            <url>http://192.168.141.133:8082/repository/maven-public/</url>
+            <url>http://192.168.110.42:8082/repository/maven-public/</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -173,7 +178,7 @@
     <pluginRepositories>
         <pluginRepository>
             <id>nexus</id>
-            <url>http://192.168.141.133:8082/repository/maven-public/</url>
+            <url>http://192.168.110.42:8082/repository/maven-public/</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>

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);
+    }
 }