Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -38,6 +38,7 @@ public class AdamRedisConst {
 
     public static final String SWITCH = ADAM.concat("switch:");
     public static final String SWITCH_BUY_MEMBER = SWITCH.concat("buy:member");
+    public static final String SWITCH_GRAY_LOGIN_SMS = SWITCH.concat("gray:login:sms");
 
     /* ----------------------------------------------------------------- */
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -103,15 +103,4 @@ public class AdamMemberAdminController {
         }
         return ResponseDto.success(adamMemberCodeAdminService.createGiftCode(parameter));
     }
-
-    @RequiresPermissions("adam:member:switch:buy")
-    @ApiOperation(value = "开放/限制购买会员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "0-限制｜1-开放", example = "0"),
-    })
-    @PostMapping("switch/buy")
-    public ResponseDto<Object> purchaseSwitch(@Max(1) @Min(0) @RequestParam int opt) {
-        redisUtil.set(AdamRedisConst.SWITCH_BUY_MEMBER, opt);
-        return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_BUY_MEMBER));
-    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.adam;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+@Api(tags = "ADAM配置")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("adam/switch")
+public class AdamSwitchAdminController {
+    @Autowired
+    RedisUtil redisUtil;
+
+    @RequiresPermissions("adam:switch:buy:member")
+    @ApiOperation(value = "开放/限制购买会员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "0-限制｜1-开放", example = "0"),
+    })
+    @PostMapping("buy/member")
+    public ResponseDto<Object> purchaseSwitch(@Max(1) @Min(0) @RequestParam int opt) {
+        redisUtil.set(AdamRedisConst.SWITCH_BUY_MEMBER, opt);
+        return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_BUY_MEMBER));
+    }
+
+    @RequiresPermissions("adam:switch:gray:login")
+    @ApiOperation(value = "开放/限制校验证码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "0-限制｜1-开放", example = "0"),
+    })
+    @PostMapping("gray/login")
+    public ResponseDto<Object> loginSmsSwitch(@Max(1) @Min(0) @RequestParam int opt) {
+        redisUtil.set(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 0 == opt ? 612543 : 615243);
+        return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
+    }
+}

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsEnum.java

+package com.liquidnet.commons.lang.constant;
+
+public final class LnsEnum {
+    public enum ENV {
+        dev,
+        test,
+        prod;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(ENV.dev.name());
+    }
+}

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java

@@ -3,11 +3,14 @@ package com.liquidnet.commons.lang.util;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Map;
 
 public class CurrentUtil {
+    public static final String CK_ENV_ACTIVE = "spring.profiles.active";
+    public static final String GRAY_LOGIN_SMS_CODE = "111111";
+
+    /* ======================================================= | */
+
     public static final String uID = "sub";
     public static final String uTag = "u-tag";
     public static final String uToken = "authorization";

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -29,5 +29,8 @@ liquidnet:
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
+  reviewer:
+    app-login:
+      mobile: 13724286255
 
 #以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -29,5 +29,8 @@ liquidnet:
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
+  reviewer:
+    app-login:
+      mobile: 13724286255
 
 #以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam.yml

@@ -111,7 +111,7 @@ spring:
     url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false
     username: ${liquidnet.mysql.username}
     password: ${liquidnet.mysql.password}
-    #    type: org.apache.tomcat.jdbc.pool.DataSource
+#    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
       maximum-pool-size: 16

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer.yml

@@ -106,21 +106,12 @@ spring:
     url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
     username: ${liquidnet.mysql.username}
     password: ${liquidnet.mysql.password}
-    #    type: org.apache.tomcat.jdbc.pool.DataSource
+#    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    filters: stat
-    maxActive: 20
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
+    hikari:
+      maximum-pool-size: 45
+      minimum-idle: 10
+      connection-test-query: SELECT 1
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -9,8 +9,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
+import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -26,6 +28,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.DigestUtils;
@@ -67,7 +70,8 @@ public class AdamLoginController {
     @Autowired
     IAdamUserService adamUserService;
 
-
+    @Value("${liquidnet.reviewer.app-login.mobile}")
+    private String reviewMobile;
     private static final String PHP_API_SMS_CODE_SEND = "/smsCode";
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
@@ -174,7 +178,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
-        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
+        log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
@@ -212,7 +216,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
-        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
+        log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
@@ -247,7 +251,7 @@ public class AdamLoginController {
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));
-        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
+        log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
@@ -283,9 +287,23 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
+        Integer switchGrayLoginSms = (Integer) redisUtil.get(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS);
+        if (null != switchGrayLoginSms) {
+            if (switchGrayLoginSms == 615243) {
+                if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
+                    return true;
+                }
+            }
+            if (switchGrayLoginSms == 612543) {
+                if (reviewMobile.equals(mobile) ||
+                        Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+                ) {
+                    if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
                         return true;
                     }
+                }
+            }
+        }
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);
@@ -328,7 +346,6 @@ public class AdamLoginController {
     private String ssoProcess(AdamUserInfoVo userInfoVo) {
         Map<String, Object> claimsMap = new HashMap<>();
         claimsMap.put("sub", userInfoVo.getUid());
-        // TODO: 2021/5/25 修改手机号更新TOKEN
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
         claimsMap.put("type", "user");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
+import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -161,7 +162,7 @@ public class AdamMemberOrderController {
             return "fail";
         }
 
-        if (!"dev".equals(env.getProperty("spring.profiles.active"))) {
+        if (!LnsEnum.ENV.dev.name().equals(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
             ResponseDto<Integer> checkOrderResult = this.checkOrderResult(parameter.getOrderCode());
             if (!checkOrderResult.isSuccess() || checkOrderResult.getData() != 1) {
                 log.warn("###购买会员支付回调支付中心验证不通过，无法处理[{}]", JsonUtils.toJson(parameter));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
@@ -304,8 +305,9 @@ public class AdamUserController {
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active"))) {
-            return "111111".equals(code);
+        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+                && CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
+            return true;
         }
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.*;
@@ -483,8 +484,8 @@ public class KylinStationController {
             }
             return ResponseDto.failure(ErrorMapping.get("20602"));
         } else {// 校验验证码
-            if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
-                if ("111111".equals(identity)) {
+            if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {
+                if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(identity)) {
                     return this.loginAuthentication(checkUserVo);
                 }
                 return ResponseDto.failure(ErrorMapping.get("20002"));