From 3b1c53449c6b87cf7a4cba56225a68d8961de720 Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Sat, 4 Apr 2026 17:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cation.java => RuoyiAdminApplication.java} | 4 +- ...java => RuoyiAdminServletInitializer.java} | 4 +- .../dromara/gateway/filter/AuthFilter.java | 3 +- .../src/main/resources/application.yml | 43 +++---------------- ruoyi-site/ruoyi-h5/pom.xml | 8 ---- 5 files changed, 11 insertions(+), 51 deletions(-) rename ruoyi-site/ruoyi-admin/src/main/java/org/dromara/{DromaraApplication.java => RuoyiAdminApplication.java} (83%) rename ruoyi-site/ruoyi-admin/src/main/java/org/dromara/{DromaraServletInitializer.java => RuoyiAdminServletInitializer.java} (70%) diff --git a/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminApplication.java similarity index 83% rename from ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminApplication.java index 550be86d6..8a14a7468 100644 --- a/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminApplication.java @@ -13,10 +13,10 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt @EnableDubbo @SpringBootApplication -public class DromaraApplication { +public class RuoyiAdminApplication { public static void main(String[] args) { - SpringApplication application = new SpringApplication(DromaraApplication.class); + SpringApplication application = new SpringApplication(RuoyiAdminApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); diff --git a/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminServletInitializer.java similarity index 70% rename from ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminServletInitializer.java index 066a68377..535ce54ad 100644 --- a/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java +++ b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/RuoyiAdminServletInitializer.java @@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * * @author Lion Li */ -public class DromaraServletInitializer extends SpringBootServletInitializer { +public class RuoyiAdminServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(DromaraApplication.class); + return application.sources(RuoyiAdminApplication.class); } } diff --git a/ruoyi-site/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java b/ruoyi-site/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java index fc088ebb5..e62c2e98a 100644 --- a/ruoyi-site/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java +++ b/ruoyi-site/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java @@ -35,7 +35,8 @@ public class AuthFilter { // 拦截地址 .addInclude("/**") .addExclude("/actuator", "/actuator/**") - .addExclude("/favicon.ico", "/sso/getSsoAuthUrl", "/sso/isLogin", "/sso/doLoginByTicket") + .addExclude("/favicon.ico") +// .addExclude("/sso/getSsoAuthUrl", "/sso/isLogin", "/sso/doLoginByTicket") .addExclude(ignoreWhite.getWhites().toArray(new String[0])) // 鉴权方法：每次访问进入 .setAuth(obj -> { diff --git a/ruoyi-site/ruoyi-gateway/src/main/resources/application.yml b/ruoyi-site/ruoyi-gateway/src/main/resources/application.yml index e9a6729a3..65f41aaad 100644 --- a/ruoyi-site/ruoyi-gateway/src/main/resources/application.yml +++ b/ruoyi-site/ruoyi-gateway/src/main/resources/application.yml @@ -23,47 +23,14 @@ spring: lowerCaseServiceId: true enabled: true routes: - # 认证中心 - - id: ruoyi-auth - uri: lb://ruoyi-auth + # 系统模块：用户、租户、菜单、机构、字典 + - id: ruoyi-admin + uri: lb://ruoyi-admin predicates: - - Path=/auth/** + - Path=/ruoyi-admin/** filters: - StripPrefix=1 - # 代码生成 - - id: ruoyi-gen - uri: lb://ruoyi-gen - predicates: - - Path=/tool/** - filters: - - StripPrefix=1 - # 系统模块 - - id: ruoyi-system - uri: lb://ruoyi-system - predicates: - - Path=/system/**,/monitor/** - filters: - - StripPrefix=1 - # 资源服务 - - id: ruoyi-resource - uri: lb://ruoyi-resource - predicates: - - Path=/resource/** - filters: - - StripPrefix=1 - # workflow服务 - - id: ruoyi-workflow - uri: lb://ruoyi-workflow - predicates: - - Path=/workflow/** - # 演示服务 - - id: ruoyi-demo - uri: lb://ruoyi-demo - predicates: - - Path=/demo/** - filters: - - StripPrefix=1 - # MQ演示服务 + # 在线h5 - id: ruoyi-h5 uri: lb://ruoyi-h5 predicates: diff --git a/ruoyi-site/ruoyi-h5/pom.xml b/ruoyi-site/ruoyi-h5/pom.xml index 69749fee2..7c1f6314e 100644 --- a/ruoyi-site/ruoyi-h5/pom.xml +++ b/ruoyi-site/ruoyi-h5/pom.xml @@ -55,14 +55,6 @@ - - org.dromara - ruoyi-md-system-service - - - org.dromara - ruoyi-md-system-saas-service - org.dromara ruoyi-md-h5-service