修改包类结构

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskController.java

@@ -3,10 +3,10 @@ package com.baiye.modules.platform.rest;
 import com.baiye.http.CommonResponse;
 import com.baiye.model.dto.DynamicTaskDistributionDTO;
 import com.baiye.model.dto.TaskQueryCriteria;
-import com.baiye.modules.system.domain.Task;
-import com.baiye.modules.system.service.TaskService;
-import com.baiye.modules.system.service.dto.TaskDto;
-import com.baiye.modules.system.service.dto.TaskTagDto;
+import com.baiye.modules.platform.domain.Task;
+import com.baiye.modules.platform.service.TaskService;
+import com.baiye.modules.platform.service.dto.TaskDto;
+import com.baiye.modules.platform.service.dto.TaskTagDto;
 import com.baiye.valid.AddGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/LabelOrganizeService.java

@@ -1,9 +1,9 @@
 package com.baiye.modules.platform.service;
 
-import com.baiye.modules.system.domain.Label;
-import com.baiye.modules.system.domain.LabelOrganize;
-import com.baiye.modules.system.service.dto.LabelOrganizeDto;
-import com.baiye.modules.system.service.dto.LabelOrganizeQueryCriteria;
+import com.baiye.modules.platform.domain.Label;
+import com.baiye.modules.platform.domain.LabelOrganize;
+import com.baiye.modules.platform.service.dto.LabelOrganizeDto;
+import com.baiye.modules.platform.service.dto.LabelOrganizeQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/OrganizeService.java

@@ -2,10 +2,10 @@ package com.baiye.modules.platform.service;
 
 import com.baiye.model.dto.OrganizeQueryCriteria;
 import com.baiye.model.dto.UserDto;
-import com.baiye.modules.system.domain.Organize;
-import com.baiye.modules.system.domain.OrganizeUser;
-import com.baiye.modules.system.domain.TaskOrganize;
-import com.baiye.modules.system.service.dto.*;
+import com.baiye.modules.platform.domain.Organize;
+import com.baiye.modules.platform.domain.OrganizeUser;
+import com.baiye.modules.platform.domain.TaskOrganize;
+import com.baiye.modules.platform.service.dto.*;
 import com.baiye.util.ValidList;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java

@@ -19,9 +19,11 @@ import com.baiye.modules.platform.repository.*;
 import com.baiye.modules.platform.service.LabelOrganizeService;
 import com.baiye.modules.platform.service.LabelService;
 import com.baiye.modules.platform.service.TaskService;
-import com.baiye.modules.system.service.dto.*;
-import com.baiye.modules.system.service.mapstruct.TaskMapper;
-import com.baiye.modules.system.service.mapstruct.TaskOrganizeMapper;
+import com.baiye.modules.platform.service.dto.*;
+import com.baiye.modules.platform.service.mapstruct.TaskMapper;
+import com.baiye.modules.platform.service.mapstruct.TaskOrganizeMapper;
+import com.baiye.modules.system.domain.User;
+import com.baiye.modules.system.repository.UserRepository;
 import com.baiye.socket.WebSocketServer;
 import com.baiye.util.PageUtil;
 import com.baiye.util.QueryHelp;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -48,6 +48,7 @@ import com.baiye.util.*;
 import com.google.common.collect.ImmutableMap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
@@ -83,7 +84,7 @@ public class UserServiceImpl implements UserService {
     private final BusinessConfig businessConfig;
 
     private final CompanyService companyService;
-    private final UserCacheClean userCacheClean;
+
     private final UserRepository userRepository;
     private final LabelRepository labelRepository;
     private final LabelOrganizeRepository labelOrganizeRepository;
@@ -91,7 +92,6 @@ public class UserServiceImpl implements UserService {
     private final PasswordEncoder passwordEncoder;
     private final WeChatUserService weChatUserService;
 
-    private final OnlineUserService onlineUserService;
     private final OrganizeRepository organizeRepository;
     private final PayComboService payComboService;
     private final PayComboLogService payComboLogService;
@@ -459,7 +459,7 @@ public class UserServiceImpl implements UserService {
         }
         // 如果用户被禁用，则清除用户登录信息
         if (Boolean.FALSE.equals(resources.getEnabled())) {
-            onlineUserService.kickOutForUsername(resources.getUsername());
+           // onlineUserService.kickOutForUsername(resources.getUsername());
         }
 
         if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {
@@ -675,7 +675,7 @@ public class UserServiceImpl implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public void updatePass(String username, String pass) {
         userRepository.updatePass(username, pass, new Date());
-        flushCache(username);
+        // flushCache(username);
     }
 
     @Override
@@ -699,7 +699,7 @@ public class UserServiceImpl implements UserService {
             FileUtil.del(oldPath);
         }
         @NotBlank String username = user.getUsername();
-        flushCache(username);
+        // flushCache(username);
         return ImmutableMap.of("avatar", file.getName());
     }
 
@@ -707,7 +707,7 @@ public class UserServiceImpl implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public void updateEmail(String username, String email) {
         userRepository.updateEmail(username, email);
-        flushCache(username);
+        // flushCache(username);
     }
 
     @Override
@@ -733,7 +733,7 @@ public class UserServiceImpl implements UserService {
      */
     public void delCaches(Long id, String username) {
         redisUtils.del(CacheKey.USER_ID + id);
-        flushCache(username);
+        // flushCache(username);
     }
 
     /**
@@ -741,9 +741,9 @@ public class UserServiceImpl implements UserService {
      *
      * @param username /
      */
-    private void flushCache(String username) {
+   /* private void flushCache(String username) {
         userCacheClean.cleanUserCache(username);
-    }
+    }*/
 
 
     @Override