diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index c8e5fb4f..95f8f269 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -23,7 +23,7 @@ apiMode: true server: port: 8980 servlet: - context-path: /js + context-path: ~ register-default-servlet: false tomcat: uri-encoding: UTF-8 @@ -49,6 +49,11 @@ server: # 当 Nginx 为 https,tomcat 为 http 时,设置该选项为 true schemeHttps: false +vue: + ctxPath: + replaceText: /vuePath + +vuePath: /worker #======================================# #========= Database settings ==========# #======================================# @@ -405,14 +410,16 @@ state: # Shiro 相关 shiro: + + defaultPath: ${vuePath}/login # 主页路径 - defaultPath: ${shiro.loginUrl} - - # 登录相关设置 - loginUrl: ${adminPath}/login - logoutUrl: ${shiro.loginUrl} - successUrl: ${adminPath}/index +# defaultPath: ${shiro.loginUrl} +# +# # 登录相关设置 +# loginUrl: ${adminPath}/login +# logoutUrl: ${shiro.loginUrl} +# successUrl: ${adminPath}/index # # Apereo CAS 相关配置(标准版) # casServerUrl: http://127.0.0.1:8981/cas diff --git a/web-vue/web/.env.tomcat b/web-vue/web/.env.tomcat index bdb0d1c9..ccd8ad42 100644 --- a/web-vue/web/.env.tomcat +++ b/web-vue/web/.env.tomcat @@ -2,7 +2,7 @@ VITE_PUBLIC_PATH = /vuePath # 打包编译发布路径 -VITE_OUTPUT_DIR = ../../jeesite-vue-dist/5.14.0/vue-dist/src/main/resources/vue-ui +VITE_OUTPUT_DIR = ../../web-api/src/main/resources/worker # 路由模式(true: history、false: hash) VITE_ROUTE_WEB_HISTORY = true