降低boot cloud 版本到2.3 cloudhoxton 华为1.x-hoxton

jjt-admin/src/main/resources/application.yml

@@ -47,6 +47,9 @@ user:
 
 # Spring配置
 spring:
+  main:
+    #当遇到相同名字的时候，是否允许覆盖注册
+    allow-bean-definition-overriding: true
   # 数据源配置
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
@@ -54,7 +57,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.188.66:3306/jy2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
+        url: jdbc:mysql://127.0.0.1:3306/jy2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
         username: root
         password: 123456
       # 从库数据源
@@ -126,7 +129,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.188.66
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引

jjt-cloud-demo/pom.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.jjt</groupId>
-		<artifactId>jjt</artifactId>
-		<version>3.8.7</version>
-	</parent>
-	<artifactId>jjt-cloud-demo</artifactId>
-	<packaging>jar</packaging>
-	<name>jjt-cloud-demo</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<!-- serviecomb -->
-		<dependency>
-			<groupId>com.huaweicloud</groupId>
-			<artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.huaweicloud</groupId>
-			<artifactId>spring-cloud-starter-huawei-servicecomb-discovery</artifactId>
-			<version>1.6.0-Hoxton</version>
-		</dependency>
-		<!-- 必选 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bootstrap</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-context</artifactId>
-		</dependency>
-		<!-- nacos 新增配置 -->
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
-		<!-- nacos 新增配置 end -->
-		<!-- 最小配置，启动一个servlet容器 这里的配置可以不用引入 -->
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-models</artifactId>
-			<version>1.6.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-boot-starter</artifactId>
-		</dependency>
-		<!-- end -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

jjt-cloud-demo/src/main/java/com/jjt/JJTCloudDemoApplication.java

@@ -1,18 +0,0 @@
-package com.jjt;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-/**
- * 集成nacos2.0.3 servicecomb示例工程
- * @author todder
- *
- */
-@SpringBootApplication
-@EnableDiscoveryClient
-public class JJTCloudDemoApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(JJTCloudDemoApplication.class, args);
-	}
-}

jjt-cloud-demo/src/main/java/com/jjt/controller/RouteController.java

@@ -1,29 +0,0 @@
-package com.jjt.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <pre>
- * 路由测试控制器
- * 这个控制器亦可以用于后续和servicecomb做集成调转，将其作为一个路由控制器
- * </pre>
- * @author todder
- *
- */
-@RestController
-@RequestMapping("/route")
-public class RouteController {
-
-	@Autowired
-	private Environment env;
-	
-	@GetMapping("/test")
-	public String test() {
-		
-		return env.getProperty("jjt.test");
-	}
-}

jjt-cloud-demo/src/main/resources/bootstrap.yml

@@ -1,22 +0,0 @@
-server:
-   port: 8888
-spring:
-   profiles:
-      active:
-      - dev
-   application:
-      name: jjt-route
-   cloud:
-      servicecomb:
-         #在这里增加servicecomb的服务配置地址
-      nacos:
-         discovery:
-            server-addr: ${NACOS_HOST:nacos-server}:8848
-         config:
-            file-extension: yaml
-            server-addr: ${spring.cloud.nacos.discovery.server-addr}
-#            shared-configs:
-#               - common.yaml
-#   config:
-#      import:
-#         - nacos:${spring.application.name}-${spring.profiles.active:dev}.yml

jjt-cloud-demo/src/test/java/org/jjt/cloud/demo/AppTest.java

@@ -1,38 +0,0 @@
-package org.jjt.cloud.demo;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

jjt-framework/src/main/java/com/jjt/framework/config/I18nConfig.java

@@ -3,6 +3,7 @@ package com.jjt.framework.config;
 import com.jjt.common.constant.Constants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -17,6 +18,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 @Configuration
 public class I18nConfig implements WebMvcConfigurer {
     @Bean
+    @Primary
     public LocaleResolver localeResolver() {
         SessionLocaleResolver slr = new SessionLocaleResolver();
         // 默认语言
@@ -25,6 +27,7 @@ public class I18nConfig implements WebMvcConfigurer {
     }
 
     @Bean
+    @Primary
     public LocaleChangeInterceptor localeChangeInterceptor() {
         LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
         // 参数名

pom.xml

@@ -29,6 +29,10 @@
 		<poi.version>4.1.2</poi.version>
 		<velocity.version>2.3</velocity.version>
 		<jwt.version>0.9.1</jwt.version>
+		<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
+		<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
+		<spring.cloud.alibaba.version>2.2.7.RELEASE</spring.cloud.alibaba.version>
+		<spring.cloud.huawei.version>1.9.4-Hoxton</spring.cloud.huawei.version>
 	</properties>
 
 	<!-- 依赖声明 -->
@@ -38,7 +42,7 @@
 			<dependency>
 				<groupId>com.huaweicloud</groupId>
 				<artifactId>spring-cloud-huawei-dependencies</artifactId>
-				<version>1.9.4-Hoxton</version>
+				<version>${spring.cloud.huawei.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -46,7 +50,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2020.0.3</version>
+				<version>${spring.cloud.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -54,7 +58,7 @@
 			<dependency>
 				<groupId>com.alibaba.cloud</groupId>
 				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>2020.0.RC1</version>
+				<version>${spring.cloud.alibaba.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -71,7 +75,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.5.15</version>
+				<version>${spring.boot.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -212,7 +216,6 @@
 		<module>jjt-generator</module>
 		<module>jjt-common</module>
 		<module>jjt-biz</module>
-		<module>jjt-cloud-demo</module>
 	</modules>
 	<packaging>pom</packaging>