配置文件修改

LICENSE

@@ -1,8 +0,0 @@
-MIT License
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/resources/bootstrap.yml

@@ -1,76 +1,39 @@
 spring:
   profiles:
     active: clouda
----
-# 云南项目配置
 server:
   port: 9028
   tomcat:
     uri-encoding: utf-8
-  max-http-header-size: 102400
-
-# 注册中心配置 defaultZone: http://eureka-depot-yn:9001/eureka/
+---
+# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
 eureka:
   client:
     service-url:
-      defaultZone: http://172.16.0.46:9511/eureka/
+      defaultZone: http://eureka-depot:9001/eureka/
+    registerWithEureka: false
+    fetchRegistry: false
   instance:
     prefer-ip-address: true
-    # 每隔10s发送一次心跳(默认30s)
-    lease-renewal-interval-in-seconds: 10
-    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
-    lease-expiration-duration-in-seconds: 30
-
-
-#spring:
-#  profiles: cloud
-#  application:
-#    name: depot-intelligent
-#  #配置中心配置
-#  cloud:
-#    config:
-#      #使用discovery 时需要将eureka 写到该文件中，开发环境使用该方式,推荐使用。
-#      discovery:
-#        enabled: true
-#        service-id: depot-config-server
-#      profile: dev
-#      label: master
-#  jackson:
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
-
+    ip-address: eureka-depot
+    status-page-url: http://eureka-depot:${server.port}/swagger-ui.html
+    instance-id: ${eureka.instance.ip-address}:${server.port}
 
 spring:
-  profiles: clouda
-  application:
-    name: depot-intelligent
+  profiles: locala
   # 数据库配置
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.16.0.46:3306/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://localhost:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
     username: root
     password: 123456
-    minIdle: 5
-    maxActive: 100
-    initialSize: 10
-    maxWait: 60000
-    timeBetweenEvictionRunsMillis: 300000
-    minEvictableIdleTimeMillis: 1800000
-    validationQuery: SELECT 1 FROM DUAL
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 100
-    removeAbandoned: true
-    filters: stat
-  # 缓存配置 host: redis-depot
+  # 缓存配置
   session:
     store-type: redis
   redis:
-    database: 1
-    host: 172.16.0.46
-    port: 6679
+    database: 0
+    host: 10.10.1.25
+    port: 6379
     password: 123456
     timeout: 3000
     jedis:
@@ -79,58 +42,59 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
+  # 静态资源配置
+  resources:
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  jmx:
+    default-domain: depotIntelligent
+
+web:
+  upload-path: D:/upload
+
 #socket地址
-socket-url: 58.214.246.30
-socket-port: 42121
+#socket-url: 127.0.0.1
+#socket-port: 8999
+socket-url: localhost
+socket-port: 8999
 
 #设置全局变量判断是云端还是库端；1云端，2本地
 localOrCloud: 2
+
 # 多通道气体
-gas-org-ids: 386,177,273,280
+gas-org-ids: 386,177,273,280,300
 
 # 数量检测版本区分version3
 num_version3: :20013
-
-## ==============================================应急端========================================================
 ---
-server:
-  port: 9028
-  tomcat:
-    uri-encoding: utf-8
-  max-http-header-size: 102400
-
 # 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
 eureka:
   client:
     service-url:
-      defaultZone: http://eureka-depot:9001/eureka/
-    registerWithEureka: false
-    fetchRegistry: false
+      defaultZone: http://172.16.0.46:9511/eureka/
   instance:
     prefer-ip-address: true
-    ip-address: eureka-depot
-    status-page-url: http://eureka-depot:${server.port}/swagger-ui.html
-    instance-id: ${eureka.instance.ip-address}:${server.port}
+    lease-renewal-interval-in-seconds: 10
+    lease-expiration-duration-in-seconds: 30
 
 spring:
-  profiles: locala
+  profiles: clouda
   # 数据库配置
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://172.16.0.46:3306/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
     username: root
     password: 123456
   # 缓存配置
   session:
     store-type: redis
   redis:
-    database: 0
-    host: 127.0.0.1
-    port: 6379
-    password:
+    database: 1
+    host: 172.16.0.46
+    port: 6679
+    password: 123456
     timeout: 3000
     jedis:
       pool:
@@ -148,7 +112,7 @@ spring:
     default-domain: depotIntelligent
 
 web:
-  upload-path: D:/upload
+  upload-path: /home
 
 #socket地址
 #socket-url: 127.0.0.1
@@ -164,4 +128,3 @@ gas-org-ids: 386,177,273,280,300
 
 # 数量检测版本区分version3
 num_version3: :20013
-