删除pagehelper

java110-interface/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -61,10 +61,10 @@
         </layout>
     </appender>
 
-    <logger name="org.springframework" level="DEBUG">
+    <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="com.java110.order" level="DEBUG">
+    <logger name="com.java110.order" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
@@ -88,15 +88,15 @@
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="io.shardingsphere" level="DEBUG">
+    <logger name="io.shardingsphere" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.thymeleaf" level="DEBUG">
+    <logger name="org.thymeleaf" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.apache.kafka" level="DEBUG">
+    <logger name="org.apache.kafka" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

pom.xml

@@ -356,8 +356,8 @@
             <dependency>
                 <groupId>org.apache.shardingsphere</groupId>
                 <artifactId>sharding-jdbc-core</artifactId>
-<!--                <version>4.0.0-RC1</version>-->
-                <version>4.1.1</version>
+                <version>4.0.0-RC1</version>
+
             </dependency>
 
 

service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -86,8 +86,9 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
             headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
         }
 
-        headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
-
+        if (!headers.containsKey(CommonConstant.USER_ID)) {
+            headers.put(CommonConstant.USER_ID, "-1");
+        }
         if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
             headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
         }

service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java

@@ -182,6 +182,7 @@ public class WechatOweFeeToNotifyAdapt extends DefaultAbstractComponentSMO imple
         Map<String, String> headers = new HashMap<>();
         headers.put(CommonConstant.HTTP_APP_ID.toLowerCase(), APP_ID);
         headers.put(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
+        headers.put(CommonConstant.USER_ID.toLowerCase(), userId);
         headers.put(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
         headers.put(CommonConstant.HTTP_REQ_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
         headers.put(CommonConstant.HTTP_SIGN.toLowerCase(), "");

springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java

@@ -155,10 +155,8 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
             headers.put(CommonConstant.HTTP_USER_ID, "-1");
         }
 
-        headers.put(CommonConstant.USER_ID, "-1");
-
-        if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
-            headers.put(CommonConstant.HTTP_USER_ID, "-1");
+        if (!headers.containsKey(CommonConstant.USER_ID)) {
+            headers.put(CommonConstant.USER_ID, "-1");
         }
         if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
             headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());

springboot/src/main/java/com/java110/boot/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java

@@ -182,6 +182,7 @@ public class WechatOweFeeToNotifyAdapt extends DefaultAbstractComponentSMO imple
         Map<String, String> headers = new HashMap<>();
         headers.put(CommonConstant.HTTP_APP_ID.toLowerCase(), APP_ID);
         headers.put(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
+        headers.put(CommonConstant.USER_ID.toLowerCase(), userId);
         headers.put(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
         headers.put(CommonConstant.HTTP_REQ_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
         headers.put(CommonConstant.HTTP_SIGN.toLowerCase(), "");