wuxw лет назад: 2
Родитель
Сommit
d18cb9f2d4

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

@@ -6,6 +6,7 @@ import com.java110.api.properties.WechatAuthProperties;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.app.AppDto;
 import com.java110.dto.privilege.BasePrivilegeDto;
 import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
@@ -89,10 +90,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         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());
+            headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
         }
         if (!headers.containsKey(CommonConstant.APP_ID)) {
-            headers.put(CommonConstant.APP_ID, pd.getAppId());
+            headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
         }
         if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
             headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());

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

@@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.boot.properties.WechatAuthProperties;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
+import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.log.LoggerFactory;
+import com.java110.dto.app.AppDto;
 import com.java110.dto.privilege.BasePrivilegeDto;
 import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
@@ -95,11 +97,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         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());
-
+            headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
         }
         if (!headers.containsKey(CommonConstant.APP_ID)) {
-            headers.put(CommonConstant.APP_ID, pd.getAppId());
+            headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
         }
         if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
             headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());