升级@fskj-admin/core

package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@fskj-admin/core": "^1.0.0",
+    "@fskj-admin/core": "^1.1.1",
     "@icon-park/vue-next": "^1.4.2",
     "@vueuse/core": "^10.7.1",
     "@wangeditor/editor": "^5.1.23",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ dependencies:
     specifier: ^2.3.1
     version: 2.3.1(vue@3.4.5)
   '@fskj-admin/core':
-    specifier: ^1.0.0
-    version: 1.0.0
+    specifier: ^1.1.1
+    version: 1.1.1
   '@icon-park/vue-next':
     specifier: ^1.4.2
     version: 1.4.2(vue@3.4.5)
@@ -809,8 +809,8 @@ packages:
     resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
     dev: false
 
-  /@fskj-admin/core@1.0.0:
-    resolution: {integrity: sha512-Biy1JYynAIG0NbV8Pa5PG+1gLGB0ssVkSCXdl8BAkJLlVD9Bl6cEwIgNvhthHDal4G/NuZ8IcAfOpk9aj7wBdg==}
+  /@fskj-admin/core@1.1.1:
+    resolution: {integrity: sha512-bV/VPHSoJ7Pb6P7haII+xjjKMez1uutaEzWP2Oi2TOO/7TLFRM3vJU4aFE7HzgB6IECUgl4Pl/jxLKLrkziTsA==}
     dev: false
 
   /@humanwhocodes/config-array@0.11.13:

src/components/core/GlobalSetting.vue

@@ -61,7 +61,7 @@ const themeNav = computed(() => themeStore.themeNav)
       <el-color-picker
         :model-value="themeColor"
         :predefine="themeColors"
-        @change="value => themeStore.setThemeColor(value as string)"
+        @change="(value: string) => themeStore.setThemeColor(value)"
       />
     </el-space>
 

src/components/form/ElEditor.vue

@@ -2,9 +2,9 @@
 import '@wangeditor/editor/dist/css/style.css'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import type { IToolbarConfig, IEditorConfig } from '@wangeditor/editor'
-import { useUserStore } from '@/stores/user'
-import { ACCESS_TOKEN } from '@/utils/constants'
+import { ACCESS_TOKEN, TOKEN_PREFIX } from '@/utils/constants'
 import { isAbsolutePath } from '@/utils/utils'
+import { getToken } from '@/utils/micro'
 import config from '@/config/defaultSetting'
 
 interface Props {
@@ -34,13 +34,12 @@ const valueHtml = computed({
   set: value => emits('update:modelValue', value)
 })
 
-const userStore = useUserStore()
 const editorConfig = {
   placeholder: '请输入内容...',
   MENU_CONF: {
     uploadImage: {
       server: isAbsolutePath(props.uploadApi) ? props.uploadApi : import.meta.env.VITE_BASE_API + props.uploadApi,
-      headers: { [ACCESS_TOKEN]: userStore.token },
+      headers: { [ACCESS_TOKEN]: TOKEN_PREFIX + getToken() },
       fieldName: props.fieldName,
       // 自定义插入图片
       customInsert(res: any, insertFn: Function) {

src/main.ts

@@ -115,10 +115,12 @@ app.use(router)
 app.use(ElementPlus)
 app.use(useTable)
 app.use(FsAdminCore, {
-  oss: true,
-  ossHost: '',
-  ossUpload,
-  baseApi: import.meta.env.VITE_BASE_API
+  upload: {
+    oss: true,
+    ossHost: '',
+    ossUpload,
+    baseApi: import.meta.env.VITE_BASE_API
+  }
 })
 registerComponent(app)
 

src/utils/constants.ts

@@ -81,6 +81,7 @@ export const themeNavList = [
 ]
 
 export const ACCESS_TOKEN = 'Authorization'
+export const TOKEN_PREFIX = 'Bearer '
 
 export const containerTypes = [
   'form-tabs',

src/utils/request.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { ACCESS_TOKEN } from '@/utils/constants'
+import { ACCESS_TOKEN, TOKEN_PREFIX } from '@/utils/constants'
 import { logout, getToken } from '@/utils/micro'
 
 const request = axios.create({
@@ -35,7 +35,7 @@ const errorHandler = (error: any) => {
 }
 
 request.interceptors.request.use(config => {
-  const token = 'Bearer ' + getToken()
+  const token = TOKEN_PREFIX + getToken()
   config.headers = config.headers || {}
 
   if (token) {