添加多数据源和配置中心

pom.xml

@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.21.RELEASE</version>
-        <relativePath/>
+        <groupId>cn.quantgroup</groupId>
+        <artifactId>commons-parent</artifactId>
+        <version>0.2.5.4</version>
     </parent>
+
     <groupId>cn.quantgroup</groupId>
     <artifactId>cash-loan-flow-boss</artifactId>
     <version>1.0.0</version>
     <name>cash-loan-flow-boss</name>
-    <description>Cash Loan Flow后端管理系统</description>
+    <description>Cash Loan Flow联调系统</description>
 
     <properties>
         <java.version>1.8</java.version>
@@ -57,13 +57,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.12</version>
-            <scope>runtime</scope>
         </dependency>
+
         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>3.2.0</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.5</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -71,9 +70,36 @@
             <version>1.16.6</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.ctrip.framework.apollo</groupId>
+            <artifactId>apollo-client</artifactId>
+            <version>0.10.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.quantgroup</groupId>
+            <artifactId>commons-spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.quantgroup</groupId>
+            <artifactId>commons-core</artifactId>
+        </dependency>
+
+
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/cn/quantgroup/cashloanflowboss/Bootstrap.java

@@ -3,15 +3,17 @@ package cn.quantgroup.cashloanflowboss;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 
-@EnableTransactionManagement
+@Configuration
 @EnableAutoConfiguration
-@SpringBootApplication(scanBasePackages = {"cn.quantgroup.cashloanflowboss"})
+@SpringBootApplication
+@ComponentScan(basePackages = {"cn.quantgroup.cashloanflowboss"})
 public class Bootstrap {
 
-	public static void main(String[] args) {
-		SpringApplication.run(Bootstrap.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(Bootstrap.class, args);
+    }
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/user/controller/UserController.java

 package cn.quantgroup.cashloanflowboss.api.user.controller;
 
-import cn.quantgroup.cashloanflowboss.api.user.entity.User;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.model.Pagination;
 import cn.quantgroup.cashloanflowboss.api.user.model.RegisterUserFormModel;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;

src/main/java/cn/quantgroup/cashloanflowboss/api/user/entity/User.java → src/main/java/cn/quantgroup/cashloanflowboss/api/user/entity/boss/User.java

-package cn.quantgroup.cashloanflowboss.api.user.entity;
+package cn.quantgroup.cashloanflowboss.api.user.entity.boss;
 
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
 import cn.quantgroup.cashloanflowboss.core.persistence.Primary;

src/main/java/cn/quantgroup/cashloanflowboss/api/user/repository/UserRepository.java → src/main/java/cn/quantgroup/cashloanflowboss/api/user/repository/boss/UserRepository.java

-package cn.quantgroup.cashloanflowboss.api.user.repository;
+package cn.quantgroup.cashloanflowboss.api.user.repository.boss;
 
-import cn.quantgroup.cashloanflowboss.api.user.entity.User;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/UserService.java

 package cn.quantgroup.cashloanflowboss.api.user.service;
 
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
-import cn.quantgroup.cashloanflowboss.api.user.entity.User;
-import cn.quantgroup.cashloanflowboss.api.user.repository.UserRepository;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
+import cn.quantgroup.cashloanflowboss.api.user.repository.boss.UserRepository;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
 import cn.quantgroup.cashloanflowboss.utils.MD5Tools;

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/security/CustomAuthenticationProvider.java

 package cn.quantgroup.cashloanflowboss.core.configuration.security;
 
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
-import cn.quantgroup.cashloanflowboss.api.user.entity.User;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;

src/main/resources/META-INF/app.properties

+app.id=cash-loan-flow-boss
+namespace=application,tech.common,tech.sleuth,tech.service.urls
\ No newline at end of file

src/main/resources/application.properties

-# \u9879\u76EE\u540D\u79F0
-spring.application.name = cash-loan-flow-boss
-
-# \u670D\u52A1\u7AEF\u53E3\u53F7
-server.port = 51200
-
-#-------------------------------- Database Setting --------------------------------#
-
-# \u6570\u636E\u5E93\u9A71\u52A8\u7C7B\u8DEF\u5F84
-spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-
-# \u6570\u636E\u5E93\u8FDE\u63A5URL
-spring.datasource.url = jdbc:mysql://172.17.5.14:31763/cash_loan_flow_boss?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2b8
-
-# \u6570\u636E\u5E93\u8D26\u53F7
-spring.datasource.username = qa
-
-# \u6570\u636E\u5E93\u5BC6\u7801
-spring.datasource.password = qatest
-
-# \u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570
-spring.datasource.hikari.maximumPoolSize = 30
-
-# \u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u6700\u5C0F\u7A7A\u95F2\u63A5\u6570
-spring.datasource.hikari.minimumIdle = 10
-
-# \u6570\u636E\u5E93\u8FDE\u63A5\u6D4B\u8BD5\u8BED\u53E5
-spring.datasource.hikari.connectionTestQuery = select 1
-
-#-------------------------------- Redis Setting --------------------------------#
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database = 8
-
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host = 172.17.5.10
-
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port = 32244
-
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password =
-
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.maxActive = 30
-
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.maxWait = -1
-
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.maxIdle = 10
-
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.minIdle = 1
-
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout = 10000
-
-#-------------------------------- Application Custom Setting --------------------------------#
-
-# \u6570\u636E\u4E2D\u5FC3ID
-application.server.dataCenterId=01
-
-# \u6570\u636E\u4E2D\u5FC3\u673A\u5668ID
-application.server.machineId=001
\ No newline at end of file

src/main/resources/logback-dev.xml

@@ -4,17 +4,16 @@
     <property name="LOG_LEVEL_PATTERN" value="%clr(%5p) %clr([${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]){yellow}"/>
     <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{MM-dd HH:mm:ss.SSS}){faint} [%-10X{TRACING_ID}]  %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%10.10t]){faint} [%40.40file:%4.4line] %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
+    <!-- 这里面定义了 CONSOLE_LOG_PATTERN, FILE_LOG_PATTERN 等日志格式, 还定义了一些日志级别 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
     <logger name="cn.quantgroup" level="DEBUG" />
-    <logger name="org.springframework" level="DEBUG" />
+    <logger name="org.springframework" level="INFO" />
     <logger name="org.hibernate" level="warn"/>
     <logger name="org.apache" level="warn"/>
     <logger name="ch.qos.logback" level="warn"/>
 
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <Pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %-5level[%thread]%logger{56}.%method:%L -%msg%n</Pattern>
-        </encoder>
-    </appender>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE" />