From bded6b7cec0e08c38eb299c45698b3c0605c350b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 22 七月 2024 10:43:55 +0800
Subject: [PATCH] #
---
license.lic | 0
zy-asrs-admin/package.json | 6 +-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/security/SecurityConfig.java | 1 +
zy-asrs-admin/src/utils/request.js | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java | 1 -
zy-asrs-admin/vite.config.js | 11 +++++++++++
zy-asrs-wms/src/main/resources/license.lic | 0
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/license.lic b/license.lic
index 5821ac4..b80345a 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/zy-asrs-admin/package.json b/zy-asrs-admin/package.json
index 7189608..66fee95 100644
--- a/zy-asrs-admin/package.json
+++ b/zy-asrs-admin/package.json
@@ -4,7 +4,7 @@
"private": true,
"type": "module",
"scripts": {
- "dev": "vite --host",
+ "dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
@@ -22,9 +22,5 @@
"@vitejs/plugin-vue": "^5.0.5",
"@vue/babel-plugin-jsx": "^1.2.2",
"vite": "^5.3.1"
- },
- "devServer": {
- "host": "0.0.0.0",
- "port": "3000"
}
}
\ No newline at end of file
diff --git a/zy-asrs-admin/src/utils/request.js b/zy-asrs-admin/src/utils/request.js
index 5287ee0..04ff032 100644
--- a/zy-asrs-admin/src/utils/request.js
+++ b/zy-asrs-admin/src/utils/request.js
@@ -2,7 +2,7 @@
import { globalState } from '../config.js'
const instance = axios.create({
- baseURL: globalState.url,
+ baseURL: '',
timeout: 30000,
})
diff --git a/zy-asrs-admin/vite.config.js b/zy-asrs-admin/vite.config.js
index 59bd7cf..118650f 100644
--- a/zy-asrs-admin/vite.config.js
+++ b/zy-asrs-admin/vite.config.js
@@ -1,6 +1,7 @@
import { fileURLToPath, URL } from 'node:url'
import { defineConfig } from 'vite'
+import { globalState } from './src/config.js'
import vue from '@vitejs/plugin-vue'
import VueJsx from '@vitejs/plugin-vue-jsx'
@@ -14,5 +15,15 @@
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
}
+ },
+ server: {
+ host: '0.0.0.0',
+ port: 5173,
+ proxy: {
+ '/api': {
+ target: globalState.url,
+ changeOrigin: true
+ }
+ }
}
})
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/security/SecurityConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/security/SecurityConfig.java
index 42129dd..1358a55 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/security/SecurityConfig.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/security/SecurityConfig.java
@@ -33,6 +33,7 @@
public static final String[] FILTER_PATH = new String[]{
"/api/auth/host",
+ "/api/language/json",
"/test/**",
"/api/login",
"/api/code/auth",
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
index 45b6832..7d5d162 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
@@ -40,7 +40,6 @@
return R.ok().add(languageService.list());
}
- @PreAuthorize("hasAuthority('system:language:list')")
@PostMapping("/language/json")
public R json(@RequestBody Map<String, Object> map) {
LambdaQueryWrapper<Language> wrapper = new LambdaQueryWrapper<>();
diff --git a/zy-asrs-wms/src/main/resources/license.lic b/zy-asrs-wms/src/main/resources/license.lic
index 5821ac4..b80345a 100644
--- a/zy-asrs-wms/src/main/resources/license.lic
+++ b/zy-asrs-wms/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1