添加初始化数据库脚本

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

@@ -48,13 +48,6 @@ import java.util.Set;
 @Service("resourceService")
 public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao,ResourceEntity,Long> implements ResourceService {
 
-    @Autowired
-    private IUserFeign userFeign;
-    @Autowired
-    private SiteService siteService;
-    @Autowired
-    private UserService userService;
-
     @Override
     public List<ResourceEntity> findAllEnable() throws AppException {
         ResourceQuery params = new ResourceQuery();
@@ -74,7 +67,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao,Res
 
     @Override
     public Set<String> findUrlSetByUserId(Long userId) throws AppException {
-        Set<String> urls = new HashSet<String>();
+        Set<String> urls = new HashSet<>();
         List<ResourceEntity> resList = this.findListByUserId(userId);
         for (ResourceEntity res : resList) {
             String url = res.getUrl();

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -308,7 +308,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 Context context = new Context();
                 context.setUser(entity);
 
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
+                ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
             } else {
                 //更新
                 UserEntity userEntity = new UserEntity();

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

@@ -267,11 +267,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         siteQuery.setAreaCode(matchCode+"%");
         List<SiteEntity> siteEntities = this.find(siteQuery);
 
-        //List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
-//        for (SiteEntity siteEntity : siteEntities) {
-//            boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity);
-//            if (bool) continue;
-//        }
         return siteEntities;
     }
 
@@ -299,18 +294,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if(!ObjectUtils.isEmpty(siteEntities)){
             siteList.addAll(siteEntities);
         }
-
-        //添加当前站点
-
-
-//
-//        List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
-//        ;
-//        for (SiteEntity siteEntity : siteEntities) {
-//            boolean bool = getSite(siteCache.getAreaCode(), siteEntity.getAreaCode(), siteList, siteEntity);
-//            if (bool) continue;
-//
-//        }
         return siteList;
     }
 
@@ -377,11 +360,5 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             String fullPath = URLUtil.completeUrl(domain, siteEntity.getLogoPath());
             siteEntity.setLogoFullPath(fullPath);
         }
-
-//        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