fix(security): 修复登录拦截器中的权限验证问题

@@ -7,10 +7,10 @@ import com.infoloop.tianting.intercepter.LoginInterceptor;
 import com.infoloop.tianting.intercepter.RequestMonitor;
 import com.infoloop.tianting.intercepter.RequestMonitor;
 import com.infoloop.tianting.intercepter.ResourceInjector;
 import com.infoloop.tianting.intercepter.ResourceInjector;
 import com.infoloop.tianting.service.client.ClientCustomerServiceRpcClient;
 import com.infoloop.tianting.service.client.ClientCustomerServiceRpcClient;
+import com.infoloop.tianting.service.client.MeiZhongYiHeServiceClient;
 import com.infoloop.tianting.service.client.OperatorServiceRpcClient;
 import com.infoloop.tianting.service.client.OperatorServiceRpcClient;
 import com.infoloop.tianting.service.client.WOperatorServiceRpcClient;
 import com.infoloop.tianting.service.client.WOperatorServiceRpcClient;
 import com.infoloop.tianting.tracing.HttpTracingInterceptor;
 import com.infoloop.tianting.tracing.HttpTracingInterceptor;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
@@ -37,12 +37,13 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         final ResourceInjector resourceInjector,
                         final ResourceInjector resourceInjector,
                         final ClientCustomerServiceRpcClient clientCustomerServiceRpcClient,
                         final ClientCustomerServiceRpcClient clientCustomerServiceRpcClient,
                         final OperatorServiceRpcClient operatorServiceRpcClient,
                         final OperatorServiceRpcClient operatorServiceRpcClient,
-                        final WOperatorServiceRpcClient wOperatorServiceRpcClient) {
+                        final WOperatorServiceRpcClient wOperatorServiceRpcClient,
+                        final MeiZhongYiHeServiceClient meiZhongYiHeServiceClient) {
         this.httpInterceptors = new ArrayList<>();
         this.httpInterceptors = new ArrayList<>();
         this.httpInterceptors.add(new HttpTracingInterceptor(tracing));
         this.httpInterceptors.add(new HttpTracingInterceptor(tracing));
         this.httpInterceptors.add(new RequestMonitor());
         this.httpInterceptors.add(new RequestMonitor());
         this.httpInterceptors.add(new ApiSignInterceptor());
         this.httpInterceptors.add(new ApiSignInterceptor());
-        this.httpInterceptors.add(new LoginInterceptor(clientCustomerServiceRpcClient, operatorServiceRpcClient, wOperatorServiceRpcClient));
+        this.httpInterceptors.add(new LoginInterceptor(clientCustomerServiceRpcClient, meiZhongYiHeServiceClient, operatorServiceRpcClient, wOperatorServiceRpcClient));
         this.httpInterceptors.add(resourceInjector);
         this.httpInterceptors.add(resourceInjector);
 
 
     }
     }

 package com.infoloop.tianting.controller;
 package com.infoloop.tianting.controller;
 
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.infoloop.tianting.model.dto.ClientLabelDTO;
-import com.infoloop.tianting.model.dto.ClientLabelDTO.LabelDto;
 import com.infoloop.tianting.model.dto.KdsDTO;
 import com.infoloop.tianting.model.dto.KdsDTO;
 import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto;
 import com.infoloop.tianting.model.dto.KdsDTO.KdsMealDetailDto;
 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto;
 import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderLocationDto;
@@ -10,8 +8,6 @@ import com.infoloop.tianting.model.dto.KdsDTO.KdsOrderSkuDto;
 import com.infoloop.tianting.service.KdsService;
 import com.infoloop.tianting.service.KdsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import javax.validation.Valid;
+import java.util.List;
+
 @Api(tags = "KDS")
 @Api(tags = "KDS")
 @ApiSupport(order = -1)
 @ApiSupport(order = -1)
 @Slf4j
 @Slf4j

@@ -53,7 +53,6 @@ public class PayController {
         return payServiceClient.callback(paymentCallbackDTO);
         return payServiceClient.callback(paymentCallbackDTO);
     }
     }
 
 
-    @SaIgnore
     @ApiOperation(value = "支付撤销")
     @ApiOperation(value = "支付撤销")
     @PostMapping(value = "/pay/cancel")
     @PostMapping(value = "/pay/cancel")
     @ResponseStatus(HttpStatus.OK)
     @ResponseStatus(HttpStatus.OK)

@@ -34,7 +34,9 @@ public enum ErrorCodeEnum implements BaseEnum {
 
 
     SKUS_STOCK_NO_ENOUGH_TODAY(406000008, "下单菜品： {0} 库存不足"),
     SKUS_STOCK_NO_ENOUGH_TODAY(406000008, "下单菜品： {0} 库存不足"),
 
 
-    ORDER_CANCEL(406000009, "订单已自动取消")
+    ORDER_CANCEL(406000009, "订单已自动取消"),
+
+    ORDER_PAY_CANCEL_FAILED(406000010, "支付撤销失败")
     ;
     ;
     private final int code;
     private final int code;
 
 

@@ -4,12 +4,13 @@ import com.infoloop.tianting.clientcustomerservice.ClientCustomerHospitalRecordH
 import com.infoloop.tianting.clientcustomerservice.ClientCustomerSexEnum;
 import com.infoloop.tianting.clientcustomerservice.ClientCustomerSexEnum;
 import com.infoloop.tianting.model.dto.MenuDbDTO.MenuDto;
 import com.infoloop.tianting.model.dto.MenuDbDTO.MenuDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "ClientCustomerDTO")
 @ApiModel(description = "ClientCustomerDTO")
 public class ClientCustomerDbDTO {
 public class ClientCustomerDbDTO {

@@ -5,12 +5,12 @@ import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.deliveryruleservice.ClientDishLabelStatusEnum;
 import com.infoloop.tianting.deliveryruleservice.ClientDishLabelStatusEnum;
 import com.infoloop.tianting.deliveryruleservice.ClientLabelTypeEnum;
 import com.infoloop.tianting.deliveryruleservice.ClientLabelTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import io.swagger.models.auth.In;
-import java.util.List;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.ToString;
 import lombok.ToString;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "标签DTO")
 @ApiModel(description = "标签DTO")
 public class ClientLabelDTO {
 public class ClientLabelDTO {

@@ -3,11 +3,11 @@ package com.infoloop.tianting.model.dto;
 import com.infoloop.tianting.clientinventoryservice.ClientType;
 import com.infoloop.tianting.clientinventoryservice.ClientType;
 import com.infoloop.tianting.clientinventoryservice.CustomerSource;
 import com.infoloop.tianting.clientinventoryservice.CustomerSource;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import io.swagger.models.auth.In;
-import java.util.List;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "院区DTO")
 @ApiModel(description = "院区DTO")
 public class InventoryDbDTO {
 public class InventoryDbDTO {

@@ -6,13 +6,13 @@ import com.infoloop.tianting.model.dto.InventoryDbDTO.ClientDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerDetailDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerDetailDto;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerNotice;
 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerNotice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import io.swagger.models.auth.In;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "kds DTO")
 @ApiModel(description = "kds DTO")
 public class KdsDTO {
 public class KdsDTO {

@@ -2,11 +2,12 @@ package com.infoloop.tianting.model.dto;
 
 
 import com.infoloop.tianting.setmealscheduleservice.MealStatus;
 import com.infoloop.tianting.setmealscheduleservice.MealStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import java.util.List;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.ToString;
 import lombok.ToString;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "餐别相关DTO")
 @ApiModel(description = "餐别相关DTO")
 public class MealDbDTO {
 public class MealDbDTO {

@@ -2,14 +2,13 @@ package com.infoloop.tianting.model.dto;
 
 
 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationType;
 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationType;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
-import com.infoloop.tianting.model.dto.MenuDbDTO.DishRuleJson;
-import com.infoloop.tianting.model.dto.MenuDbDTO.OrderRuleJson;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import java.util.List;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.ToString;
 import lombok.ToString;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(description = "操作记录DTO")
 @ApiModel(description = "操作记录DTO")
 public class OperationDTO {
 public class OperationDTO {

@@ -2,13 +2,13 @@ package com.infoloop.tianting.model.dto;
 
 
 import com.infoloop.tianting.enums.SettlementDimensionEnum;
 import com.infoloop.tianting.enums.SettlementDimensionEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import java.util.ArrayList;
-import java.util.Map;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @Data
 @Data
 @ApiModel(description = "统计DTO")
 @ApiModel(description = "统计DTO")

 package com.infoloop.tianting.model.dto;
 package com.infoloop.tianting.model.dto;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;