初始化22222333

backend/src/main/java/com/jiayue/pfr/config/SaTokenConfiguration.java

@@ -25,7 +25,7 @@ public class SaTokenConfiguration implements WebMvcConfigurer {
     @Autowired
     public void configSaToken(SaTokenConfig config) {
         config.setTokenName("satoken");             // token名称 (同时也是cookie名称)
-        config.setTimeout(30 * 24 * 60 * 60);       // token有效期，单位s 默认30天, -1代表永不过期
+        config.setTimeout(-1);       // token有效期，单位s 默认30天, -1代表永不过期
         config.setActiveTimeout(-1);              // token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
         config.setIsConcurrent(false);               // 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
         config.setIsShare(false);                    // 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)

backend/src/main/java/com/jiayue/pfr/config/SystemInitConifg.java

@@ -1,30 +0,0 @@
-package com.jiayue.pfr.config;
-
-import com.jiayue.pfr.service.cmf.SysParameterService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 系统启动配置
- *
- * @author jy
- * @since 2023/11/10
- */
-@Configuration
-public class SystemInitConifg {
-    @Autowired
-    SysParameterService sysParameterService;
-
-    @Bean
-    public void initSysParameter() {
-        sysParameterService.queryByKey("ieSignal","ON");
-        sysParameterService.queryByKey("dbMin","49.95");
-        sysParameterService.queryByKey("dbMax","50.05");
-        sysParameterService.queryByKey("capacity","100");
-        sysParameterService.queryByKey("epMin","0.02");
-        sysParameterService.queryByKey("limitMin","0.2");
-        sysParameterService.queryByKey("epMax","0.05");
-        sysParameterService.queryByKey("limitMax","0.1");
-    }
-}

backend/src/main/java/com/jiayue/pfr/controller/alg/FrequencyController.java

@@ -3,8 +3,10 @@ package com.jiayue.pfr.controller.alg;
 import com.jiayue.pfr.constant.CustomException;
 import com.jiayue.pfr.protocol.frequency.DataBean;
 import com.jiayue.pfr.protocol.frequency.DataBeanPacker;
+import com.jiayue.pfr.service.cmf.SysParameterService;
 import com.jiayue.pfr.util.SaResultRefit;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -19,6 +21,8 @@ import java.math.BigDecimal;
 @RequestMapping("/frequencyController")
 @Slf4j
 public class FrequencyController {
+    @Autowired
+    private SysParameterService sysParameterService;
     /**
      * 手动调试频率-有功
      */

backend/src/main/java/com/jiayue/pfr/controller/cmf/UserLoginController.java

@@ -8,10 +8,7 @@ import com.jiayue.pfr.constant.CustomException;
 import com.jiayue.pfr.entity.SysMenu;
 import com.jiayue.pfr.entity.SysPolicy;
 import com.jiayue.pfr.entity.SysUser;
-import com.jiayue.pfr.service.cmf.SysMenuService;
-import com.jiayue.pfr.service.cmf.SysPolicyService;
-import com.jiayue.pfr.service.cmf.SysUserService;
-import com.jiayue.pfr.service.cmf.UmsAdminService;
+import com.jiayue.pfr.service.cmf.*;
 import com.jiayue.pfr.util.IPUtils;
 import com.jiayue.pfr.util.IdUtils;
 import com.jiayue.pfr.util.LocalCache;
@@ -47,6 +44,8 @@ public class UserLoginController {
     SysPolicyService sysPolicyService;
     @Autowired
     UmsAdminService umsAdminService;
+    @Autowired
+    SysParameterService sysParameterService;
 
     /**
      * 生成验证码
@@ -226,6 +225,16 @@ public class UserLoginController {
         Map<String,String> tokenMap = new HashMap<>();
         tokenMap.put("token",saTokenInfo.getTokenValue());
         tokenMap.put("tokenHead",saTokenInfo.getTokenName());
+
+        sysParameterService.queryByKey("ieSignal","ON");
+        sysParameterService.queryByKey("dbMin","49.95");
+        sysParameterService.queryByKey("dbMax","50.05");
+        sysParameterService.queryByKey("capacity","100");
+        sysParameterService.queryByKey("epMin","0.02");
+        sysParameterService.queryByKey("limitMin","0.2");
+        sysParameterService.queryByKey("epMax","0.05");
+        sysParameterService.queryByKey("limitMax","0.1");
+
         return  SaResultRefit.data(tokenMap);
     }
 

ui/src/utils/request.js

@@ -52,6 +52,7 @@ service.interceptors.response.use(
       removeToken()
       resetRouter()
       router.push('/login')
+      return Promise.reject('error')
     }
     else if (data.code !== 200) {
       Message({

ui/yarn.lock

@@ -3700,13 +3700,12 @@
     "jsbn" "~0.1.0"
     "safer-buffer" "^2.1.0"
 
-"echarts@5.4.0":
-  "integrity" "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w=="
-  "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.4.0.tgz"
-  "version" "5.4.0"
+"echarts@^4.8.0":
+  "integrity" "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA=="
+  "resolved" "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz"
+  "version" "4.9.0"
   dependencies:
-    "tslib" "2.3.0"
-    "zrender" "5.4.0"
+    "zrender" "4.3.2"
 
 "editorconfig@^0.15.3":
   "integrity" "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="
@@ -9320,7 +9319,7 @@
   "resolved" "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz"
   "version" "1.14.1"
 
-"tslib@^2.1.0", "tslib@2.3.0":
+"tslib@^2.1.0":
   "integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
   "resolved" "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
   "version" "2.3.0"
@@ -10086,9 +10085,7 @@
     "normalize-path" "^1.0.0"
     "strip-indent" "^2.0.0"
 
-"zrender@5.4.0":
-  "integrity" "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA=="
-  "resolved" "https://registry.npmmirror.com/zrender/-/zrender-5.4.0.tgz"
-  "version" "5.4.0"
-  dependencies:
-    "tslib" "2.3.0"
+"zrender@4.3.2":
+  "integrity" "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
+  "resolved" "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz"
+  "version" "4.3.2"