init

ssj_aijia/pom.xml

@@ -15,6 +15,7 @@
 		<version>2.1.7.RELEASE</version>
 	</parent>
 
+
 	<modules>
 		<module>ssj-aijia-api</module>
 		<module>ssj-aijia-sys</module>
@@ -29,46 +30,17 @@
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 		<alibaba-spring-cloud.version>0.9.0.RELEASE</alibaba-spring-cloud.version>
-		<nacos.version>0.2.2.RELEASE</nacos.version>
+		<nacos.version>2.2.1.RELEASE</nacos.version>
 		<swagger.version>2.9.2</swagger.version>
 	</properties>
 	
 	
-	<dependencyManagement>
-	
-		<dependencies>
-			<!--子版本依赖-->
-			<dependency>
-				<groupId>com.cloud.ssj</groupId>
-				<artifactId>ssj-aijia-common-config</artifactId>
-				<version>0.0.1-SNAPSHOT</version>
-			</dependency>
-			
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>${alibaba-spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-				<version>${nacos.version}</version>
-			</dependency>
-			
-		</dependencies>
-	</dependencyManagement>
-	
 	<dependencies>
-		
+	
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -93,10 +65,46 @@
 			<artifactId>json-lib-ext-spring</artifactId>
 			<version>1.0.2</version>
 		</dependency>
+		
+		<dependency>
+		    <groupId>com.alibaba.cloud</groupId>
+		    <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		    <version>2.2.1.RELEASE</version>
+		</dependency>
 	
 	</dependencies>
 	
 	
+	<dependencyManagement>
+		<dependencies>
+			<!--子版本依赖-->
+			<dependency>
+				<groupId>com.cloud.ssj</groupId>
+				<artifactId>ssj-aijia-common-config</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+			</dependency>
+			
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
+				<version>${alibaba-spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			
+			
+		</dependencies>
+	</dependencyManagement>
+	
+	
 
 	<build>
 		<plugins>

ssj_aijia/ssj-aijia-common-config/pom.xml

@@ -14,18 +14,9 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
+		
+		
+		
 
 	</dependencies>
 </project>

ssj_aijia/ssj-aijia-common-config/src/main/java/com/cloud/ssj/controller/InitController.java

@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 @RefreshScope
 public class InitController {
 
-	@Value("${config.appKey}")
+	@Value("${spring.datasource.driver-class-name}")
 	private String appKey;
 
 	@ApiOperation(value = "欢迎入口", httpMethod = "GET")

ssj_aijia/ssj-aijia-common-config/src/main/resources/bootstrap.yaml

@@ -1,19 +1,48 @@
+server:
+   port: 9091
+
 spring:
    application:
-      name: microservice-alibaba-nacos-config
+      name: ssj-aijia-common-config
    profiles:
       active: dev
    cloud:
       nacos:
          discovery:
             server-addr: 127.0.0.1:8848
-            namespace: 45702247-e8d9-4cca-a7d5-7ef302b3b4ce
+            namespace: c651f019-616d-43c7-8e60-73c63c4b3fb7
          config:
             server-addr: 127.0.0.1:8848
-            namespace: 45702247-e8d9-4cca-a7d5-7ef302b3b4ce
+            namespace: c651f019-616d-43c7-8e60-73c63c4b3fb7
             file-extension: properties
-            shared-dataids: microservice-alibaba-nacos-config.properties
-            refreshable-dataids: microservice-alibaba-nacos-config.properties
-# server
-server:
-   port: 9091
+            shared-dataids: ssj-aijia-common-config.properties
+            refreshable-dataids: ssj-aijia-common-config.properties
+   datasource:
+      driverClassName: ${config.datasource.driverClassName}
+      url: ${config.datasource.url}
+      username: ${config.datasource.username}
+      password: ${config.datasource.password}
+      hikari:
+         initial-size: ${config.datasource.initialSize}
+         minimum-idle: ${config.datasource.minIdle}
+         maximum-pool-size: ${config.datasource.maxActive}
+         auto-commit: true
+         idle-timeout: 20000
+         pool-name: MyHikarifMain
+         max-lifetime: 1800000
+         connection-timeout: 20000
+         connection-test-query: SELECT 1
+         validation-timeout: 5000
+   redis:
+      host: ${config.redis.host}
+      port: ${config.redis.port}
+      password: ${config.redis.password}
+      pool:
+         max-idle: ${config.redis.pool.max-idle}
+         min-idle: ${config.redis.pool.min-idle}
+         max-active: ${config.redis.pool.max-active}
+         max-wait: ${config.redis.pool.max-wait}
+      timeout: ${config.redis.timeout}
+      commandTimeout: ${config.redis.commandTimeout}
+            
+