From c755f7cbcab36626eadabbe2a77666f9e4ddaec7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 26 十一月 2023 19:45:17 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java | 8 +++++++-
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 14 ++++++++++----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
index 26ae095..e65283e 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
@@ -66,7 +66,13 @@
/**
* 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
*/
- UBCS_USER("ubcs_user","鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟")
+ UBCS_USER("ubcs_user","鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟"),
+
+ /**
+ * 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
+ */
+ UBCS_ADMIN("ubcs_user","鏈嶅姟娌荤悊鏈嶅姟")
+
;
/**
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index 55114e0..021d373 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -16,6 +16,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -36,7 +38,7 @@
*/
@Service
@Slf4j
-public class LogLocalServiceImpl implements ILogLocalService{
+public class LogLocalServiceImpl implements ILogLocalService, EnvironmentAware {
/**
* 鍚勪釜鏈嶅姟瀛樻斁鐨勭殑鐖惰矾寰�
@@ -55,9 +57,13 @@
*/
private Boolean isWindows = true;
- {
- String os = System.getProperty("os.name").toLowerCase();
- //榛樿灏遍厤缃负windows鐨勶紝濡傛灉涓嶆槸褰撳墠绯荤粺涓嶆槸windows灏遍渶瑕佸鍏惰浆鎹负linux鐨勬枃浠惰矾寰勬牸寮�
+ /**
+ * 鏍规嵁褰撳墠杩愯鐨勭幆澧冿紝瀵归厤缃殑鏃ュ織璺緞鏍煎紡杩涜璋冩暣
+ * @param environment
+ */
+ @Override
+ public void setEnvironment(Environment environment) {
+ String os = environment.getProperty("os.name").toLowerCase();
if (!os.contains("win")) {
this.PARENTPATH = this.PARENTPATH.substring(this.PARENTPATH.lastIndexOf(":") + 1).replace("\\", "/");
this.LOGPATH = this.LOGPATH.replace("\\", "/");
--
Gitblit v1.9.3