日志优化

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/constants/SysConstants.java

@@ -1,5 +1,6 @@
 package com.fdkankan.modeling.constants;
 
+import cn.hutool.core.util.StrUtil;
 import com.fdkankan.common.util.FileUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,7 +38,11 @@ public class SysConstants {
     public void setHostName(String filePath){
         try {
             SysConstants.hostName = FileUtils.readFile(filePath);
-            log.error("从文件({})中获取服务器名称:{}", filePath,hostName);
+            //去除换行符
+            if(StrUtil.isNotEmpty(SysConstants.hostName)){
+                SysConstants.hostName = SysConstants.hostName.trim().replaceAll("\\s","");
+            }
+            log.info("从文件({})中获取服务器名称:{}", filePath,hostName);
         } catch (Exception e) {
             log.error("从文件中获取服务器名称失败,文件路径{}", filePath);
             e.printStackTrace();

4dkankan-center-modeling/src/main/resources/bootstrap-pro.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-pro
         extension-configs:
           - data-id: 4dkankan-center-modeling.yaml
             group: DEFAULT_GROUP
@@ -29,7 +29,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 192.168.0.47:8848
-        namespace: public
+        namespace: 4dkankan-pro
         metadata:
           management:
             context-path: ${server.servlet.context-path}/actuator

4dkankan-center-modeling/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-modeling.yaml
             group: DEFAULT_GROUP

4dkankan-center-modeling/src/main/resources/logback-spring.xml

@@ -4,10 +4,12 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+	<define name="hostName" class = "com.fdkankan.common.config.LogPathHostNameProperty"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/data/4dkankan/logs/4dkankan_center_modeling" />
+	<property name="log.path" value="${LOG_PATH}/model/${hostName}" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

4dkankan-center-platform/src/main/resources/bootstrap-pro.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-pro
         extension-configs:
           - data-id: 4dkankan-center-platform.yaml
             group: DEFAULT_GROUP
@@ -38,7 +38,7 @@ spring:
 
       discovery:
         server-addr: 192.168.0.47:8848
-        namespace: public
+        namespace: 4dkankan-pro
         metadata:
           management:
             context-path: ${server.servlet.context-path}/actuator

4dkankan-center-platform/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-platform.yaml
             group: DEFAULT_GROUP

4dkankan-center-platform/src/main/resources/logback-spring.xml

@@ -4,10 +4,12 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+	<define name="hostName" class = "com.fdkankan.common.config.LogPathHostNameProperty"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/data/4dkankan/logs/4dkankan_center_platform" />
+	<property name="log.path" value="${LOG_PATH}/platform" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

4dkankan-center-scene/src/main/resources/bootstrap-dev.yml

@@ -1,4 +1,4 @@
-spring:
++-spring:
 #  jackson:
 #    serialization:
 #      #关闭jackson转换 实体属性空值校验

4dkankan-center-scene/src/main/resources/bootstrap-pro.yml

@@ -20,7 +20,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-pro
         extension-configs:
           - data-id: 4dkankan-center-scene.yaml
             group: DEFAULT_GROUP
@@ -47,7 +47,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 192.168.0.47:8848
-        namespace: public
+        namespace: 4dkankan-pro
     sentinel:
       transport:
         dashboard: 192.168.0.47:8888

4dkankan-center-scene/src/main/resources/bootstrap-test.yml

@@ -20,7 +20,7 @@ spring:
       config:
         server-addr: 192.168.0.47:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-scene.yaml
             group: DEFAULT_GROUP

4dkankan-center-scene/src/main/resources/logback-spring.xml

@@ -5,9 +5,12 @@
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
 
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+	<define name="hostName" class = "com.fdkankan.common.config.LogPathHostNameProperty"/>
+
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/data/4dkankan/logs/4dkankan_center_scene" />
+	<property name="log.path" value="${LOG_PATH}/scene" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

4dkankan-common/src/main/java/com/fdkankan/common/config/LogPathHostNameProperty.java

@@ -0,0 +1,38 @@
+package com.fdkankan.common.config;
+
+import ch.qos.logback.core.PropertyDefinerBase;
+import com.fdkankan.common.util.FileUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+//@Component
+public class LogPathHostNameProperty extends PropertyDefinerBase {
+
+//    @Value("${hostName.filePath:/opt/hosts/hosts.txt}")
+//    private String hostNamePath;
+
+    @Override
+    public String getPropertyValue() {
+
+        String hostNamePath = getContext().getProperty("hostName.filePath");
+        if(ObjectUtils.isEmpty(hostNamePath)){
+            hostNamePath = "/opt/hosts/hosts.txt";
+        }
+        String hostName = "null";
+        try {
+            hostName = FileUtils.readFile(hostNamePath);
+            // 去除空格
+            if(!ObjectUtils.isEmpty(hostName)){
+                hostName = hostName.trim().replaceAll("\\s","");
+            }
+        } catch (Exception e) {
+            System.err.println("=========================error======================");
+            System.err.println("从文件中获取服务器名称失败,文件路径："+hostNamePath);
+            return hostName;
+        }
+        return hostName;
+    }
+
+
+}

4dkankan-common/src/main/java/com/fdkankan/common/exception/GlobalExceptionHandler.java

@@ -66,6 +66,15 @@ public class GlobalExceptionHandler {
 //        return ResultData.error(ServerCode.SYSTEM_ERROR.code(), "系统繁忙，请稍后重试");
 //    }
 
+    /**
+     * <p>
+            form表达提交，缺少参数异常处理
+     * </p>
+     * @author dengsixing
+     * @date 2022/4/14
+     * @param e
+     * @return com.fdkankan.common.response.ResultData
+     **/
     @ResponseBody
     @ExceptionHandler(value = MissingServletRequestParameterException.class)
     public ResultData missingServletRequestParameterException(
@@ -75,6 +84,15 @@ public class GlobalExceptionHandler {
             ServerCode.PARAM_REQUIRED.formatMessage(e.getParameterName()));
     }
 
+    /**
+     * <p>
+     form表达提交，文件为空异常处理
+     * </p>
+     * @author dengsixing
+     * @date 2022/4/14
+     * @param e
+     * @return com.fdkankan.common.response.ResultData
+     **/
     @ResponseBody
     @ExceptionHandler(value = MultipartException.class)
     public ResultData multipartException(MultipartException e){
@@ -85,7 +103,7 @@ public class GlobalExceptionHandler {
 
 
     /**
-     * 校验错误拦截处理
+     * 参数校验异常拦截处理
      */
     @ResponseBody
     @ExceptionHandler({BindException.class,MethodArgumentNotValidException.class})
@@ -111,7 +129,7 @@ public class GlobalExceptionHandler {
                 }
             }
         }
-        return ResultData.error(ErrorCode.PARAM_FORMAT_ERROR.code(), message);
+        return ResultData.error(ErrorCode.PARAM_REQUIRED.code(), message);
     }