添加nacos servicecomb 微服务

jjt-admin/pom.xml

@@ -1,186 +1,208 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jjt</artifactId>
-        <groupId>com.jjt</groupId>
-        <version>3.8.7</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>jjt-admin</artifactId>
-
-    <description>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>jjt</artifactId>
+		<groupId>com.jjt</groupId>
+		<version>3.8.7</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+	<artifactId>jjt-admin</artifactId>
+
+	<description>
         web服务入口
     </description>
 
-    <dependencies>
-
-        <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
-
-        <!-- swagger3-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-        <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.33</version>
-        </dependency>
-
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.jjt</groupId>
-            <artifactId>jjt-framework</artifactId>
-        </dependency>
-
-        <!-- 定时任务-->
-        <dependency>
-            <groupId>com.jjt</groupId>
-            <artifactId>jjt-quartz</artifactId>
-        </dependency>
-
-        <!-- 业务模块-->
-        <dependency>
-            <groupId>com.jjt</groupId>
-            <artifactId>jjt-biz</artifactId>
-        </dependency>
-
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.jjt</groupId>
-            <artifactId>jjt-generator</artifactId>
-        </dependency>
+	<dependencies>
+		<!-- cloud extends start -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>spring-cloud-starter-huawei-servicecomb-discovery</artifactId>
         </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-
-            <!--下面这段是分离打包-->
-
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <version>2.5.15</version>-->
-<!--                <configuration>-->
-<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
-<!--                    <executable>true</executable>-->
-<!--                    <layout>ZIP</layout>-->
-<!--                    &lt;!&ndash;这里是填写需要包含进去的jar，-->
-<!--                         必须项目中的某些模块，会经常变动，那么就应该将其坐标写进来-->
-<!--                         如果没有则nothing ，表示不打包依赖 &ndash;&gt;-->
-<!--                    <includes>-->
-<!--                        &lt;!&ndash; 定时任务&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-quartz</artifactId>-->
-<!--                        </include>-->
-<!--                        &lt;!&ndash; 代码生成&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-generator</artifactId>-->
-<!--                        </include>-->
-<!--                        &lt;!&ndash; 核心模块&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-framework</artifactId>-->
-<!--                        </include>-->
-<!--                        &lt;!&ndash; 系统模块&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-system</artifactId>-->
-<!--                        </include>-->
-<!--                        &lt;!&ndash; 通用工具&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-common</artifactId>-->
-<!--                        </include>-->
-<!--                        &lt;!&ndash; 业务模块&ndash;&gt;-->
-<!--                        <include>-->
-<!--                            <groupId>com.jjt</groupId>-->
-<!--                            <artifactId>jjt-biz</artifactId>-->
-<!--                        </include>-->
-<!--                    </includes>-->
-<!--                </configuration>-->
-
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-
-<!--            </plugin>-->
-
-<!--            &lt;!&ndash;拷贝依赖到jar外面的lib目录&ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-dependency-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>copy</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>copy-dependencies</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                            &lt;!&ndash;指定的依赖路径&ndash;&gt;-->
-<!--                            <outputDirectory>${project.build.directory}/lib</outputDirectory>-->
-<!--                            &lt;!&ndash;排除的ArtifactId&ndash;&gt;-->
-<!--                            <excludeArtifactIds>jjt-framework,jjt-system,jjt-quartz,jjt-generator,jjt-common,jjt-biz-->
-<!--                            </excludeArtifactIds>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-        </plugins>
-        <finalName>jy2024</finalName>
-    </build>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-context</artifactId>
+		</dependency>
+		<!-- cloud extends end -->
+
+		<!-- spring-boot-devtools -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional> <!-- 表示依赖不会传递 -->
+		</dependency>
+
+		<!-- swagger3 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-boot-starter</artifactId>
+		</dependency>
+
+		<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-models</artifactId>
+			<version>1.6.2</version>
+		</dependency>
+
+		<!-- Mysql驱动包 -->
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<version>8.0.33</version>
+		</dependency>
+
+		<!-- 核心模块 -->
+		<dependency>
+			<groupId>com.jjt</groupId>
+			<artifactId>jjt-framework</artifactId>
+		</dependency>
+
+		<!-- 定时任务 -->
+		<dependency>
+			<groupId>com.jjt</groupId>
+			<artifactId>jjt-quartz</artifactId>
+		</dependency>
+
+		<!-- 业务模块 -->
+		<dependency>
+			<groupId>com.jjt</groupId>
+			<artifactId>jjt-biz</artifactId>
+		</dependency>
+
+		<!-- 代码生成 -->
+		<dependency>
+			<groupId>com.jjt</groupId>
+			<artifactId>jjt-generator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.5.15</version>
+				<configuration>
+					<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<warName>${project.artifactId}</warName>
+				</configuration>
+			</plugin>
+
+			<!--下面这段是分离打包 -->
+
+			<!-- <plugin> -->
+			<!-- <groupId>org.springframework.boot</groupId> -->
+			<!-- <artifactId>spring-boot-maven-plugin</artifactId> -->
+			<!-- <version>2.5.15</version> -->
+			<!-- <configuration> -->
+			<!-- <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt; -->
+			<!-- <executable>true</executable> -->
+			<!-- <layout>ZIP</layout> -->
+			<!-- &lt;!&ndash;这里是填写需要包含进去的jar， -->
+			<!-- 必须项目中的某些模块，会经常变动，那么就应该将其坐标写进来 -->
+			<!-- 如果没有则nothing ，表示不打包依赖 &ndash;&gt; -->
+			<!-- <includes> -->
+			<!-- &lt;!&ndash; 定时任务&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-quartz</artifactId> -->
+			<!-- </include> -->
+			<!-- &lt;!&ndash; 代码生成&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-generator</artifactId> -->
+			<!-- </include> -->
+			<!-- &lt;!&ndash; 核心模块&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-framework</artifactId> -->
+			<!-- </include> -->
+			<!-- &lt;!&ndash; 系统模块&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-system</artifactId> -->
+			<!-- </include> -->
+			<!-- &lt;!&ndash; 通用工具&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-common</artifactId> -->
+			<!-- </include> -->
+			<!-- &lt;!&ndash; 业务模块&ndash;&gt; -->
+			<!-- <include> -->
+			<!-- <groupId>com.jjt</groupId> -->
+			<!-- <artifactId>jjt-biz</artifactId> -->
+			<!-- </include> -->
+			<!-- </includes> -->
+			<!-- </configuration> -->
+
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <goals> -->
+			<!-- <goal>repackage</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+
+			<!-- </plugin> -->
+
+			<!-- &lt;!&ndash;拷贝依赖到jar外面的lib目录&ndash;&gt; -->
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>copy</id> -->
+			<!-- <phase>package</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>copy-dependencies</goal> -->
+			<!-- </goals> -->
+			<!-- <configuration> -->
+			<!-- &lt;!&ndash;指定的依赖路径&ndash;&gt; -->
+			<!-- <outputDirectory>${project.build.directory}/lib</outputDirectory> -->
+			<!-- &lt;!&ndash;排除的ArtifactId&ndash;&gt; -->
+			<!-- <excludeArtifactIds>jjt-framework,jjt-system,jjt-quartz,jjt-generator,jjt-common,jjt-biz -->
+			<!-- </excludeArtifactIds> -->
+			<!-- </configuration> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
+		</plugins>
+		<finalName>jy2024</finalName>
+	</build>
 
 </project>

jjt-admin/src/main/java/com/jjt/JjtApplication.java

@@ -3,6 +3,7 @@ package com.jjt;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
@@ -12,6 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableAsync
+@EnableDiscoveryClient
 public class JjtApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");

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

@@ -57,7 +57,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.0.1:3306/jy2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
+        url: jdbc:mysql://127.0.0.1:13306/jy2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
         username: root
         password: 123456
       # 从库数据源

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

@@ -0,0 +1,37 @@
+spring:
+   application:
+      name: jjt
+   profiles:
+      active:
+      - dev
+   cloud:
+      servicecomb:
+         discovery:
+            #servicecomb 根据实际地址修改 
+            address: http://127.0.0.1:30100
+            serviceName: ${spring.application.name}
+            appName: jjt
+            watch: false
+            health-check: true
+            health-check-interval: 60
+#根据实际情况开启证书认证            
+#         credentials:
+#            enabled: true
+#            accessKey: 4IBH6ZOT4QDS6WCQ2LJP
+#            secretKey: 9BnSdSNkGM3bUKM6F6Zbn0oMsLbFiV7tdZwHiRUc
+#            project: sc-region-1_XYDDLJYPT
+#            akskCustomCipher: default
+      nacos:
+         discovery:
+            #不注册服务到nacos
+            enabled: false
+#            server-addr: 192.168.101.121:8848
+         config:
+            file-extension: yaml
+            #配置中心nacos地址
+            server-addr: 192.168.101.121:8848
+#            shared-configs:
+#               - common.yaml
+#   config:
+#      import:
+#         - nacos:${spring.application.name}-${spring.profiles.active:dev}.yml

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

@@ -55,7 +55,7 @@ public class ResourcesConfig implements WebMvcConfigurer {
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 设置访问源地址
-        config.addAllowedOriginPattern("*");
+        config.addAllowedOrigin("*");
         // 设置访问源请求头
         config.addAllowedHeader("*");
         // 设置访问源请求方法

pom.xml

@@ -32,7 +32,8 @@
 		<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>
+		<!-- <spring.cloud.huawei.version>1.9.4-Hoxton</spring.cloud.huawei.version> -->
+		<spring.cloud.huawei.version>1.5.1-Hoxton</spring.cloud.huawei.version>
 	</properties>
 
 	<!-- 依赖声明 -->