java110 лет назад: 5
Родитель
Сommit
23d4b52729

+ 3 - 3
java110-core/src/main/java/com/java110/core/base/controller/BaseController.java

@@ -291,6 +291,9 @@ public class BaseController extends AppBase {
 
         //校验资源路劲是否定义权限
         List<BasePrivilegeDto> basePrivilegeDtos = PrivilegeCache.getPrivileges();
+        if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
+            return;
+        }
         String tmpResource = null;
         boolean hasPrivilege = false;
         for (BasePrivilegeDto privilegeDto : basePrivilegeDtos) {
@@ -308,9 +311,6 @@ public class BaseController extends AppBase {
         }
         JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
 
-        if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
-            return;
-        }
         hasPrivilege = false;
         if (privileges == null || privileges.size() < 1) {
             throw new UnsupportedOperationException("用户没有权限操作");

+ 2 - 3
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
+import com.java110.dto.app.AppDto;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
@@ -201,7 +202,7 @@ public class CallApiServiceFactory {
     public static ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
         ResponseEntity<String> responseEntity = null;
         HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), pd.getAppId());
+        header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), StringUtil.isEmpty(pd.getAppId()) ? AppDto.WEB_APP_ID : pd.getApiUrl());
         header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
         header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
         header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
@@ -222,8 +223,6 @@ public class CallApiServiceFactory {
     }
 
 
-
-
     /**
      * map 参数转 url get 参数 非空值转为get参数 空值忽略
      *