upgrade to 1.3.2

pom.xml

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

server/pom.xml

@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-entity</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.2</version>
         </dependency>
 
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-redis</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.3.2</version>
         </dependency>
 
         <dependency>

server/src/main/java/com/pica/cloud/online/exam/analysis/server/configuration/BeanConfiguration.java

 package com.pica.cloud.online.exam.analysis.server.configuration;
 
-import com.pica.cloud.foundation.redis.CacheMigrateClient;
+import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,13 +13,8 @@ public class BeanConfiguration {
     @Autowired
     private SpringContextAware springContextAware;
 
-    @Value("${spring.redis.config}")
-    private String configStr;
-
     @Bean
-    @ConditionalOnMissingBean
     public ICacheClient cacheClient() {
-        return new CacheMigrateClient(springContextAware.getActiveProfile());
-
+        return new CacheClient(springContextAware.getActiveProfile());
     }
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -3,6 +3,7 @@ package com.pica.cloud.online.exam.analysis.server.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
+import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.annotation.LoginPermission;
 import com.pica.cloud.foundation.utils.controller.BaseController;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
@@ -10,14 +11,10 @@ import com.pica.cloud.online.exam.analysis.common.dto.*;
 import com.pica.cloud.online.exam.analysis.common.util.ReturnUtil;
 import com.pica.cloud.online.exam.analysis.server.configuration.PropertiesConfiguration;
 import com.pica.cloud.online.exam.analysis.server.service.CHCAnalysisService;
-import com.pica.cloud.online.exam.analysis.server.service.DoctorService;
-import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Optional;
 
 /**
@@ -28,7 +25,6 @@ import java.util.Optional;
 @RequestMapping("/")
 public class AnalysisController extends BaseController {
 
-    @Qualifier("cacheMigrateClient")
     @Autowired
     private ICacheClient redisClient;
 

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AntiSpamController.java

@@ -14,7 +14,6 @@ import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/antispam")
 public class AntiSpamController extends BaseController {
-    @Qualifier("cacheMigrateClient")
     @Autowired
     private ICacheClient redisClient;
 

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/RedisTestController.java

+package com.pica.cloud.online.exam.analysis.server.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.annotation.LoginPermission;
+import com.pica.cloud.foundation.utils.controller.BaseController;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
+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 java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+@RestController
+public class RedisTestController extends BaseController {
+    @Autowired
+    private ICacheClient cacheClient;
+
+    @RequestMapping(value = "/redis", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+    @LoginPermission
+    public PicaResponse<Map<String, String>> redis() {
+        // http://localhost:11501/hospital/hospitals/redis
+        // cluster
+        String token = getToken();
+        Map<String, String> map = new HashMap<>();
+        map.put("id", "1111111");
+        map.put("token", getToken());
+        map.put("sysCode", getSysCode());
+
+        try {
+           token = cacheClient.saveToken(map, 3600);
+        } catch(Exception ex) {
+            // nothing to do
+        }
+        System.out.println(token);
+        Map<String, String> map1 = cacheClient.getToken(token);
+        System.out.println(JSON.toJSON(map1));
+        PicaUser user = fetchPicaUser();
+        System.out.println(JSON.toJSON(user));
+
+        // 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("token-" + token));
+
+        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("token-" + token));
+
+        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("token-" + token));
+
+        cacheClient.deleteToken(token);
+
+        try {
+            PicaUser user1 = fetchPicaUser();
+        } catch (Exception ex) {
+            System.out.println("Exception -> the user has been deleted");
+        }
+
+        Map<String, String> map2 = new HashMap<>();
+        map2.put("id", "1111111");
+        map2.put("token", getToken());
+        map2.put("sysCode", getSysCode());
+        try {
+            token = cacheClient.saveToken(map2, 3600);
+        } catch(Exception ex) {
+            // nothing to do
+        }
+        return PicaResponse.toResponse(token);
+    }
+}

server/src/test/java/com/pica/cloud/online/exam/analysis/RedisClientTest.java

@@ -6,7 +6,6 @@ import com.pica.cloud.online.exam.analysis.server.constants.RedisKey;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -17,7 +16,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = App.class)
 public class RedisClientTest {
-    @Qualifier("cacheMigrateClient")
     @Autowired
     private ICacheClient redisClient;