From dfd2ec45f45f0238231684a57b52a9606fd568c3 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 17 Jun 2024 10:13:23 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=20spring=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orion/visor/framework/common/constant/AppConst.java | 5 ++++- .../com/orion/visor/framework/common/utils/PathUtils.java | 2 +- .../banner/core/runner/BannerApplicationRunner.java | 2 +- orion-visor-launch/src/main/resources/application.yaml | 8 ++++---- .../module/infra/service/impl/SystemUserServiceImpl.java | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index ce24c084..75248f53 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java @@ -16,7 +16,10 @@ public interface AppConst extends OrionConst { */ String VERSION = "2.0.8"; - String ORION_VISOR = "orion-visor"; + /** + * 同 ${spring.application.name} + */ + String APP_NAME = "orion-visor"; String GITHUB = "https://github.com/dromara/orion-visor"; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java index c7e1cfc4..61631269 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java @@ -47,7 +47,7 @@ public class PathUtils { public static String getAppPath(boolean isWindows, String username) { return getHomePath(isWindows, username) + "/" + AppConst.ORION - + "/" + AppConst.ORION_VISOR; + + "/" + AppConst.APP_NAME; } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java index 8f0bac68..b9ca36df 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java @@ -51,7 +51,7 @@ public class BannerApplicationRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) { AnsiAppender appender = AnsiAppender.create() - .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n"); + .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor v" + version + " 服务已启动(" + env + ") ::\n"); // swagger 地址 if (apiDocsEnabled) { appender.append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档 ") diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 19771a27..855dfb64 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -3,7 +3,7 @@ server: spring: application: - name: orion-visor-launch + name: orion-visor profiles: active: dev main: @@ -142,7 +142,7 @@ knife4j: logging: file: - path: ${user.home}/orion/logs/orion-visor + path: ${user.home}/orion/logs/${spring.application.name} name: ${logging.file.path}/app.log logback: rollingpolicy: @@ -253,14 +253,14 @@ orion: timestamp-prefix: false date-directory: false storage-path: ${user.home} - base-path: /orion/orion-visor/storage + base-path: /orion/${spring.application.name}/storage # 日志文件存储 logs: enabled: true timestamp-prefix: false date-directory: false storage-path: ${user.home} - base-path: /orion/orion-visor/logs + base-path: /orion/${spring.application.name}/logs security: password-encoder-length: 4 # 匿名接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java index c4e952f6..0db470d8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -342,7 +342,7 @@ public class SystemUserServiceImpl implements SystemUserService { /** * 删除主要用户缓存 其他的缓存自动过期 * - * @param userList + * @param userList userList */ private void deleteUserCacheKey(List userList) { Set deleteKeys = new HashSet<>();