From f0341cd8f2bcb9e09abd4b7a5ae9f404d7ff998b Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 4 Jul 2023 20:14:50 +0800
Subject: [PATCH] update

---
 .../cool/store/service/impl/EnterpriseSyncServiceImpl.java  | 6 ++----
 .../java/com/cool/store/config/ServletContextConfig.java    | 3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
index f6f7992f3..7fdfde394 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
@@ -1,11 +1,9 @@
 package com.cool.store.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.*;
 import com.cool.store.dto.buser.UserEventDTO;
-import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
 import com.cool.store.dto.dept.DepartmentEventDTO;
 import com.cool.store.dto.enterprise.*;
 import com.cool.store.entity.*;
@@ -17,11 +15,11 @@ import com.cool.store.http.ISVHttpRequest;
 import com.cool.store.service.EnterpriseSyncService;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -107,7 +105,7 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
         regionDAO.deleteNotExistRegion(regionIds);
         //删除区域管理的人员
         userRegionMappingDAO.deleteRegionUserByExcludeRegionIds(regionIds);
-        return new Pair<>(regionList, leaderDeptMap);
+        return Pair.of(regionList, leaderDeptMap);
     }
 
     /**
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java
index 1223dc39e..23ed08f5e 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java
@@ -1,9 +1,7 @@
 package com.cool.store.config;
 
-import javafx.application.Application;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.servlet.HandlerExceptionResolver;
@@ -21,7 +19,6 @@ import java.util.List;
  * @date 2023-06-08 16:28
  */
 @Configuration
-@ComponentScan(basePackageClasses = Application.class, useDefaultFilters = true)
 public class ServletContextConfig extends WebMvcConfigurationSupport {
 
     private final Logger logger = LoggerFactory.getLogger(ServletContextConfig.class);