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

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-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

@@ -101,26 +101,22 @@ spring:
       codec:
         class: "org.redisson.codec.JsonJacksonCodec"
       transportMode: "NIO"
+  data:
+    mongodb:
+      uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
+      sslEnabled: ${liquidnet.mongodb.sslEnabled}
+      database: ${liquidnet.mongodb.database}
   datasource:
     name: ${liquidnet.mysql.database-name}
     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-consumer/pom.xml

@@ -41,6 +41,10 @@
             <artifactId>liquidnet-service-kylin-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/ServiceConsumerApplication.java

@@ -20,9 +20,6 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 
 @Slf4j
-@EnableAutoConfiguration(
-        exclude = {BusAutoConfiguration.class, MongoAutoConfiguration.class}
-)
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceConsumerApplication implements CommandLineRunner {
     @Autowired

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/Utils/KylinUtils.java

@@ -9,6 +9,9 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -20,6 +23,8 @@ public class KylinUtils {
 
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private MongoTemplate mongoTemplate;
 
     /**
      * @param userId  用户id
@@ -30,12 +35,7 @@ public class KylinUtils {
         List<KylinOrderListVo> vo = new ArrayList<>();
         List<KylinOrderListVo> redisVo = new ArrayList();
         KylinOrderListVo voItem = new KylinOrderListVo();
-        KylinOrderTicketVo data;
-        if (dataSingle == null) {
-            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
-        } else {
-            data = dataSingle;
-        }
+        KylinOrderTicketVo data = dataSingle;
         BeanUtils.copyProperties(data, voItem);
         List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
         if (type == 1) {
@@ -86,7 +86,7 @@ public class KylinUtils {
 
     public void changeBuyInfo(String userId, String idCard, String performanceId, String ticketId, int buyCount) {
         String redisKey;
-        KylinPerformanceVo vo = (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
+        KylinPerformanceVo vo = getPerformanceVo(performanceId);
         int isTrueName = vo.getIsTrueName();
         String useTime = "";
         HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
@@ -123,57 +123,20 @@ public class KylinUtils {
             redisUtil.decr(ticketIdKey, Math.abs(buyCount));
             redisUtil.decr(performanceIdKey, Math.abs(buyCount));
         }
+    }
 
-//        if (buyCount > 0) {
-//            redisUtil.incr(ticketIdKey, buyCount);
-//            if (1 == ticketType) {
-//                int count = 0;
-//                for (int i = 0; i < allTicketId.get(useTime).size(); i++) {
-//                    String item = allTicketId.get(useTime).get(i);
-//                    if (allTicketId.get(useTime).size() == 1) {
-//                        redisUtil.incr(performanceIdKey, buyCount);
-//                        break;
-//                    }
-//                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
-//                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
-//                    }
-//                    if (i == 0) {
-//                        count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
-//                    } else {
-//                        if (count != (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
-//                            redisUtil.incr(performanceIdKey, buyCount);
-//                            break;
-//                        }
-//                    }
-//                }
-//            } else {
-//                redisUtil.incr(performanceIdKey, buyCount);
-//            }
-//        } else {
-//            redisUtil.decr(ticketIdKey, Math.abs(buyCount));
-//            if (1 == ticketType) {
-//                int count = 0;
-//                for (int i = 0; i < allTicketId.get(useTime).size(); i++) {
-//                    String item = allTicketId.get(useTime).get(i);
-//                    if (allTicketId.get(useTime).size() == 1) {
-//                        redisUtil.decr(performanceIdKey, Math.abs(buyCount));
-//                        break;
-//                    }
-//                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
-//                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
-//                    }
-//                    if (i == 0) {
-//                        count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
-//                    } else {
-//                        if (count != (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
-//                            redisUtil.decr(performanceIdKey, Math.abs(buyCount));
-//                            break;
-//                        }
-//                    }
-//                }
-//            } else {
-//                redisUtil.decr(performanceIdKey, Math.abs(buyCount));
-//            }
-//        }
+    /**
+     * 根据演出id 获取 演出vo 详情
+     *
+     * @param performanceId
+     * @return
+     */
+    public KylinPerformanceVo getPerformanceVo(String performanceId) {
+        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
+        } else {
+            KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
+        }
+        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 }