diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index c8fa65e..1d52e5e 100644
--- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ server:
tomcat:
relaxed-query-chars: [ '|','{','}','[',']' ] #字符问题:https://blog.csdn.net/CanYue_Yi/article/details/109182577
relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题: https://blog.csdn.net/weixin_41996632/article/details/90715118
- max-http-header-size: 65535
+ max-http-header-size: 655350
spring:
main:
allow-bean-definition-overriding: true
diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index d0b15fc..96e9b15 100644
--- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -99,38 +99,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ s
diff --git a/nladmin-ui/.env.development b/nladmin-ui/.env.development
index e37a9a4..6372089 100644
--- a/nladmin-ui/.env.development
+++ b/nladmin-ui/.env.development
@@ -2,7 +2,7 @@ ENV = 'development'
# 接口地址
VUE_APP_BASE_API = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_WS_API = 'ws://localhost:801'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/nladmin-ui/.env.production b/nladmin-ui/.env.production
index 65580f0..8d06dfb 100644
--- a/nladmin-ui/.env.production
+++ b/nladmin-ui/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
-VUE_APP_BASE_API = 'http://10.93.41.201:8010'
+VUE_APP_BASE_API = 'http://10.93.41.201:8011'
# 如果接口是 http 形式, wss 需要改为 ws
VUE_APP_WS_API = 'ws://10.93.41.201:8010'
diff --git a/nladmin-ui/public/config.js b/nladmin-ui/public/config.js
index 8db2f1c..ce71425 100644
--- a/nladmin-ui/public/config.js
+++ b/nladmin-ui/public/config.js
@@ -1,9 +1,9 @@
window.g = {
dev: {
- VUE_APP_BASE_API: 'http://127.0.0.1:8013'
+ VUE_APP_BASE_API: 'http://127.0.0.1:8011'
},
prod: {
- VUE_APP_BASE_API: 'http://127.0.0.1:8013'
+ VUE_APP_BASE_API: 'http://127.0.0.1:8011'
}
}
diff --git a/nladmin-ui/src/router/index.js b/nladmin-ui/src/router/index.js
index 30be333..4b6c092 100644
--- a/nladmin-ui/src/router/index.js
+++ b/nladmin-ui/src/router/index.js
@@ -5,16 +5,15 @@ import 'nprogress/nprogress.css' // progress bar style
import { getToken } from '@/utils/auth' // getToken from cookie
import { buildMenus } from '@/views/system/menu/menu'
import { filterAsyncRouter } from '@/store/modules/permission'
-import i18n from '@/i18n'
NProgress.configure({ showSpinner: false })// NProgress Configuration
-const whiteList = ['/login', '/expand']// no redirect whitelist
+const whiteList = ['/login']// no redirect whitelist
router.beforeEach((to, from, next) => {
if (to.meta.title) {
// document.title = to.meta.title + ' - ' + Config.title
- document.title = i18n.t(to.meta.title)
+ document.title = to.meta.title
}
NProgress.start()
if (getToken()) {
@@ -59,7 +58,8 @@ export const loadMenus = (next, to) => {
const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
- store.dispatch('GenerateRoutes', rewriteRoutes).then(() => { // 存储路由
+
+ store.dispatch('GenerateRoutes', rewriteRoutes).then(() => {
router.addRoutes(rewriteRoutes) // 动态添加可访问路由表
next({ ...to, replace: true })
})
diff --git a/nladmin-ui/src/utils/request.js b/nladmin-ui/src/utils/request.js
index 1855b52..c78e78e 100644
--- a/nladmin-ui/src/utils/request.js
+++ b/nladmin-ui/src/utils/request.js
@@ -21,6 +21,7 @@ service.interceptors.request.use(
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
config.headers['Content-Type'] = 'application/json'
+ config.headers['Accept-Language'] = window.localStorage.getItem('lang')
return config
},
error => {