提交配置校验

portal-manager/pom.xml

@@ -96,7 +96,6 @@
 				<profiles.active>yanyuan</profiles.active>
 				<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
 				<profiles.trustedReferer>127.0.0.1,localhost,10.233.82.175,172.16.30.245,172.16.30.246,172.16.30.247,172.16.30.248</profiles.trustedReferer>
-				<profiles.req.json.check>true</profiles.req.json.check>
 			</properties>
 		</profile>
 

portal-manager/src/main/java/com/mortals/xhx/base/framework/filter/SameSiteCookieFilter.java

@@ -19,8 +19,8 @@ import java.net.URL;
 import java.util.*;
 
 @Slf4j
-@Component
-@Profile({"yanyuan"})
+//@Component
+//@Profile({"yanyuan"})
 public class SameSiteCookieFilter implements Filter {
 
 

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/model/ResourceQuery.java

@@ -7,7 +7,6 @@
 */
 
 package com.mortals.xhx.base.system.resource.model;
-
 import java.util.List;
 /**
  * <p>Title: 资源信息</p>

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java

@@ -19,11 +19,11 @@ import com.mortals.xhx.base.system.resource.dao.ResourceDao;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.model.ResourceQuery;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.base.system.role.model.RoleAuthEntity;
+import com.mortals.xhx.base.system.role.model.RoleAuthQuery;
+import com.mortals.xhx.base.system.role.service.RoleAuthService;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.utils.ControllerScanUtil;
-import com.mortals.xhx.module.role.model.RoleAuthEntity;
-import com.mortals.xhx.module.role.model.RoleAuthQuery;
-import com.mortals.xhx.module.role.service.RoleAuthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -73,14 +73,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     @Override
     public Set<String> findUrlSetByUserId(Long userId) throws AppException {
         Set<String> urls = new HashSet<>();
-        List<ResourceEntity> resList = new ArrayList<>();
-        if (1L == userId) {
-            //管理员
-            resList = this.find(new ResourceQuery());
-        } else {
-            resList = this.findListByUserId(userId);
-        }
-
+        List<ResourceEntity> resList = this.findListByUserId(userId);
         for (ResourceEntity res : resList) {
             String url = res.getUrl();
             if (StringUtils.isEmpty(url)) {
@@ -101,7 +94,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     public Rest<String> refreshResourceUrl(String packageName, Context context) {
         List<Class<?>> classList = ControllerScanUtil.getAllClassByPackageName(packageName);
         //System.out.println(classList); //获取到了所有的类
-        List<ResourceEntity> newResourcelist = ControllerScanUtil.getAnnotationInfo(classList).stream().filter(f -> !ObjectUtils.isEmpty(f.getUrl())).collect(Collectors.toList());
+        List<ResourceEntity> newResourcelist = ControllerScanUtil.getAnnotationInfo(classList).stream().filter(f->!ObjectUtils.isEmpty(f.getUrl())).collect(Collectors.toList());
 
         Map<String, List<ResourceEntity>> localResourceMap = this.find(new ResourceQuery()).stream().collect(Collectors.groupingBy(x -> x.getName()));
         Map<String, List<ResourceEntity>> newResourceMap = newResourcelist.stream().collect(Collectors.groupingBy(x -> x.getName()));
@@ -191,14 +184,12 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     }
 
     private void updateUserMenuUrlCache() {
-
-        cacheService.del(RedisKey.KEY_USER_MENU_CACHE);
-/*        //更新用户菜单
+        //更新用户菜单
         Set<String> hkeys = cacheService.hkeys(RedisKey.KEY_USER_MENU_CACHE);
         for (String userId : hkeys) {
             Set<String> urls = this.findUrlSetByUserId(DataUtil.converStr2Long(userId, 0L));
             String menuUrlCode = generateMenuUrlCode(urls);
             cacheService.hset(RedisKey.KEY_USER_MENU_CACHE, userId, menuUrlCode);
-        }*/
+        }
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -8,6 +8,7 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -67,7 +69,7 @@ public class ResourceController extends BaseCRUDJsonBodyMappingController<Resour
 
     @Override
     protected void doListBefore(ResourceEntity query, Map<String, Object> model, Context context) throws AppException {
-
+        query.setOrderColList(Arrays.asList(new OrderCol("sourceType")));
         super.doListBefore(query, model, context);
     }