Merge remote-tracking branch 'origin/master'

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

 package com.mortals.xhx.module.site.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
@@ -303,9 +305,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             siteEntity.setLogoFullPath(fullPath);
         }
 
-        if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) {
-            List<ModelEntity> collect = Arrays.asList(siteEntity.getModelIds().split(",")).stream().map(modelId -> modelService.get(Long.parseLong(modelId))).collect(Collectors.toList());
-            siteEntity.setModelList(collect);
-        }
+//        if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) {
+//            List<Long> modelIdlist = StrUtil.split(siteEntity.getModelIds(), ",".charAt(0), -1, true, (String str) -> Long.parseLong(str));
+//            List<ModelEntity> collect =modelService.find(new ModelQuery().idList(modelIdlist));
+//            siteEntity.setModelList(collect);
+//        }
     }
 }
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
  * @author: zxfei
  * @date: 2022/5/30 10:40
  */
-@FeignClient(name = "base-manager", path = "/base", fallback = AreaFeignFallbackFactory.class)
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = AreaFeignFallbackFactory.class)
 public interface IApiAreaFeign extends IFeign {
 
 

common-lib/src/main/java/com/mortals/xhx/feign/model/IApiModelFeign.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(name = "base-manager", path = "/base", fallback = ModelFeignFallbackFactory.class)
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = ModelFeignFallbackFactory.class)
 public interface IApiModelFeign extends IFeign {
 
     /**

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  * @author zxfei
  * @date 2022-07-06
  */
-@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
+@FeignClient(name = "portal-manager", path = "/zwfw", fallbackFactory = UserFeignFallbackFactory.class)
 public interface IUserFeign extends IFeign {