Merge remote-tracking branch 'origin/master'

pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

src/main/resources/bootstrap.yml

@@ -1,14 +1,41 @@
+spring:
+  profiles:
+    active: clouda
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    #No serializer found for class com.gbasedbt.jdbc.IfxLobInputStream
+    #and no properties discovered to create BeanSerializer
+    #(to avoid exception, disable SerializationFeature.FAIL_ON_EMPTY_BEANS)
+    #(through reference chain: java.util.ArrayList[1]->java.util.HashMap["imgdata"]->com.gbasedbt.jdbc.IfxBblob["binaryStream"])
+    # 将Springboot中对Json格式输出的严格控制--JackSon关闭
+    # spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
+    serialization:
+      FAIL_ON_EMPTY_BEANS: false
 server:
   port: 9028
   tomcat:
     uri-encoding: utf-8
-  max-http-header-size: 102400
-
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+reportUrl: http://101.36.160.140:8097
+#socket地址
+socket-url: 58.214.246.30
+socket-port: 42121
+#设置全局变量判断是云端还是库端；1云端，2本地
+localOrCloud: 2
+# 多通道气体
+gas-org-ids: 386,177
+# 数量检测版本区分version3
+num_version3: :20013
+---
 # 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
 eureka:
   client:
     service-url:
-      defaultZone: http://eureka-depot-tj:9001/eureka/
+      defaultZone: http://localhost:9001/eureka/
+    register-with-eureka: false
+    fetchRegistry: false
   instance:
     prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
@@ -16,25 +43,8 @@ eureka:
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
 
-
-#spring:
-#  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
-
-
 spring:
+  profiles: locala
   application:
     name: depot-intelligent
   # 数据库配置
@@ -49,9 +59,9 @@ spring:
     store-type: redis
   redis:
     database: 2
-    host: 192.168.123.98
-    port: 6666
-    password: depotredis
+    host: 127.0.0.1
+    port: 6379
+    password:
     timeout: 3000
     jedis:
       pool:
@@ -59,88 +69,90 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-    serialization:
-      FAIL_ON_EMPTY_BEANS: false
-#socket地址
-socket-url: 58.214.246.30
-socket-port: 42121
-
-#设置全局变量判断是云端还是库端；1云端，2本地
-localOrCloud: 2
-
-reportUrl: http://101.36.160.140:8097
-
-
-## ==============================================应急端========================================================
-#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
-#  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}
-#
-#spring:
-#  # 数据库配置
-#  datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://localhost:3306/depot?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:
-#    timeout: 3000
-#    jedis:
-#      pool:
-#        max-active: 8
-#        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: 127.0.0.1
-##socket-port: 8999
-#socket-url: localhost
-#socket-port: 8999
-#
-##设置全局变量判断是云端还是库端；1云端，2本地
-#localOrCloud: 2
+web:
+  upload-path: D:/upload/image
+logging:
+    level:
+      com.chinaitop.depot.intelligent.basicdata.mapper: DEBUG
+---
+# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
+eureka:
+  client:
+    service-url:
+      defaultZone: http://172.16.0.4:9711/eureka/
+  instance:
+    prefer-ip-address: true
+    # 每隔10s发送一次心跳(默认30s)
+    lease-renewal-interval-in-seconds: 10
+    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
+    lease-expiration-duration-in-seconds: 30
 
-# 多通道气体
-gas-org-ids: 386,177
+spring:
+  profiles: clouda
+  application:
+    name: depot-intelligent
+  # 数据库配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    username: gbasedbt
+    password: cDbK2S0go8
+    driver-class-name: com.gbasedbt.jdbc.IfxDriver
+  # 缓存配置 host: redis-depot
+  session:
+    store-type: redis
+  redis:
+    database: 4
+    host: 172.16.0.46
+    port: 6679
+    password: 123456
+    timeout: 3000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+web:
+  upload-path: /home
+---
+# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
+eureka:
+  client:
+    service-url:
+      defaultZone: http://eureka-depot-tj:9001/eureka/
+  instance:
+    prefer-ip-address: true
+    # 每隔10s发送一次心跳(默认30s)
+    lease-renewal-interval-in-seconds: 10
+    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
+    lease-expiration-duration-in-seconds: 30
 
-# 数量检测版本区分version3
-num_version3: :20013
-mybatis:
-  config-location: classpath:mybatis/mybatis-config.xml
+spring:
+  profiles: prop
+  application:
+    name: depot-intelligent
+  # 数据库配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=depot;
+    username: gbasedbt
+    password: GBase123
+    driver-class-name: com.gbasedbt.jdbc.IfxDriver
+  # 缓存配置 host: redis-depot
+  session:
+    store-type: redis
+  redis:
+    database: 0
+    host: 127.0.0.1
+    port: 6379
+    password:
+    timeout: 3000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+web:
+  upload-path: /home