移除cloud和eureka相关依赖和配置

crm-manager/pom.xml

@@ -23,7 +23,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-cloud.version>2023.0.3</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -49,28 +48,6 @@
             <version>2.2.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form</artifactId>
-            <version>3.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form-spring</artifactId>
-            <version>3.8.0</version>
-        </dependency>
-
-
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
@@ -112,18 +89,6 @@
 
 
     </dependencies>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 
     <build>
         <plugins>

crm-manager/src/main/java/com/crm/manager/ManagerApplication.java

@@ -4,7 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.jms.annotation.EnableJms;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -15,7 +14,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableJms
 @SpringBootApplication
 @EnableScheduling
-@EnableFeignClients
 @MapperScan("com.crm.manager.dao.mapper")
 @EntityScan({"com.crm.rely.backend.core.pojo.table", "com.crm.rely.backend.model.pojo.table"})
 @ComponentScan(basePackages = {"com.crm.manager", "com.crm.rely.backend","com.crm.login.rely.backend.property"})

crm-manager/src/main/java/com/crm/manager/configuration/FeignConfiguration.java

@@ -1,50 +0,0 @@
-package com.crm.manager.configuration;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.exception.ServiceException;
-import com.crm.rely.backend.service.RedisService;
-import com.crm.rely.backend.util.UUIDUtil;
-import com.google.common.base.Strings;
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * Created by max on 2020/6/17.
- */
-@Configuration
-public class FeignConfiguration implements RequestInterceptor {
-
-    @Autowired
-    private RedisService redisService;
-
-    @Override
-    public void apply(RequestTemplate requestTemplate) {
-       ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        String token = null;
-        String language = null;
-        if (null != attributes) {
-            HttpServletRequest request = attributes.getRequest();
-            token = request.getHeader(Constants.ACCESS_TOKEN);
-            language = request.getHeader(Constants.Language);
-        }
-
-        String feignToken = UUIDUtil.getUUID();
-        if (Strings.isNullOrEmpty(token)) {
-            token = feignToken;
-        }
-        requestTemplate.header(Constants.ACCESS_TOKEN, token);
-        requestTemplate.header(Constants.Feign_Token, feignToken);
-        requestTemplate.header(Constants.Language, language);
-
-        try {
-            redisService.saveObject(feignToken, token, Constants.Feign_Token_TIME);
-        } catch (ServiceException e) {
-            e.printStackTrace();
-        }
-    }
-}

crm-manager/src/main/java/com/crm/manager/configuration/FeignMultipartSupportConfig.java

@@ -1,26 +0,0 @@
-package com.crm.manager.configuration;
-
-import feign.codec.Encoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-/**
- * @Author: houn
- * @Date: 2020/9/4 18:20
- * @Description:
- */
-@Configuration
-public class FeignMultipartSupportConfig {
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    @Primary
-    public Encoder feignEncoder() {
-        return new SpringEncoder(this.messageConverters);
-    }
-}

crm-manager/src/main/java/com/crm/manager/controller/SysReasonsRefusalController.java

@@ -114,7 +114,6 @@ public class SysReasonsRefusalController {
     }
 
     @PostMapping("/custom/list")
-    @FeignClientAnnotation
     public BaseResultDto<Map<String, SysReasonsRefusalSearchDto>> customList(@RequestBody @Validated SysReasonsRefusalSearchEntity entity) throws Exception {
 
         BaseResultDto<Map<String, SysReasonsRefusalSearchDto>> result = sysReasonsRefusalService.searchList(entity);

crm-manager/src/main/java/com/crm/manager/controller/VaultodyController.java

@@ -10,7 +10,7 @@ import com.crm.rely.backend.util.ExportUtil;
 import com.crm.rely.backend.util.FileProcessUtil;
 import com.google.common.collect.Lists;
 import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.service.spi.ServiceException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

crm-manager/src/main/java/com/crm/manager/service/impl/SysUcardConfigServiceImpl.java → crm-manager/src/main/java/com/crm/manager/service/impl/SysVaultodyConfigServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
-public class SysUcardConfigServiceImpl implements SysVaultodyConfigService {
+public class SysVaultodyConfigServiceImpl implements SysVaultodyConfigService {
 
     @Autowired
     private SysVaultodyConfigRepository vaultodyConfigRepository;

crm-manager/src/main/java/com/crm/manager/service/impl/VaultodyServiceImpl.java

@@ -14,8 +14,8 @@ import com.crm.rely.backend.core.exception.ServiceException;
 import com.crm.rely.backend.core.pojo.table.SysConfigTable;
 import com.crm.rely.backend.model.config.VaultodyConfig;
 import com.crm.rely.backend.model.constant.ConfigConstants;
-import com.crm.rely.backend.model.dto.vaultody.vaults.VaultTransaction;
 import com.crm.rely.backend.model.dto.vaultody.vaults.TransactionItemDto;
+import com.crm.rely.backend.model.dto.vaultody.vaults.VaultTransaction;
 import com.crm.rely.backend.model.dto.vaultody.vaults.VaultodyVaultsListDto;
 import com.crm.rely.backend.model.dto.vaultody.vaults.response.*;
 import com.crm.rely.backend.model.entity.vaultody.vaults.VaultTransactionsEntity;
@@ -27,8 +27,7 @@ import com.crm.rely.backend.util.HttpUtil;
 import com.crm.rely.backend.util.UUIDUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.jetbrains.annotations.NotNull;
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Connection;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

crm-manager/src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ spring:
     url: jdbc:mysql://103.214.175.29:28571/cwg_vaultody?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
     username: root
     password: NSH01Y0GTmUNjgg6xw80qg==
-  cloud:
-    client:
-      ip-address: 127.0.0.1
+#  cloud:
+#    client:
+#      ip-address: 127.0.0.1
   jpa:
     database: MYSQL
     hibernate:
@@ -17,20 +17,9 @@ spring:
 logging:
   level:
     com.crm.manager.dao.mapper: trace
-eureka:
-  instance:
-    prefer-ip-address: true
-    ip-address: ${spring.cloud.client.ip-address}
-    instance-id: ${spring.application.name}:${eureka.instance.ip-address}:${server.port}
-  client:
-    service-url:
-      defaultZone: http://admin:admin123456@localhost:17000/eureka
 web:
   front-path: ./front
   upload-path: ../upload
-ribbon:
-  ReadTimeout: 60000
-  ConnectTimeout: 60000
 role:
   excludePathPatterns:
     /**

crm-manager/src/main/resources/application-ho.yml

@@ -18,9 +18,6 @@ logging:
 web:
   front-path: ./front
   upload-path: ./upload
-ribbon:
-  ReadTimeout: 60000
-  ConnectTimeout: 60000
 #role:
 #  excludePathPatterns:
 #    /**

crm-manager/src/main/resources/application-hu.yml

@@ -21,13 +21,6 @@ web:
   front-path: G:/crm/crm-back/crm-core/front
   upload-path: D:\upload
   export-path: D:/work/cwg/export
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://admin:admin123456@localhost:7000/eureka
-ribbon:
-  ReadTimeout: 60000
-  ConnectTimeout: 60000
 #logging:
 #  config: classpath:logback-dev.xml
 

crm-manager/src/main/resources/application-prod.yml

@@ -14,13 +14,6 @@ spring:
   data:
     redis:
       host: 127.0.0.1
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://admin:admin123456@localhost:7000/eureka
-  instance:
-    ip-address: localhost
-    instance-id: ${spring.application.name}:${eureka.instance.ip-address}:${server.port}
 login:
   single-sign-on: true
 logging:

crm-manager/src/main/resources/application-test.yml

@@ -15,21 +15,11 @@ logging:
   config: classpath:logback-prod.xml
 #  redis:
 #    host: 127.0.0.1
-eureka:
-  instance:
-    prefer-ip-address: true
-    ip-address: ${spring.cloud.client.ip-address}
-    instance-id: ${spring.application.name}:${eureka.instance.ip-address}:${server.port}
-  client:
-    service-url:
-      defaultZone: http://admin:admin123456@localhost:7000/eureka
 login:
   single-sign-on: true
 web:
   upload-path: C:\server\cwg_crm\upload
   export-path: C:\server\cwg_crm\export
-ribbon:
-  ReadTimeout: 60000
-  ConnectTimeout: 60000
+