admin模块登录token修改，redis分片与miniapp一致

admin-web/src/App.vue

@@ -97,7 +97,7 @@ onMounted(() => {
     });
 
 
-    if (Session.get('token')) {
+    if (Session.get('accessToken')) {
       refreshEnv();
     }
 	});

admin-web/src/components/form/ExtUpload.vue

@@ -99,7 +99,7 @@ onMounted(() => {
     url = `${location.origin}/admin/`;
   }
   state.action = `${url}file/upload`
-  state.headers = {"satoken": Session.get("token")}
+  state.headers = {"accessToken": Session.get("accessToken")}
 })
 
 const handleAvatarError = () => {

admin-web/src/router/backEnd.ts

@@ -35,7 +35,7 @@ export async function initBackEndControlRoutes() {
 	// 界面 loading 动画开始执行
 	// if (window.nextLoading === undefined) NextLoading.start();
 	// 无 token 停止执行下一步
-	if (!Session.get('token')) return false;
+	if (!Session.get('accessToken')) return false;
 	// 触发初始化用户信息 pinia
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
 	await useUserInfo().setUserInfos(null);

admin-web/src/router/frontEnd.ts

@@ -22,7 +22,7 @@ export async function initFrontEndControlRoutes() {
 	// 界面 loading 动画开始执行
 	if (window.nextLoading === undefined) NextLoading.start();
 	// 无 token 停止执行下一步
-	if (!Session.get('token')) return false;
+	if (!Session.get('accessToken')) return false;
 	// 触发初始化用户信息 pinia
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
 	// await useUserInfo(pinia).setUserInfos();

admin-web/src/router/index.ts

@@ -115,7 +115,7 @@ router.beforeEach(async (to, from, next) => {
     console.log("route>>>:", from.path,to.path)
     NProgress.configure({showSpinner: true});
     if (to.meta.title) NProgress.start();
-    const token = Session.get('token');
+    const token = Session.get('accessToken');
     // console.error(token)
     if (to.path === '/login' && !token) {
         next();

admin-web/src/utils/request.ts

@@ -27,8 +27,8 @@ const service: AxiosInstance = axios.create({
 service.interceptors.request.use(
     (config) => {
         // 在发送请求之前做些什么 token
-        if (Session.get('token')) {
-            config.headers!['satoken'] = `${Session.get('token')}`;
+        if (Session.get('accessToken')) {
+            config.headers!['accessToken'] = `${Session.get('accessToken')}`;
         }
         return config;
     },

admin-web/src/utils/storage.ts

@@ -42,23 +42,23 @@ export const Local = {
 export const Session = {
 	// 设置临时缓存
 	set<T>(key: string, val: T) {
-		if (key === 'token') return Cookies.set(key, val);
+		if (key === 'accessToken') return Cookies.set(key, val);
 		window.sessionStorage.setItem(Local.setKey(key), JSON.stringify(val));
 	},
 	// 获取临时缓存
 	get(key: string) {
-		if (key === 'token') return Cookies.get(key);
+		if (key === 'accessToken') return Cookies.get(key);
 		let json = <string>window.sessionStorage.getItem(Local.setKey(key));
 		return JSON.parse(json);
 	},
 	// 移除临时缓存
 	remove(key: string) {
-		if (key === 'token') return Cookies.remove(key);
+		if (key === 'accessToken') return Cookies.remove(key);
 		window.sessionStorage.removeItem(Local.setKey(key));
 	},
 	// 移除全部临时缓存
 	clear() {
-		Cookies.remove('token');
+		Cookies.remove('accessToken');
 		window.sessionStorage.clear();
 	},
 };

admin-web/src/utils/u.ts

@@ -508,7 +508,7 @@ const u = {
             return ( money/100).toFixed(2);
         },
         fmtUrl: function (v: string) {
-            let token = Session.get('token')
+            let token = Session.get('accessToken')
             if(!v){
                 return '';
             }
@@ -520,7 +520,7 @@ const u = {
             return `${fileUrl}${v}`
         },
         fmtImg(v: string) {
-            let token = Session.get('token')
+            let token = Session.get('accessToken')
             if (u.isEmptyOrNull(v)) {
                 return "./image/placeholder.png";
             }
@@ -530,7 +530,7 @@ const u = {
             return `${fileUrl}${v}`
         },
         fmtPreview(v: string) {
-            let token = Session.get('token')
+            let token = Session.get('accessToken')
             if (u.isEmptyOrNull(v)) {
                 return "./image/placeholder.png";
             }

admin-web/src/views/login/component/account.vue

@@ -156,11 +156,11 @@ const onSignIn = async () => {
     password:encryptData(state.ruleForm.pwd)
   }
   $body(`/admin-user/login`, temp).then((res: any) => {
-    let {id,satoken} = res;
+    let {id,accessToken} = res;
     console.log(res)
-    if (satoken) {
+    if (accessToken) {
       // 存储 token 到浏览器缓存
-      Session.set('token', satoken);
+      Session.set('accessToken', accessToken);
       Cookies.set('userId', id);
 
       initData();

admin/src/main/resources/application-dev.yml

@@ -95,7 +95,7 @@ spring:
       port: 6380
       host: 121.40.98.15
       password: KtXA^Zx!TZmLEy(@JjB@2(TVG0kdy5)&
-      database: 0
+      database: 10
       lettuce:
         pool:
           min-idle: 1

admin/src/main/resources/application-prod.yml

@@ -93,9 +93,9 @@ spring:
   data:
     redis:
       port: 6379
-      host: 127.0.0.1
+      host: 121.40.98.15
       password: OPYCJ3mJpaU4IsP7ZeIyaus6FtHjLYmhNDGteuRc1gIFCAm7wi
-      database: 0
+      database: 10
       lettuce:
         pool:
           min-idle: 1

admin/src/main/resources/application.yml

@@ -23,9 +23,9 @@ mybatis-plus:
 
 sa-token:
   # jwt秘钥
-  jwt-secret-key: 12345678
+  jwt-secret-key: kym-admin
   # token 名称（同时也是 cookie 名称）
-  token-name: satoken
+  token-name: accessToken
   # token 有效期（单位：秒） 默认30分钟，-1 代表永久有效
   timeout: -1
   # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结

common/pom.xml

@@ -67,13 +67,13 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot3-starter</artifactId>
-            <version>1.35.0.RC</version>
+            <version>1.38.0</version>
         </dependency>
         <!-- sa-token 集成redis-->
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis-jackson</artifactId>
-            <version>1.35.0.RC</version>
+            <version>1.38.0</version>
         </dependency>
 
         <dependency>

common/src/main/java/com/kym/common/handler/GlobalExceptionHandler.java

@@ -72,7 +72,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(value = NotLoginException.class)
     @ResponseBody
-    public R handleLoginException(NotLoginException e) {
+    public R<?> handleLoginException(NotLoginException e) {
 
         var message = "";
         if (e.getType().equals(NotLoginException.NOT_TOKEN)) {

service/src/main/java/com/kym/service/admin/impl/AdminUserServiceImpl.java

@@ -81,7 +81,7 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
             this.updateById(user);
             LOGGER.info("操作员：" + mobilePhone + "/id:" + user.getId() + "登录");
             // token在cookie中有隐式返回，这里多做显式返回
-            return R.success(Map.of("id", user.getId(), "satoken", StpUtil.getTokenValue()));
+            return R.success(Map.of("id", user.getId(), "accessToken", StpUtil.getTokenValue()));
         }
         return R.failed(ResponseEnum.LOGIN_FAILED);
     }