Browse Source

init: init project step3: rebuild 5

shc 1 year ago
parent
commit
acf28ebab2

+ 7 - 5
hnqz-auth/src/main/resources/bootstrap.yml

@@ -8,15 +8,17 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
-#      username: @nacos.username@
-#      password: @nacos.password@
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: @nacos.server-addr@
         namespace: @profiles.namespace@
-#        group: ${spring.profiles.active}
+        group: ${spring.profiles.active}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         namespace: @profiles.namespace@
-#        group: ${spring.profiles.active}
+        group: ${spring.profiles.active}
+        file-extension: yml
         shared-configs:
-          - application-pro.yml
+          - data-id: application.yml
+            group: ${spring.profiles.active}

+ 5 - 4
hnqz-gateway/src/main/resources/bootstrap.yml

@@ -18,7 +18,8 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         namespace: @profiles.namespace@
         group: ${spring.profiles.active}
-        shared-configs[0]:
-          data-id: application.yml
-          group: ${spring.profiles.active}
-          refresh: true
+        file-extension: yml
+        shared-configs:
+          - data-id: application.yml
+            group: ${spring.profiles.active}
+            refresh: true

+ 5 - 12
hnqz-upms/hnqz-upms-biz/src/main/resources/bootstrap.yml

@@ -2,15 +2,6 @@ server:
   port: @profiles.upms.biz.port@
 
 spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      # 屈桐,2021年11月02日
-      # 测试数据库
-      username: ${MYSQL_USER:root}
-      password: ${MYSQL_PWD:jck4gBikaE8FpeTQ}
-      url: jdbc:mysql://${MYSQL_HOST:rm-2ze734e5l5e9260e6lo.mysql.rds.aliyuncs.com}:${MYSQL_PORT:3306}/${MYSQL_DB:cnbg}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
   profiles:
     active: @profiles.active@
   application:
@@ -27,8 +18,10 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         namespace: @profiles.namespace@
         group: ${spring.profiles.active}
-        extension-configs:
-          - application.yml # 扩展配置的dataId
-#            group: ${spring.profiles.active} # 扩展配置的分组
+        file-extension: yml
+        shared-configs:
+          - data-id: application.yml
+            group: ${spring.profiles.active}
+            refresh: true
   autoconfigure:
     exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration

+ 4 - 4
pom.xml

@@ -10,8 +10,8 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-		<spring-cloud.version>Hoxton.SR12</spring-cloud.version>
+		<spring-boot.version>2.3.8.RELEASE</spring-boot.version>
+		<spring-cloud.version>Hoxton.SR8</spring-cloud.version>
 		<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -291,8 +291,8 @@
 				<profiles.active>local</profiles.active>
 				<nacos.username>nacos</nacos.username>
 				<nacos.password>nacos</nacos.password>
-				<nacos.server-addr>nacos.yaoyi.net:8848</nacos.server-addr>
-				<profiles.namespace>36c0d641-7fe4-40e1-b5b2-baf197b055d1</profiles.namespace>
+				<nacos.server-addr>localhost:8848</nacos.server-addr>
+				<profiles.namespace>9bdeb532-930a-4d8a-9af1-206f64767268</profiles.namespace>
 				<profiles.auth.port>3000</profiles.auth.port>
 				<profiles.gateway.port>9999</profiles.gateway.port>
 				<profiles.upms.biz.port>4000</profiles.upms.biz.port>