From 2daa6014b87c8dfa0c157f09b3dc97a5d67f3b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= <liuyuxia@jsspisoft.com>
Date: Thu, 20 Jun 2024 10:56:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/eslint.config.js            | 13 +++++++++++++
 ui/dasadmin/package.json                | 12 ++++++++----
 ui/dasadmin/src/views/backend/login.vue |  1 -
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 ui/dasadmin/eslint.config.js

diff --git a/ui/dasadmin/eslint.config.js b/ui/dasadmin/eslint.config.js
new file mode 100644
index 00000000..56acd53a
--- /dev/null
+++ b/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),
+];
\ No newline at end of file
diff --git a/ui/dasadmin/package.json b/ui/dasadmin/package.json
index 0992b7d0..8344dd79 100644
--- a/ui/dasadmin/package.json
+++ b/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/parser": "7.12.0",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
+        "@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",
diff --git a/ui/dasadmin/src/views/backend/login.vue b/ui/dasadmin/src/views/backend/login.vue
index 343c1f43..c9dd61f2 100644
--- a/ui/dasadmin/src/views/backend/login.vue
+++ b/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()

From ec979fea02c30e3fe37e6cdab45c64b54dd8dc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= <liuyuxia@jsspisoft.com>
Date: Thu, 20 Jun 2024 11:22:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/.env.production             | 2 +-
 ui/dasadmin/src/api/common.ts           | 3 +--
 ui/dasadmin/src/views/backend/login.vue | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/dasadmin/.env.production b/ui/dasadmin/.env.production
index 7ef3784f..2942c16f 100644
--- a/ui/dasadmin/.env.production
+++ b/ui/dasadmin/.env.production
@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base路径
-VITE_BASE_PATH = '/'
+VITE_BASE_PATH = './'
 
 # 导出路径
 VITE_OUT_DIR = 'dist'
diff --git a/ui/dasadmin/src/api/common.ts b/ui/dasadmin/src/api/common.ts
index fd93f1e6..3e35a5bc 100644
--- a/ui/dasadmin/src/api/common.ts
+++ b/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'),
         },
     })
 }
diff --git a/ui/dasadmin/src/views/backend/login.vue b/ui/dasadmin/src/views/backend/login.vue
index c9dd61f2..efb15144 100644
--- a/ui/dasadmin/src/views/backend/login.vue
+++ b/ui/dasadmin/src/views/backend/login.vue
@@ -191,7 +191,7 @@ const onSubmit = () => {
                     avatar: '',
                     last_login_time: '',
                     token: res.data.token,
-                    refresh_token: '',
+                    refresh_token: res.data.refershToken,
                     // 是否是superAdmin，用于判定是否显示终端按钮等，不做任何权限判断
                     super: false,
                 })