Merge branch 'main' of https://git.jsspisoft.com/ry-das

ui/dasadmin/.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base路径
-VITE_BASE_PATH = '/'
+VITE_BASE_PATH = './'
 
 # 导出路径
 VITE_OUT_DIR = 'dist'

ui/dasadmin/eslint.config.js

@@ -0,0 +1,13 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
+import { fixupConfigRules } from "@eslint/compat";
+
+
+export default [
+  {files: ["**/*.{js,mjs,cjs,jsx}"]},
+  { languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } } },
+  {languageOptions: { globals: globals.browser }},
+  pluginJs.configs.recommended,
+  ...fixupConfigRules(pluginReactConfig),
+];

ui/dasadmin/package.json

@@ -33,19 +33,23 @@
         "vue-router": "4.3.2"
     },
     "devDependencies": {
+        "@eslint/compat": "^1.1.0",
+        "@eslint/js": "^9.5.0",
         "@types/lodash-es": "4.17.12",
         "@types/node": "20.14.0",
         "@types/nprogress": "0.2.3",
         "@types/sortablejs": "1.15.8",
-        "@typescript-eslint/eslint-plugin": "7.12.0",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
-        "@typescript-eslint/parser": "7.12.0",
+        "@typescript-eslint/parser": "^7.13.1",
         "@vitejs/plugin-vue": "5.0.5",
         "async-validator": "4.2.5",
         "crypto-js": "^4.2.0",
-        "eslint": "8.56.0",
+        "eslint": "^8.57.0",
         "eslint-config-prettier": "9.1.0",
+        "eslint-plugin-react": "^7.34.3",
         "eslint-plugin-vue": "9.26.0",
-        "prettier": "3.3.0",
+        "globals": "^15.6.0",
+        "prettier": "^3.3.2",
         "sass": "1.77.4",
         "typescript": "5.4.5",
         "vite": "5.2.12",

ui/dasadmin/src/api/common.ts

@@ -272,12 +272,11 @@ export function getTableFieldList(table: string, clean = true, connection = '')
 
 export function refreshToken() {
     const adminInfo = useAdminInfo()
-    const userInfo = useUserInfo()
     return createAxios({
         url: refreshTokenUrl,
         method: 'POST',
         data: {
-            refreshToken: isAdminApp() ? adminInfo.getToken('refresh') : userInfo.getToken('refresh'),
+            refreshToken: adminInfo.getToken('refresh'),
         },
     })
 }

ui/dasadmin/src/views/backend/login.vue

@@ -98,7 +98,6 @@ import router from '/@/router'
 import toggleDark from '/@/utils/useDark'
 import { fullUrl } from '/@/utils/common'
 import { adminBaseRoutePath } from '/@/router/static/adminBase'
-import JSEncrypt from 'jsencrypt'
 let timer: number
 
 const config = useConfig()
@@ -192,7 +191,7 @@ const onSubmit = () => {
                     avatar: '',
                     last_login_time: '',
                     token: res.data.token,
-                    refresh_token: '',
+                    refresh_token: res.data.refershToken,
                     // 是否是superAdmin，用于判定是否显示终端按钮等，不做任何权限判断
                     super: false,
                 })