Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-core-apiservice/pom.xml

@@ -66,6 +66,10 @@
             <groupId>i3plus.platform</groupId>
             <artifactId>i3plus-platform-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>i3plus.platform</groupId>
+            <artifactId>i3plus-platform-plugin</artifactId>
+        </dependency>
 
         <!-- mysql -->
         <dependency>
@@ -163,6 +167,7 @@
             <artifactId>poi-ooxml</artifactId>
         </dependency>
 
+
     </dependencies>
 
     <build>

modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

@@ -183,4 +183,8 @@ fastdfs.connect_timeout_in_seconds=5
 fastdfs.network_timeout_in_seconds=60
 fastdfs.charset=UTF-8
 # token 防盗链功能
-fastdfs.http_anti_steal_token=no
+fastdfs.http_anti_steal_token=no
+
+################  授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513

modules/i3plus-core-apiservice/src/main/resources/application-docker.properties

@@ -65,7 +65,7 @@ impp.write.datasource.password=impp_i3_core_pwd
 ##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.read.datasource.username=impp_i3_core_user
 impp.read.datasource.password=impp_i3_core_pwd
 
@@ -181,4 +181,8 @@ fastdfs.connect_timeout_in_seconds=5
 fastdfs.network_timeout_in_seconds=60
 fastdfs.charset=UTF-8
 # token 防盗链功能
-fastdfs.http_anti_steal_token=no
+fastdfs.http_anti_steal_token=no
+
+################  授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513

modules/i3plus-core-apiservice/src/main/resources/application-prod.properties

@@ -185,4 +185,8 @@ fastdfs.connect_timeout_in_seconds=5
 fastdfs.network_timeout_in_seconds=60
 fastdfs.charset=UTF-8
 # token 防盗链功能
-fastdfs.http_anti_steal_token=no
+fastdfs.http_anti_steal_token=no
+
+################  授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513

modules/i3plus-core-apiservice/src/main/resources/application-test.properties

@@ -184,4 +184,8 @@ fastdfs.connect_timeout_in_seconds=5
 fastdfs.network_timeout_in_seconds=60
 fastdfs.charset=UTF-8
 # token 防盗链功能
-fastdfs.http_anti_steal_token=no
+fastdfs.http_anti_steal_token=no
+
+################  授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513