Merge branch 'release' of...

Merge branch 'release' of 192.168.110.53:com.pica.cloud.account/pica-cloud-account into dev-20191224-registerSource

server/pom.xml

@@ -57,19 +57,15 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-service-starter</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.6-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
-                    <groupId>com.pica.cloud.foundation</groupId>
                     <artifactId>pica-cloud-redis</artifactId>
+                    <groupId>com.pica.cloud.foundation</groupId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.xuxueli</groupId>
-                    <artifactId>xxl-job-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+                    <artifactId>pica-cloud-entity</artifactId>
+                    <groupId>com.pica.cloud.foundation</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -94,25 +90,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-utils</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.dianping.cat</groupId>
-                    <artifactId>cat-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.pica.cloud.foundation</groupId>
-                    <artifactId>pica-cloud-entity</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.3.2-OLD</version>
         </dependency>
 
         <dependency>

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

@@ -52,9 +52,8 @@ public class AccountController extends AccountBaseController {
     private AccountService accountService;
     @Autowired
     private CaptchaService captchaService;
-
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient redisClient;
 
     @GetMapping("/test")

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

@@ -54,7 +54,6 @@ public class AutoCodeController extends AccountBaseController {
     private AccountService accountService;
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
     private ICacheClient cacheClient;
 
 

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

@@ -33,7 +33,6 @@ public class LoginController extends AccountBaseController {
     private LoginService loginService;
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
     private ICacheClient redisClient;
 
     @Autowired

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

+package com.pica.cloud.account.account.server.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.entity.PicaUser;
+import com.pica.cloud.foundation.redis.ICacheClient;
+
+import com.pica.cloud.foundation.service.starter.common.BaseController;
+import com.pica.cloud.foundation.service.starter.interceptor.LoginPermission;
+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.*;
+
+@RestController
+public class RedisTestController extends BaseController {
+    @Autowired
+    private ICacheClient redisClient;
+
+    @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 = getTokenFromHeader();
+        Map<String, String> map = new HashMap<>();
+        map.put("id", "1111111");
+        map.put("token", token);
+        map.put("sysCode", getSysCodeFromHeader());
+
+        try {
+            token = redisClient.saveToken(map, 3600);
+        } catch (Exception ex) {
+            // nothing to do
+        }
+        System.out.println(token);
+        Map<String, String> map1 = redisClient.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));
+
+        redisClient.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", token);
+        map2.put("sysCode", getSysCodeFromHeader());
+        try {
+            token = redisClient.saveToken(map2, 3600);
+        } catch (Exception ex) {
+            // nothing to do
+        }
+
+        String clusterKey = "cluster-key-001";
+        String clusterValue = "cluster-value-001";
+
+        redisClient.set(clusterKey, clusterValue);
+        System.out.println("cluster -> " + redisClient.get(clusterKey));
+        System.out.println("dev get cluster value -> " + pool1.getResource().get(clusterKey));
+        System.out.println("test1 get cluster value -> " + pool2.getResource().get(clusterKey));
+        System.out.println("uat get cluster value -> " + pool3.getResource().get(clusterKey));
+
+        String sentKey = "sent-key-001";
+        String sentValue = "sent-value-001";
+        pool1.getResource().set(sentKey, sentValue);
+        System.out.println("dev sentinel -> " + pool1.getResource().get(sentKey));
+
+        pool2.getResource().set(sentKey, sentValue);
+        System.out.println("test1 sentinel -> " + pool2.getResource().get(sentKey));
+
+        pool3.getResource().set(sentKey, sentValue);
+        System.out.println("uat sentinel -> " + pool3.getResource().get(sentKey));
+
+        return PicaResponse.toResponse(token);
+    }
+}

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

@@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/register")
 public class RegisterController extends AccountBaseController {
 
-
-
-
     @Autowired
     private RegisterService registerService;
 
@@ -34,7 +31,6 @@ public class RegisterController extends AccountBaseController {
     private AccountUtils accountUtils;
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
     private ICacheClient redisClient;
 
     @ApiOperation("PC端，移动端注册接口")

server/src/main/java/com/pica/cloud/account/account/server/job/DoctorRepeatDataJob.java

@@ -22,7 +22,7 @@ public class DoctorRepeatDataJob {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient cacheClient;
 
     @Autowired

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

@@ -38,7 +38,7 @@ public class AccountServiceImpl implements AccountService {
     @Autowired
     private AccountInfoDetailMapper accountInfoDetailMapper;
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient cacheClient;
 
     @Value("${doubleWritingMode}")

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

@@ -67,7 +67,7 @@ public class LoginServiceImpl implements LoginService {
     private DoctorService doctorService;
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient redisClient;
 
     @Value("${doubleWritingMode}")

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

@@ -66,7 +66,7 @@ public class RegisterServiceImpl implements RegisterService {
     private AgreementLogEntityMapper agreementLogEntityMapper;
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient redisClient;
 
     /**

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

@@ -26,7 +26,7 @@ import static com.pica.cloud.foundation.utils.utils.json.Object2Map.objectToMapS
 public class TokenServiceImpl implements TokenService {
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient redisClient;
 
     @Override

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

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
 public class AccountUtils {
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient cacheClient;
 
     private Logger logger = LoggerFactory.getLogger(AccountController.class);

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

@@ -26,7 +26,7 @@ public class TokenUtils {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-    @Qualifier("cacheMigrateClient")
+
     private ICacheClient cacheClient;
 
     @Autowired