Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/resources/application-dev.yml

@@ -19,8 +19,7 @@ spring:
       connection-test-query: SELECT 1
   redis:
     port: 6379
-    host: 192.168.110.85
-    database: 2
+    host: localhost
   #    password: Wise_@123456
   servlet:
     multipart:

acquisition-business/src/main/resources/application-pord.yml

+server:
+  port: 7008
+
+#-Dspring.config.location=D:\idea_workspases\tianjin-acquisition\acquisition-business\src\main\resources\application.yml
+spring:
+  application: data-acquisition
+  profiles:
+    active: pord
+  datasource:
+    url: jdbc:sqlserver://192.168.10.16:1433;DatabaseName=CementMine
+    username: sa
+    password: fupingc@556
+    driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      max-lifetime: 30000 #不能小于30秒，否则默认回到1800秒
+      connection-test-query: SELECT 1
+  redis:
+    port: 6379
+    host: localhost
+  #    password: Wise_@123456
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+# 设置swagger用户名密码
+swagger:
+  basic:
+    enable: false
+    username: admin
+    password: admin
+
+mybatis-plus:
+  # 启动时是否检查MyBatis XML文件是否存在
+  check-config-location: true
+  type-aliases-package: cn.wise.sc.acquisition.business.entity.**
+  mapper-locations: classpath:/cn/wise/sc/acquisition/business/mapper/xml/*Mapper.xml
+
+
+
+
+
+
+
+
+
+
+

acquisition-business/target/classes/application-dev.yml

@@ -7,10 +7,14 @@ spring:
   profiles:
     active: dev
   datasource:
-    # 192.168.110.85   fpsn       CementMine
-    url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
+    # 192.168.110.85   fpsn       CementMine    fupingc@556
+#    url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
+#    username: sa
+#    password: admin!@#123
+    #正式环境部署
+    url: jdbc:sqlserver://192.168.10.16:1433;DatabaseName=CementMine
     username: sa
-    password: admin!@#123
+    password: fupingc@556
     driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
     hikari:
       minimum-idle: 3
@@ -19,8 +23,7 @@ spring:
       connection-test-query: SELECT 1
   redis:
     port: 6379
-    host: 192.168.110.85
-    database: 2
+    host: localhost
   #    password: Wise_@123456
   servlet:
     multipart: