1125需要变更

easydo-chengfa/pom.xml

@@ -97,6 +97,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.10</version>
+        </dependency>
         <!-- <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>

easydo-chengfa/src/main/java/easydo/technology/config/WebLogAspect.java

@@ -1,5 +1,6 @@
 package easydo.technology.config;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.google.gson.Gson;
 
 import easydo.technology.annotation.WebLog;
@@ -50,7 +51,7 @@ public class WebLogAspect {
         // 打印请求 url
         logger.info("URL======>{},Class Method======>{}.{},Request Args======>{},Ip======>{}", request.getRequestURL().toString(),
                 joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(),
-                new Gson().toJson(joinPoint.getArgs()),request.getRemoteAddr());
+                new Gson().toJson(joinPoint.getArgs()), ServletUtil.getClientIP(request));
 
     }
 

easydo-chengfa/src/main/java/easydo/technology/enums/ChengfaEnum.java

@@ -65,8 +65,8 @@ public enum ChengfaEnum {
     REDIS_KEY_SUPPLIER_EVALUATE_RULE("supplier_evaluate_rule", "供应商评价规则"),
 
     CONTRACT_PLAN_USE_STATE_NO_USE("No_Use", "未占用"),
-    CONTRACT_PLAN_USE_STATE_PRE_USE("Pre_Use", "未占用"),
-    CONTRACT_PLAN_USE_STATE_IN_USE("In_Use", "未占用"),
+    CONTRACT_PLAN_USE_STATE_PRE_USE("Pre_Use", "预占用"),
+    CONTRACT_PLAN_USE_STATE_IN_USE("In_Use", "已占用"),
 
     APPROVE_STATE_UNSTARTED("UNSTARTED","未开始"),
     APPROVE_STATE_PROCESSING("PROCESSING","处理中"),