Browse Source

Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0

# Conflicts:
#	src/main/resources/bootstrap.yml
易涛 3 years ago
parent
commit
9f257a7efa
2 changed files with 18 additions and 7 deletions
  1. 0 6
      pom.xml
  2. 18 1
      src/main/resources/bootstrap.yml

+ 0 - 6
pom.xml

@@ -104,12 +104,6 @@
     <dependency>
         <groupId>com.persagy</groupId>
         <artifactId>apm-mybatis</artifactId>
-        <exclusions>
-            <exclusion>
-                <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            </exclusion>
-        </exclusions>
     </dependency>
 </dependencies>
 </project>

+ 18 - 1
src/main/resources/bootstrap.yml

@@ -3,6 +3,17 @@ server:
     9977
 spring:
   application:
+    name: energy_alarm_service
+  datasource:
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: ${spring.datasource.url}
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          driver-class-name: ${spring.datasource.driver-class-name}
     name: energy-alarm-service
   data:
     elasticsearch:
@@ -20,4 +31,10 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
+swagger:
+  title: energy-alarm-service 接口文档
+  desc: --
+  version: v1.0.0
+  author: lixing
+  serviceUrl: www.persagy.com
+  groupName: api