fix

wholesale/src/main/java/com/yhlxj/dao/model/entity/WebInfo.java

@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @Data
 public class WebInfo extends BaseEntity {
-    private Long userId;
+    private String showId;
     /**
      * 网站前缀
      */

wholesale/src/main/java/com/yhlxj/web/config/SaTokenConfigure.java

@@ -22,7 +22,9 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 		registry.addInterceptor(new SaRouteInterceptor())
 				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
 				.excludePathPatterns(List.of("/manage/wholesale/check-prefix",
-						"/manage/wholesale/check-account"));
+						"/manage/wholesale/check-account",
+						"/manage/wholesale",
+						"/manage/wholesale/login"));
 		//注解权限校验
 		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
 	}

wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleController.java

@@ -9,9 +9,7 @@ import com.yhlxj.dao.model.entity.WholesaleUser;
 import com.yhlxj.dao.model.enums.GatewayResponse;
 import com.yhlxj.service.wholesale.WebInfoService;
 import com.yhlxj.service.wholesale.WholesaleUserService;
-import com.yhlxj.web.util.StpUserUtil;
 import com.yhlxj.web.util.StpWholesaleUtil;
-import com.yhlxj.web.util.StpYhlxjUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -68,12 +66,10 @@ public class WholesaleController {
     @PostMapping
     public Result<WebInfo> saveWebInfo(@RequestBody WebInfo webInfo) throws Exception {
         log.info("保存WebInfo:{}", webInfo);
-        long userId = StpYhlxjUserUtil.getLoginIdAsLong();
-        int count = webInfoService.count(Wrappers.lambdaQuery(WebInfo.class).eq(WebInfo::getUserId, userId).eq(WebInfo::getStatus, Boolean.TRUE));
+        int count = webInfoService.count(Wrappers.lambdaQuery(WebInfo.class).eq(WebInfo::getShowId, webInfo.getShowId()).eq(WebInfo::getStatus, Boolean.TRUE));
         if (count > 0) {
             throw new BusinessRuntimeException("用户已存在个人网站.");
         }
-        webInfo.setUserId(userId);
         return GatewayResponse.SUCCESS.newBuilder().toResult(webInfoService.saveWebInfo(webInfo));
     }
 
@@ -120,9 +116,9 @@ public class WholesaleController {
 
         //写回登陆信息
         StpWholesaleUtil.login(login.getId());
-        response.addHeader("satoken-wholesale", StpUserUtil.getTokenValue());
+        response.addHeader("satoken-wholesale", StpWholesaleUtil.getTokenValue());
 
-        Cookie cookie = new Cookie("satoken-wholesale", StpUserUtil.getTokenValue());
+        Cookie cookie = new Cookie("satoken-wholesale", StpWholesaleUtil.getTokenValue());
         cookie.setMaxAge(31536000);
         cookie.setPath("/");
         response.addCookie(cookie);

wholesale/src/main/java/com/yhlxj/web/util/StpUserUtil.java

@@ -15,14 +15,14 @@ import java.util.List;
  */
 @Component
 public class StpUserUtil {
-    public static final String TYPE = "wholesale-web";
+    public static final String TYPE = "web";
 
     // 使用匿名子类 重写`stpLogic对象`的一些方法
-    public static StpLogic stpLogic = new StpLogic("wholesale-web") {
+    public static StpLogic stpLogic = new StpLogic("-web") {
         // 重写 StpLogic 类下的 `splicingKeyTokenName` 函数，返回一个与 `StpUtil` 不同的token名称, 防止冲突
         @Override
         public String splicingKeyTokenName() {
-            return super.splicingKeyTokenName() + "-wholesale-web";
+            return super.splicingKeyTokenName() + "-web";
         }
         // 同理你可以按需重写一些其它方法 ...
     };

wholesale/src/main/java/com/yhlxj/web/util/StpWholesaleUtil.java

@@ -15,14 +15,14 @@ import java.util.List;
  */
 @Component
 public class StpWholesaleUtil {
-    public static final String TYPE = "wholesale";
+    public static final String TYPE = "admin";
 
     // 使用匿名子类 重写`stpLogic对象`的一些方法
-    public static StpLogic stpLogic = new StpLogic("wholesale") {
+    public static StpLogic stpLogic = new StpLogic("admin") {
         // 重写 StpLogic 类下的 `splicingKeyTokenName` 函数，返回一个与 `StpUtil` 不同的token名称, 防止冲突
         @Override
         public String splicingKeyTokenName() {
-            return super.splicingKeyTokenName() + "-wholesale";
+            return super.splicingKeyTokenName() + "-admin";
         }
         // 同理你可以按需重写一些其它方法 ...
     };

wholesale/src/main/java/com/yhlxj/web/util/StpYhlxjUserUtil.java

@@ -1,334 +0,0 @@
-package com.yhlxj.web.util;
-
-import cn.dev33.satoken.fun.SaFunction;
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.stp.SaLoginModel;
-import cn.dev33.satoken.stp.SaTokenInfo;
-import cn.dev33.satoken.stp.StpLogic;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @author chan
- * @date 2021/10/12 下午5:59
- */
-@Component
-public class StpYhlxjUserUtil {
-    public static final String TYPE = "user";
-
-    // 使用匿名子类 重写`stpLogic对象`的一些方法
-    public static StpLogic stpLogic = new StpLogic("user") {
-        // 重写 StpLogic 类下的 `splicingKeyTokenName` 函数，返回一个与 `StpUtil` 不同的token名称, 防止冲突
-        @Override
-        public String splicingKeyTokenName() {
-            return super.splicingKeyTokenName() + "-user";
-        }
-        // 同理你可以按需重写一些其它方法 ...
-    };
-
-    public StpYhlxjUserUtil() {
-    }
-
-    public static String getLoginType() {
-        return stpLogic.getLoginType();
-    }
-
-    public static String getTokenName() {
-        return stpLogic.getTokenName();
-    }
-
-    public static void setTokenValue(String tokenValue, int cookieTimeout) {
-        stpLogic.setTokenValue(tokenValue, cookieTimeout);
-    }
-
-    public static String getTokenValue() {
-        return stpLogic.getTokenValue();
-    }
-
-    public static SaTokenInfo getTokenInfo() {
-        return stpLogic.getTokenInfo();
-    }
-
-    public static void login(Object id) {
-        stpLogic.login(id);
-    }
-
-    public static void login(Object id, String device) {
-        stpLogic.login(id, device);
-    }
-
-    public static void login(Object id, boolean isLastingCookie) {
-        stpLogic.login(id, isLastingCookie);
-    }
-
-    public static void login(Object id, SaLoginModel loginModel) {
-        stpLogic.login(id, loginModel);
-    }
-
-    public static void logout() {
-        stpLogic.logout();
-    }
-
-    public static void logoutByTokenValue(String tokenValue) {
-        stpLogic.logoutByTokenValue(tokenValue);
-    }
-
-    public static void logoutByLoginId(Object loginId) {
-        stpLogic.logoutByLoginId(loginId);
-    }
-
-    public static void logoutByLoginId(Object loginId, String device) {
-        stpLogic.logoutByLoginId(loginId, device);
-    }
-
-    public static boolean isLogin() {
-        return stpLogic.isLogin();
-    }
-
-    public static Long getUserIdAfterLogin() {
-        if (isLogin()) {
-            return StpYhlxjUserUtil.getLoginIdAsLong();
-        }
-        return null;
-    }
-
-    public static void checkLogin() {
-        stpLogic.checkLogin();
-    }
-
-    public static Object getLoginId() {
-        return stpLogic.getLoginId();
-    }
-
-    public static <T> T getLoginId(T defaultValue) {
-        return stpLogic.getLoginId(defaultValue);
-    }
-
-    public static Object getLoginIdDefaultNull() {
-        return stpLogic.getLoginIdDefaultNull();
-    }
-
-    public static String getLoginIdAsString() {
-        return stpLogic.getLoginIdAsString();
-    }
-
-    public static int getLoginIdAsInt() {
-        return stpLogic.getLoginIdAsInt();
-    }
-
-    public static long getLoginIdAsLong() {
-        return stpLogic.getLoginIdAsLong();
-    }
-
-    public static Object getLoginIdByToken(String tokenValue) {
-        return stpLogic.getLoginIdByToken(tokenValue);
-    }
-
-    public static SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
-        return stpLogic.getSessionByLoginId(loginId, isCreate);
-    }
-
-    public static SaSession getSessionBySessionId(String sessionId) {
-        return stpLogic.getSessionBySessionId(sessionId);
-    }
-
-    public static SaSession getSessionByLoginId(Object loginId) {
-        return stpLogic.getSessionByLoginId(loginId);
-    }
-
-    public static SaSession getSession(boolean isCreate) {
-        return stpLogic.getSession(isCreate);
-    }
-
-    public static SaSession getSession() {
-        return stpLogic.getSession();
-    }
-
-    public static SaSession getTokenSessionByToken(String tokenValue) {
-        return stpLogic.getTokenSessionByToken(tokenValue);
-    }
-
-    public static SaSession getTokenSession() {
-        return stpLogic.getTokenSession();
-    }
-
-    public static void checkActivityTimeout() {
-        stpLogic.checkActivityTimeout();
-    }
-
-    public static void updateLastActivityToNow() {
-        stpLogic.updateLastActivityToNow();
-    }
-
-    public static long getTokenTimeout() {
-        return stpLogic.getTokenTimeout();
-    }
-
-    public static long getSessionTimeout() {
-        return stpLogic.getSessionTimeout();
-    }
-
-    public static long getTokenSessionTimeout() {
-        return stpLogic.getTokenSessionTimeout();
-    }
-
-    public static long getTokenActivityTimeout() {
-        return stpLogic.getTokenActivityTimeout();
-    }
-
-    public static boolean hasRole(Object loginId, String role) {
-        return stpLogic.hasRole(loginId, role);
-    }
-
-    public static boolean hasRole(String role) {
-        return stpLogic.hasRole(role);
-    }
-
-    public static void checkRole(String role) {
-        stpLogic.checkRole(role);
-    }
-
-    public static void checkRoleAnd(String... roleArray) {
-        stpLogic.checkRoleAnd(roleArray);
-    }
-
-    public static void checkRoleOr(String... roleArray) {
-        stpLogic.checkRoleOr(roleArray);
-    }
-
-    public static boolean hasPermission(Object loginId, String permission) {
-        return stpLogic.hasPermission(loginId, permission);
-    }
-
-    public static boolean hasPermission(String permission) {
-        return stpLogic.hasPermission(permission);
-    }
-
-    public static void checkPermission(String permission) {
-        stpLogic.checkPermission(permission);
-    }
-
-    public static void checkPermissionAnd(String... permissionArray) {
-        stpLogic.checkPermissionAnd(permissionArray);
-    }
-
-    public static void checkPermissionOr(String... permissionArray) {
-        stpLogic.checkPermissionOr(permissionArray);
-    }
-
-    public static String getTokenValueByLoginId(Object loginId) {
-        return stpLogic.getTokenValueByLoginId(loginId);
-    }
-
-    public static String getTokenValueByLoginId(Object loginId, String device) {
-        return stpLogic.getTokenValueByLoginId(loginId, device);
-    }
-
-    public static List<String> getTokenValueListByLoginId(Object loginId) {
-        return stpLogic.getTokenValueListByLoginId(loginId);
-    }
-
-    public static List<String> getTokenValueListByLoginId(Object loginId, String device) {
-        return stpLogic.getTokenValueListByLoginId(loginId, device);
-    }
-
-    public static String getLoginDevice() {
-        return stpLogic.getLoginDevice();
-    }
-
-    public static List<String> searchTokenValue(String keyword, int start, int size) {
-        return stpLogic.searchTokenValue(keyword, start, size);
-    }
-
-    public static List<String> searchSessionId(String keyword, int start, int size) {
-        return stpLogic.searchSessionId(keyword, start, size);
-    }
-
-    public static List<String> searchTokenSessionId(String keyword, int start, int size) {
-        return stpLogic.searchTokenSessionId(keyword, start, size);
-    }
-
-    public static void disable(Object loginId, long disableTime) {
-        stpLogic.disable(loginId, disableTime);
-    }
-
-    public static boolean isDisable(Object loginId) {
-        return stpLogic.isDisable(loginId);
-    }
-
-    public static long getDisableTime(Object loginId) {
-        return stpLogic.getDisableTime(loginId);
-    }
-
-    public static void untieDisable(Object loginId) {
-        stpLogic.untieDisable(loginId);
-    }
-
-    public static void switchTo(Object loginId) {
-        stpLogic.switchTo(loginId);
-    }
-
-    public static void endSwitch() {
-        stpLogic.endSwitch();
-    }
-
-    public static boolean isSwitch() {
-        return stpLogic.isSwitch();
-    }
-
-    public static void switchTo(Object loginId, SaFunction function) {
-        stpLogic.switchTo(loginId, function);
-    }
-
-    public static void openSafe(long safeTime) {
-        stpLogic.openSafe(safeTime);
-    }
-
-    public static boolean isSafe() {
-        return stpLogic.isSafe();
-    }
-
-    public static void checkSafe() {
-        stpLogic.checkSafe();
-    }
-
-    public static long getSafeTime() {
-        return stpLogic.getSafeTime();
-    }
-
-    public static void closeSafe() {
-        stpLogic.closeSafe();
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static String getLoginKey() {
-        return stpLogic.getLoginType();
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static void setLoginId(Object loginId) {
-        stpLogic.login(loginId);
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static void setLoginId(Object loginId, String device) {
-        stpLogic.login(loginId, device);
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static void setLoginId(Object loginId, boolean isLastingCookie) {
-        stpLogic.login(loginId, isLastingCookie);
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static void setLoginId(Object loginId, SaLoginModel loginModel) {
-        stpLogic.login(loginId, loginModel);
-    }
-
-}

wholesale/src/main/resources/application-pre.yml

@@ -67,11 +67,11 @@ spring:
     # Redis数据库索引（默认为 0）
     database: 3
     # Redis服务器地址
-    host: 127.0.0.1
+    host: r-bp11e3hvovqtzl0a27pd.redis.rds.aliyuncs.com
     # Redis服务器连接端口
-    port: 63222
+    port: 6379
     # Redis 密码
-    password: yinhe9913
+    password: Shanxing12345
     lettuce:
       pool:
         # 连接池中的最小空闲连接
@@ -87,7 +87,7 @@ spring:
 
 sa-token:
   # token名称 (同时也是cookie名称)
-  token-name: satoken
+  token-name: satoken-wholesale
   # token有效期，单位s 默认7天, -1代表永不过期
   timeout: 604800
   # token临时有效期 3天 (指定时间内无操作就视为token过期) 单位: 秒