Merge branch 'master' of http://39.105.126.192:3000/DR3_server/sky_ioc_server

src/main/resources/application-dev.yml

@@ -35,3 +35,7 @@ logging:
 # Swagger配置
 swagger:
   enabled: true
+
+# 自定义配置
+sky:
+  dataIp: http://192.168.1.45:9001

src/main/resources/application-publish.yml

@@ -0,0 +1,40 @@
+# 开发环境
+server:
+  port: 10099
+  servlet:
+    context-path: /
+
+# 数据源
+spring:
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    #相关属性配置
+    properties:
+      org:
+        quartz:
+          jobStore:
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
+    #数据库方式
+    job-store-type: jdbc
+  datasource:
+    druid:
+      url: jdbc:postgresql://10.12.242.163:5432/building?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
+      username: postgres
+      password: postgres
+  redis:
+    host: 121.43.55.7
+    port: 6380
+    database: 12
+    password: SKYversation
+
+# 日志配置
+logging:
+  level:
+    com.sky: debug
+
+# Swagger配置
+swagger:
+  enabled: true
+# 自定义配置
+sky:
+  dataIp: http://10.12.242.162:80

src/main/resources/application.yml

@@ -108,4 +108,3 @@ logging:
 # 自定义配置
 sky:
   name: 智慧运营管理中心
-  dataIp: 192.168.1.45:9001