Merge remote-tracking branch 'refs/remotes/origin/master' into container-test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -21,7 +21,7 @@ import java.util.List;
 @ApiModel
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class KylinPerformanceVo implements Serializable, Cloneable {
+public class  KylinPerformanceVo implements Serializable, Cloneable {
 
     private Integer mid;
     @ApiModelProperty(value = "主键")
@@ -146,6 +146,9 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
     private Integer isInvoiceReminder;
 
+    @ApiModelProperty(value = "场地地址")
+    private String fieldAddress;
+
     public Integer getIdCount() {
         return idCount == null ? limitCount : idCount;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-framework/src/main/java/com/liquidnet/client/admin/framework/config/ShiroConfig.java

@@ -274,6 +274,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
+        filterChainDefinitionMap.put("/health", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/health/HealthController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.health;
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Api(tags = "健康检查")
+@Controller
+@RequestMapping("/health")
+public class HealthController {
+
+    @GetMapping("")
+    @ResponseBody
+    public AjaxResult health() {
+        return AjaxResult.success("success");
+    }
+
+}

liquidnet-bus-common/liquidnet-common-sms/pom.xml

@@ -21,5 +21,11 @@
             <groupId>com.aliyun</groupId>
             <artifactId>dysmsapi20170525</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/processor/SmsProcessor.java

@@ -4,11 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.aliyun.dysmsapi20170525.Client;
 import com.aliyun.dysmsapi20170525.models.*;
 import com.aliyun.teaopenapi.models.Config;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.ServletUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 
 @Slf4j
 @Component
@@ -83,6 +87,18 @@ public class SmsProcessor {
 
             if (!isSucc) {
                 log.warn("###发送短信API处理失败[pn={},sn={},tc={},tp={},respBody={}]", phoneNumber, signName, templateCode, templateParam, JSON.toJSON(smsResponseBody));
+                String cliIpAddr = CurrentUtil.getCliIpAddr();
+                log.info("[send] cliIpAddr: {}", cliIpAddr);
+
+                StringBuilder sb = new StringBuilder();
+                HttpServletRequest request = ServletUtils.getRequest();
+                Enumeration<String> headerNames = request.getHeaderNames();
+                while (headerNames.hasMoreElements()) {
+                    String headerName = headerNames.nextElement();
+                    String headerValue = request.getHeader(headerName);
+                    sb.append(headerName).append(": ").append(headerValue).append("\n");
+                }
+                log.info("[send] headers: {}.", sb);
             }
 
             return isSucc;

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalLogTrackInterceptor.java

@@ -12,11 +12,21 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class GlobalLogTrackInterceptor extends HandlerInterceptorAdapter {
     private static final String LNS_TRANCE_ID = "lnsTranceId";
+    private static final String X_SERVER_HEADER = "X-Server";
+    private static final String POD_NAME_ENV = "POD_NAME";
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String t = MDC.get(LNS_TRANCE_ID);
         MDC.put(LNS_TRANCE_ID, null == t ? String.valueOf(System.nanoTime()) : t);
+        
+        // 从环境变量获取POD_NAME并添加到响应头
+        String podName = System.getenv(POD_NAME_ENV);
+        if (podName != null && !podName.isEmpty()) {
+//            log.info("[preHandle] podName: {}", podName);
+            response.setHeader(X_SERVER_HEADER, podName);
+        }
+        
         return true;
     }
 

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

@@ -137,6 +137,8 @@ global-auth:
 #    - ${liquidnet.info.context}/wx/oauth2/access_token
     - ${liquidnet.info.context}/rsc/**
     - ${liquidnet.info.context}/user/info/rds
+    # 健康检查
+    - ${liquidnet.info.context}/health
   include-url-pattern: # 模式II（与模式I互斥）
 #    - ${liquidnet.info.context}/**
   oncheck-url-pattern:

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

@@ -109,6 +109,8 @@ global-auth:
     - ${liquidnet.info.context}/candy-coupon/useBack
     - ${liquidnet.info.context}/candy-coupon/useBackJxl
     - ${liquidnet.info.context}/inner/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

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

@@ -92,6 +92,8 @@ global-auth:
     - ${liquidnet.info.context}/user/userLikeOperation
     - ${liquidnet.info.context}/user/userDislikeOperation
     - ${liquidnet.info.context}/performance/getUserListByCon
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

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

@@ -146,6 +146,8 @@ global-auth:
     - ${liquidnet.info.context}/app/mix/details
     - ${liquidnet.info.context}/wdt/**
     - ${liquidnet.info.context}/bracelet/callback
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

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

@@ -157,6 +157,8 @@ global-auth:
     # 福袋
     - ${liquidnet.info.context}/luckyBag/scope
     - ${liquidnet.info.context}/luckyBag/code/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
     - ${liquidnet.info.context}/order/details
     - ${liquidnet.info.context}/order/transfer*

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

@@ -124,6 +124,8 @@ global-auth:
     - ${liquidnet.info.context}/notify/**
     - ${liquidnet.info.context}/refund/**
     - ${liquidnet.info.context}/pay/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

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

@@ -196,6 +196,8 @@ spring:
 global-auth:
   exclude-url-pattern: # 模式I（与模式II互斥）
 #    - ${liquidnet.info.context}/**
+    # 健康检查
+    - ${liquidnet.info.context}/health
   include-url-pattern: # 模式II（与模式I互斥）
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

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

@@ -112,6 +112,8 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/fields/app/details
+    # 健康检查
+    - ${liquidnet.info.context}/health
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

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

@@ -115,6 +115,8 @@ global-auth:
     - ${liquidnet.info.context}/frontNoLogin/**
     - ${liquidnet.info.context}/volunteers/project/list
     - ${liquidnet.info.context}/volunteers/project/details
+    # 健康检查
+    - ${liquidnet.info.context}/health
 
   oncheck-url-pattern:
     -

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

@@ -116,6 +116,8 @@ global-auth:
     - ${liquidnet.info.context}/user/logs/in2111
     - ${liquidnet.info.context}/user/logs/de2111
     - ${liquidnet.info.context}/user/logs/in2112
+    # 健康检查
+    - ${liquidnet.info.context}/health
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

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

@@ -94,6 +94,9 @@ public class AdamLoginController {
             return ResponseDto.failure(ErrorMapping.get("10000"));
         }
 
+        String cliIpAddr = CurrentUtil.getCliIpAddr();
+        log.info("cliIpAddr: {}", cliIpAddr);
+
         String smsCode = RandomStringUtils.randomNumeric(6);
         ObjectNode msgNode = JsonUtils.OM().createObjectNode();
         msgNode.put("code", smsCode);

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

+package com.liquidnet.service.adam.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/HealthController.java

+package com.liquidnet.service.candy.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/HealthController.java

+package com.liquidnet.service.chime.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/HealthController.java

+package com.liquidnet.service.goblin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -49,6 +49,12 @@
             <artifactId>liquidnet-service-goblin-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-slime-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

+package com.liquidnet.service.kylin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

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

@@ -315,6 +315,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             performancesInfo.setIsVip(dataUtils.isMemberByUser(uid));
         }
         performancesInfo.setIsInvoiceReminder(dataUtils.getPerformanceInvoiceReminder(performancesId));
+        performancesInfo.setFieldAddress(dataUtils.getFieldAddressByFieldId(performancesInfo.getFieldId()));
         return performancesInfo;
     }
 
@@ -639,11 +640,19 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             }
             List<KylinTicketTimesVo> ticketTimeList = info.getTicketTimeList();
             List<KylinTicketTimesVo> ticketTimeListNew = ObjectUtil.getKylinTicketTimesVoArrayList();
+            // 票种售罄数量
+            int ticketSoldOutTotal = 0;
+            // 票种总数量
+            int ticketTotal = 0;
             for (KylinTicketTimesVo ticketTime : ticketTimeList) {
                 List<KylinTicketVo> ticketList = ticketTime.getTicketList();
                 List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
                 for (KylinTicketVo ticket : ticketList) {
+                    ticketTotal++;
                     int status = checkTicketStatus(ticket);
+                    if (status == 8) {
+                        ticketSoldOutTotal++;
+                    }
                     ticket.setStatus(status);
                     // 会员状态
                     Integer isMemberStatus = getIsMemberStatus(ticket);
@@ -662,6 +671,12 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             if (CollectionUtils.isEmpty(ticketTimeListNew) && 7 != info.getAppStatus()) { //列表的时候无需判断 因为列表不展示状态标签
                 info.setAppStatus(11); // 所有票种下架 演出停售
             }
+
+            if (ticketSoldOutTotal == ticketTotal) {
+                // 所有票售罄
+                info.setAppStatus(8);
+            }
+
             // 当前时间大于停售时间 小于结束时间 是 停售
             String nowTimeStr = DateUtil.getNowTime();
             String stopSellTime = info.getStopSellTime();
@@ -706,6 +721,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             status = 8;
             getStatus = 8;
         }
+        if (1 == DateUtil.compareStrDay(ticketItem.getTimeStart(), DateUtil.getNowTime())) {// 未开始
+            getStatus = 9;
+        }
         if (null != ticketItem) {
             // 判断售罄
             if (6 == getStatus || 9 == getStatus || 10 == getStatus) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -32,6 +32,8 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinLuckyBagActivityMapper;
 import com.liquidnet.service.kylin.mapper.KylinLuckyBagMapper;
 import com.liquidnet.service.kylin.mapper.KylinRewardUserMapper;
+import com.liquidnet.service.slime.constant.SlimeRedisConst;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -1613,6 +1615,20 @@ public class DataUtils {
                 KylinTicketPartnerVo.class.getSimpleName());
     }
 
+    public String getFieldAddressByFieldId(String fieldId){
+        String key = SlimeRedisConst.INFO_FIELD.concat(fieldId);
+        SlimeFieldsVo vo = (SlimeFieldsVo) redisUtil.get(key);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), SlimeFieldsVo.class, SlimeFieldsVo.class.getSimpleName());
+            redisUtil.set(SlimeRedisConst.INFO_FIELD.concat(fieldId), vo);
+        }
+        if (null == vo) {
+            log.error("[getFieldAddressByFieldId] 场地信息为空, fieldId: {}", fieldId);
+            return "";
+        }
+        return vo.getAddress();
+    }
+
 
     /**
      * 获取福袋活动列表

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/HealthController.java

+package com.liquidnet.service.order.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/HealthController.java

+package com.liquidnet.service.platform.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/controller/HealthController.java

+package com.liquidnet.service.slime.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/HealthController.java

+package com.liquidnet.service.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/controller/HealthController.java

+package com.liquidnet.service.stone.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/HealthController.java

+package com.liquidnet.service.sweet.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @ApiOperation("健康检查")
+    @GetMapping
+    public ResponseDto<String> info() {
+        return ResponseDto.success("success");
+    }
+}