From 8d4047d3ca118637a761ead5fde77a6e2db60dab Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Mon, 27 May 2024 15:24:13 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E9=A3=8E=E6=A0=BC=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- .../system/remote/factory/RemoteLogFallbackFactory.java | 2 +- .../src/main/java/com/muyu/gateway/filter/AuthFilter.java | 1 + .../cloud-modules-gen/src/main/resources/bootstrap.yml | 2 ++ .../src/main/java/com/muyu/job/config/ScheduleConfig.java | 4 ++-- .../cloud-modules-job/src/main/resources/bootstrap.yml | 2 ++ .../java/com/muyu/system/service/impl/SysMenuServiceImpl.java | 4 ++-- .../cloud-modules-system/src/main/resources/bootstrap.yml | 4 +++- skywalking/ins | 2 ++ 9 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 skywalking/ins diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 51eec25..db25abe 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9200 + port: 9500 # nacos线上地址 nacos: diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java index 5998c17..1fc0491 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java @@ -20,7 +20,7 @@ public class RemoteLogFallbackFactory implements FallbackFactory saveLog (SysOperLog sysOperLog, String source) { diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java index 47e073f..b549a2f 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java @@ -44,6 +44,7 @@ public class AuthFilter implements GlobalFilter, Ordered { ServerHttpRequest.Builder mutate = request.mutate(); String url = request.getURI().getPath(); + log.info("请求路径：[{}]", url); // 跳过不需要验证的路径 if (StringUtils.matches(url, ignoreWhite.getWhites())) { return chain.filter(exchange); diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 33fd18c..830f8bc 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -11,6 +11,8 @@ nacos: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: cloud-gen diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java index e2edda4..bc1f96f 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "MuYuScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("MuYuScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/cloud-modules/cloud-modules-job/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-job/src/main/resources/bootstrap.yml index 9865cbc..ba1838a 100644 --- a/cloud-modules/cloud-modules-job/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-job/src/main/resources/bootstrap.yml @@ -11,6 +11,8 @@ nacos: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: cloud-job diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 3a1befb..d23ecdb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -162,7 +162,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl .title(menu.getMenuName()) .icon(menu.getIcon()) .noCache(StringUtils.equals("1", menu.getIsCache())) - .link(menu.getPath()) + .link(StringUtils.ishttp(menu.getPath())? menu.getPath():null) .build() ); List cMenus = menu.getChildren(); @@ -182,7 +182,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl .title(menu.getMenuName()) .icon(menu.getIcon()) .noCache(StringUtils.equals("1", menu.getIsCache())) - .link(menu.getPath()) + .link(StringUtils.ishttp(menu.getPath())? menu.getPath():null) .build() ); children.setQuery(menu.getQuery()); diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index e6db29f..a43725d 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9201 + port: 9701 # nacos线上地址 nacos: @@ -11,6 +11,8 @@ nacos: # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 name: cloud-system diff --git a/skywalking/ins b/skywalking/ins new file mode 100644 index 0000000..b868d78 --- /dev/null +++ b/skywalking/ins @@ -0,0 +1,2 @@ +-javaagent:.\skywalking-agent\skywalking-agent.jar +-Dskywalking.agent.service_name=muyu::serverName