添加初始化数据库脚本

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

@@ -66,9 +66,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     @Autowired
     private ResourceService resourceService;
 
-    @Autowired
-    private SiteService siteService;
-
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
@@ -311,7 +308,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 Context context = new Context();
                 context.setUser(entity);
 
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService, context));
+                ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
             } else {
                 //更新
                 UserEntity userEntity = new UserEntity();
@@ -319,7 +316,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 this.updateWidthDao(userEntity);
                 Context context = new Context();
                 context.setUser(userEntity);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService, context));
+                ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
             }
         });
     }

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.site.model.SiteTreeSelect;
 import com.mortals.xhx.module.site.service.SiteService;
+import com.mortals.xhx.utils.SpringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.apachecommons.CommonsLog;
 import lombok.extern.slf4j.Slf4j;
@@ -20,12 +21,11 @@ import java.util.List;
 @Slf4j
 public class SyncTreeSiteThread implements Runnable {
 
-    private SiteService siteService;
-
     private Context context;
 
     @Override
     public void run() {
+        SiteService siteService = SpringUtils.getBean(SiteService.class);
         List<SiteTreeSelect> siteTreeSelects = siteService.siteTree(context);
         siteService.setSiteTree(siteTreeSelects, context);
         log.info("刷新用户站点树=》userID:{} siteTree:{}",context.getUser().getId(), JSON.toJSONString(siteService.getSiteTree(context)));

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -38,9 +38,6 @@ import java.util.List;
 public class DemoStartedService implements IApplicationStartedService {
 
     private static Log logger = LogFactory.getLog(DemoStartedService.class);
-
-    @Autowired
-    private SiteService siteService;
     @Autowired
     private IUserFeign userFeign;
 
@@ -52,7 +49,7 @@ public class DemoStartedService implements IApplicationStartedService {
         userEntity.setId(0L);
         Context contextTemp = new Context();
         contextTemp.setUser(userEntity);
-        SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(siteService, contextTemp);
+        SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
         ThreadPool.getInstance().execute(syncTreeSiteThread);
 
         userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
@@ -63,7 +60,7 @@ public class DemoStartedService implements IApplicationStartedService {
             BeanUtils.copyProperties(userPdu, entity, BeanUtil.getNullPropertyNames(userPdu));
 
             context.setUser(entity);
-            ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService,context));
+            ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
         });
     }
 

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -49,7 +49,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
         userPdu.setSize(-1);
         Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
 
-      //  userService.updateUserList(list.getData().getData());
+        userService.updateUserList(list.getData().getData());
         //resourceService.updateUserList();
 
      /*   UserPdu userPdu = new UserPdu();

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

@@ -69,8 +69,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     private IUserFeign userFeign;
     @Autowired
     private UserService userService;
-    @Autowired
-    private ResourceService resourceService;
 
     @Override
     protected void validData(SiteEntity entity, Context context) throws AppException {