提交登录修改

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -821,18 +821,39 @@ public class AuthServiceImpl implements IAuthService {
         }
         boolean isDoorKeeper = StringUtils.isNotBlank(roleName) && roleName.contains("门卫");
         boolean isForkliftDriver = StringUtils.isNotBlank(roleName) && roleName.contains("铲车司机");
+        boolean isBuyer = StringUtils.isNotBlank(roleName) && roleName.contains("买家");
         if (isDoorKeeper) {
             return buildDoorKeeperTabBar();
         }
         if (isForkliftDriver) {
             return buildForkliftDriverTabBar();
         }
+        if (isBuyer) {
+            return buildBuyerTabBar();
+        }
         if (flag == 1) {
             return buildDefaultDriverTabBar();
         }
         return List.of();
     }
 
+    private List<LoginResVo1.TabBarItem> buildBuyerTabBar() {
+        List<LoginResVo1.TabBarItem> items = new ArrayList<>();
+        items.add(buildTabBarItem(
+                "商城",
+                "static/tabbar/mall.png",
+                "static/tabbar/mall_select.png",
+                "pages/mall/index"
+        ));
+        items.add(buildTabBarItem(
+                "贸易订单",
+                "static/tabbar/trade.png",
+                "static/tabbar/trade_select.png",
+                "pages/tradeOrder/index"
+        ));
+        return items;
+    }
+
     private List<LoginResVo1.TabBarItem> buildDoorKeeperTabBar() {
         List<LoginResVo1.TabBarItem> items = new ArrayList<>();
         items.add(buildTabBarItem(

sckw-gateway/src/main/java/com/sckw/gateway/filter/AuthenticationFilter.java

@@ -93,7 +93,7 @@ public class AuthenticationFilter implements GlobalFilter, Ordered {
 //        String accessSpecial = request.getHeader(RequestConstant.ACCESS_SPECIAL);
         String requestUri = request.getPath().value();
         /*1、非token校验接口放行*/
-        if (EXCLUDEPATH.contains(requestUri)&& StrUtil.isNotBlank(token)) {
+        if (EXCLUDEPATH.contains(requestUri)) {
             Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, token);
             if (tokenMap != null) {
                 Long userId = StringUtils.isNotBlank(tokenMap.get("userId")) ? NumberUtils.parseLong(tokenMap.get("userId")) : null;