Kaynağa Gözat

删除pagehelper

Your Name 2 yıl önce
ebeveyn
işleme
874c4fb9ad

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

@@ -87,10 +87,7 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         }
 
         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());
+            headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
         }
         if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
             headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
@@ -148,10 +145,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());

+ 2 - 4
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java

@@ -93,10 +93,8 @@ 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.HTTP_USER_ID)) {
-            headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
+        if (!headers.containsKey(CommonConstant.USER_ID)) {
+            headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
         }
         if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
             headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());