fix: swagger test

server/pom.xml

@@ -69,18 +69,15 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-service-starter</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.4.2</version>
             <!--<version>1.3.2.5</version>-->
-            <exclusions>
-                <exclusion>
-                    <artifactId>pica-cloud-redis</artifactId>
-                    <groupId>com.pica.cloud.foundation</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>pica-cloud-entity</artifactId>
-                    <groupId>com.pica.cloud.foundation</groupId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>2.7.9</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -136,13 +133,13 @@
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-utils</artifactId>
             <!--            <version>1.3.2-OLD</version>-->
-            <version>1.4.0-OLD</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jedis</artifactId>
-                    <groupId>redis.clients</groupId>
-                </exclusion>
-            </exclusions>
+            <version>1.4.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.pica.cloud.foundation</groupId>
+            <artifactId>pica-cloud-redis</artifactId>
+            <version>1.4.1</version>
         </dependency>
 
         <dependency>

server/src/main/java/com/pica/cloud/account/account/server/configuration/BeanConfiguration.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.configuration;
 
 import com.pica.cloud.foundation.kafka.producer.ISimpleProducer;
 import com.pica.cloud.foundation.kafka.producer.SimpleProducer;
+import com.pica.cloud.foundation.service.starter.SpringContextAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,12 +22,15 @@ public class BeanConfiguration {
     @Autowired
     private PropertiesConfiguration propertiesConfiguration;
 
+    @Autowired
+    SpringContextAware springContextAware;
+
     // 定义 ISimplerProducer bean 默认投递模式为 Delivery.AT_LEAST_ONCE
     // Key：类型为String
     // Value：类型为PicaUser
     @Bean
     public ISimpleProducer<String, Object> simpleProducer() {
-        return new SimpleProducer<>(propertiesConfiguration.getEnvironment());
+        return new SimpleProducer<>(springContextAware.getActiveProfile());
     }
 
 }

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

@@ -15,8 +15,9 @@ import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
+import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.service.starter.common.BaseController;
 import com.pica.cloud.foundation.utils.constants.SysCode;
-import com.pica.cloud.foundation.utils.controller.BaseController;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.HttpClientUtil;
 import com.pica.cloud.foundation.utils.utils.MD5Util;
@@ -46,6 +47,9 @@ public abstract class AccountBaseController extends BaseController {
     @Autowired
     private IntactUtil intactUtil;
 
+    @Autowired
+    private ICacheClient cacheClient;
+
     //从token获取医生ID
     public long getDoctorIdByToken() {
         try {
@@ -58,7 +62,7 @@ public abstract class AccountBaseController extends BaseController {
 
     //获取deviceInfo信息
     public String getDeviceInfo(String key) {
-        String deviceInfo = super.getDeviceInfo();
+        String deviceInfo = super.getDeviceInfoFromHeader();
         if (StringUtils.isBlank(key) || StringUtils.isBlank(deviceInfo)) {
             return StringUtils.EMPTY;
         }
@@ -69,6 +73,9 @@ public abstract class AccountBaseController extends BaseController {
             return StringUtils.EMPTY;
         }
     }
+    public String getDeviceInfo() {
+        return super.getDeviceInfoFromHeader();
+    }
 
     public String getDeviceInfoLow(String key) {
         String deviceInfo = this.getRequest().getHeader("deviceinfo");
@@ -89,14 +96,14 @@ public abstract class AccountBaseController extends BaseController {
             picaUser.setToken(token);
         }
 
-        String sysCode = super.getSysCode();
+        String sysCode = super.getSysCodeFromHeader();
         if ("9".equals(sysCode)) {
             sysCode = "saas";
         } else if ("10".equals(sysCode)) {
             sysCode = "app";
         }
 
-        String tokenValue = super.getRedisClient().get(KEY_PREFIX + picaUser.getId().toString() + "-" + sysCode);
+        String tokenValue = cacheClient.get(KEY_PREFIX + picaUser.getId().toString() + "-" + sysCode);
         if (StringUtils.isNotBlank(tokenValue)) {
             return tokenValue.replace("token-", "");  //token已经存在则直接返回
         }
@@ -104,7 +111,7 @@ public abstract class AccountBaseController extends BaseController {
         try {
             Map<String, String> data = Object2Map.objectToMapString("yyyy-MM-dd HH:mm:ss", picaUser, new String[0]);
             data.put("sysCode", sysCode);
-            return super.getRedisClient().saveToken(data, 365 * 24 * 3600);  //token有效期365天
+            return cacheClient.saveToken(data, 365 * 24 * 3600);  //token有效期365天
         } catch (Exception ex) {
             logger.error("保存token失败，doctorId: {}", picaUser.getId());
             return StringUtils.EMPTY;
@@ -116,7 +123,7 @@ public abstract class AccountBaseController extends BaseController {
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
         intactUtil.sendIntact(batchNo, "sendMobileMessage", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1, "mobile:" + mobile + ",content:" + content + ",senderId:" + senderId);
-        String sysCodeStr = super.getSysCode();
+        String sysCodeStr = super.getSysCodeFromHeader();
         int sysCode = 10; //默认移动端
         if (StringUtils.isNotBlank(sysCodeStr)) {
             try {
@@ -186,8 +193,8 @@ public abstract class AccountBaseController extends BaseController {
      */
     public AccountUser getAccountUser() {
         //把所有请求头信息都封装到当前模型中
-        String token = this.getToken();
-        AccountUser accountUser = super.getRedisClient().getToken(token, AccountUser.class);
+        String token = this.getTokenFromHeader();
+        AccountUser accountUser = cacheClient.getToken(token, AccountUser.class);
         accountUser.setLoginFrom(this.getSourceType());
         accountUser.setLoginPlatform(this.getProductType());
         accountUser.setLoginIp(super.getIpAddr());

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

@@ -143,7 +143,7 @@ public class AutoCodeController extends AccountBaseController {
                 logger.info("input  select patient record ");
             }
             //  调用风控接口
-            authCodeService.rcValidate(req, request, super.getDeviceInfo(), super.getSourceType());
+            authCodeService.rcValidate(req, request, getDeviceInfo(), super.getSourceType());
             //  发送短信验证码
             processSysCode(request.getMobile(), request.getFlag());
             return PicaResponse.toResponse();

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

@@ -45,7 +45,7 @@ public class DoctorController extends AccountBaseController {
         Integer userId = accountUser.getId();
         Doctor doctorInfo = doctorService.getDoctorInfo(userId);
         String mobilePhone = doctorInfo.getMobilePhone();
-        String dencrypt = EncryptUtils.decryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE, super.getToken());
+        String dencrypt = EncryptUtils.decryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE, getTokenFromHeader());
         mobilePhone = dencrypt.substring(0, 3) + "****" + dencrypt.substring(7, 11);
         doctorInfo.setMobilePhone(mobilePhone);
         if (StringUtils.isNotBlank(doctorInfo.getCard())) {

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

@@ -25,7 +25,7 @@ import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
-import com.pica.cloud.foundation.utils.annotation.LoginPermission;
+import com.pica.cloud.foundation.service.starter.interceptor.LoginPermission;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -246,7 +246,7 @@ public class LoginController extends AccountBaseController {
     @ApiOperation(value = "退出登录接口")
     @GetMapping("/logout")
     public PicaResponse<String> loginOut() {
-        String token = super.getToken();
+        String token = super.getTokenFromHeader();
         if (StringUtils.isNotEmpty(token)) {
             Long doctorId = super.getDoctorIdByToken();
             Doctor doctorInfo = doctorService.getDoctorInfo(doctorId.intValue());
@@ -426,7 +426,7 @@ public class LoginController extends AccountBaseController {
 
     @ApiOperation(value = "二维码扫码登录")
     @PostMapping("/login/QRCode")
-    @LoginPermission
+    @EnabledLoginValidate
     public PicaResponse<String> loginQRCode() {
         BaseRequest request = new BaseRequest();
         request.setProductType(1);
@@ -444,7 +444,7 @@ public class LoginController extends AccountBaseController {
     @EnabledLoginValidate
     public PicaResponse<String> loginSwitch(@RequestBody EncryptEntity entity) throws Exception {
         Map<String, Object> req = CryptoUtil.decrypt(entity, Map.class);
-        loginService.loginSwitch(super.getAccountUser(), super.getRedisClient().getToken(String.valueOf(req.get("token")), AccountUser.class));
+        loginService.loginSwitch(super.getAccountUser(), cacheClient.getToken(String.valueOf(req.get("token")), AccountUser.class));
         return PicaResponse.toResponse();
     }
 

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

@@ -9,6 +9,7 @@ import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.AccountInfoService;
+import com.pica.cloud.account.account.server.service.AccountService;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.service.ModifyMobileService;
 import com.pica.cloud.account.account.server.service.impl.AccountServiceImpl;
@@ -38,7 +39,7 @@ public class ModifyMobileController extends AccountBaseController {
     private DoctorService doctorService;
 
     @Autowired
-    private AccountServiceImpl accountService;
+    private AccountService accountService;
 
 
     @ApiOperation("修改手机号")

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

@@ -23,7 +23,6 @@ import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
-import com.pica.cloud.foundation.utils.utils.RequestUtils;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
 import com.pica.cloud.tag.transport.client.ITransportDoctorClient;
 import com.pica.cloud.tag.transport.contract.req.StickerProfileDto;
@@ -35,6 +34,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Date;
 import java.util.UUID;
@@ -134,7 +135,8 @@ public class RegisterServiceImpl implements RegisterService {
 
                     /*注册app版本*/
                     try {
-                        JSONObject jsonObject = JSONObject.parseObject(RequestUtils.getRequest().getHeader("deviceInfo"));
+                        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
+                        JSONObject jsonObject = JSONObject.parseObject(servletRequestAttributes.getRequest().getHeader("deviceInfo"));
                         accountInfo.setRegVersion(jsonObject.getString("app_version"));
                     } catch (Exception ex) {
                         logger.error("从header中获取app版本异常", ex);