diff --git a/web-fast/pom.xml b/web-fast/pom.xml index 955ab5e8d..4a5d19af4 100644 --- a/web-fast/pom.xml +++ b/web-fast/pom.xml @@ -86,6 +86,13 @@ ${project.parent.version} --> + + + com.jeesite + jeesite-vue-dist + 5.7.0-SNAPSHOT + + diff --git a/web-fast/src/main/java/com/jeesite/modules/FastApplication.java b/web-fast/src/main/java/com/jeesite/modules/FastApplication.java index e4e47e287..fedee528d 100644 --- a/web-fast/src/main/java/com/jeesite/modules/FastApplication.java +++ b/web-fast/src/main/java/com/jeesite/modules/FastApplication.java @@ -6,11 +6,13 @@ import com.jeesite.common.config.Global; import com.jeesite.common.io.FileUtils; +import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.stereotype.Controller; @@ -35,6 +37,16 @@ public static void setJeeSiteInitDataProperty() { public static void main(String[] args) throws UnknownHostException { FastApplication.setJeeSiteInitDataProperty(); SpringApplication.run(FastApplication.class, args); + String vuePath = Global.getProperty("vuePath"); + String ctxPath = Global.getProperty("server.servlet.context-path"); + if (StringUtils.isNoneBlank(vuePath, ctxPath)) { + logger.info( + "\r\n\r\n==============================================================\r\n" + + "\r\n 存在此提示:因为您修改了 server.servlet.context-path 参数,需要您" + + "\r\n 同步修改 jeesite-vue/.env.tomcat 中的 VITE_PUBLIC_PATH 并重新打包 " + + "\r\n 如:context-path: " + ctxPath +" 即对应为 VITE_PUBLIC_PATH = " + ctxPath + vuePath + + "\r\n\r\n==============================================================\r\n"); + } logger.info( "\r\n\r\n==============================================================\r\n" + "\r\n 启动完成,访问地址:http://127.0.0.1:" @@ -52,11 +64,12 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { } @Controller - public class JeeSiteController extends BaseController { + @ConditionalOnProperty(name = "server.servlet.context-path", havingValue = "") + public static class JeeSiteController extends BaseController { @RequestMapping(value = "/js/**") public String login() { - return REDIRECT + adminPath + "/login"; + return REDIRECT + Global.getProperty("defaultPath"); } } diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml index 79cb30366..7ab888526 100644 --- a/web-fast/src/main/resources/config/application.yml +++ b/web-fast/src/main/resources/config/application.yml @@ -107,6 +107,16 @@ logging: #========== System settings ===========# #======================================# +# 管理基础路径 +adminPath: /a + +# 前端基础路径 +frontPath: /f + +# Vue 资源文件路径,与 VITE_PUBLIC_PATH 一致。 +# 映射到 src/main/resources/{vuePath} 文件夹 +vuePath: /vue + # 用户相关 user: @@ -135,9 +145,10 @@ state: # Shiro 相关 shiro: - + # 主页路径 - defaultPath: ${shiro.loginUrl} +# defaultPath: ${shiro.loginUrl} + defaultPath: ${vuePath}/login # 登录相关设置 loginUrl: ${adminPath}/login