Merge remote-tracking branch 'origin/master'

cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java

@@ -64,12 +64,14 @@ public class SaTokenConfigure implements WebMvcConfigurer {
             ApplicationInfo.routePrefix = "";
 
             SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**")
+                    .notMatch("/pay/**")
+                    .notMatch("/notify/**")
                     .check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin())
                     .setHit(true)
 //                    .match("/**")
                     .notMatch("/user/**")
+                    .notMatch("/pay/**")
                     .notMatch("/admin/auth/**")
-                    .notMatch("/notify/**")
                     .check(r -> MyStpLogic.ADMIN_LOGIC.checkLogin());
 
         })).addPathPatterns("/**");

cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java

@@ -2,6 +2,7 @@ package com.czg.sa;
 
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.fun.SaFunction;
@@ -84,8 +85,14 @@ public class MyStpLogic {
             shopId = info instanceof Long l ? l : null;
             errType = 0;
         } else {
-            String header = SaHolder.getRequest().getHeader("shopId");
-            shopId = StrUtil.isBlank(header) ? null : Long.parseLong(header);
+            SaRequest request = SaHolder.getRequest();
+            String requestParam = request.getParam("shopId");
+            if (StrUtil.isBlank(requestParam)) {
+                String header = request.getHeader("shopId");
+                shopId = StrUtil.isBlank(header) ? null : Long.parseLong(header);
+            }else {
+                shopId = Long.parseLong(requestParam);
+            }
             errType = 1;
         }
 

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ShopActivateService extends IService<ShopActivate> {
 
-    List<ShopActivateDTO> getList();
+    List<ShopActivateDTO> getList(Long shopId);
 
     Boolean add(ShopActivateDTO activateDTO);