修改配置文件

YeeAmosConnectCommon/src/main/java/com/yeejoin/amos/connect/core/common/request/CommonPageable.java

-package com.yeejoin.amos.fas.core.common.request;
+package com.yeejoin.amos.connect.core.common.request;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;

YeeAmosConnectCommon/src/main/java/com/yeejoin/amos/connect/core/common/request/CommonRequest.java

-package com.yeejoin.amos.fas.core.common.request;
+package com.yeejoin.amos.connect.core.common.request;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

YeeAmosConnectCommon/src/main/java/com/yeejoin/amos/connect/core/common/response/CommonPage.java

@@ -2,7 +2,7 @@
  * NewHeight.com Inc.
  * Copyright (c) 2008-2010 All Rights Reserved.
  */
-package com.yeejoin.amos.fas.core.common.response;
+package com.yeejoin.amos.connect.core.common.response;
 
 import java.util.List;
 

YeeAmosConnectCommon/src/main/java/com/yeejoin/amos/connect/dao/application-docker.properties

+server.port= 8070
+
+spring.datasource.url=jdbc:mysql://amos-mysql:3306/cases?serverTimezone=GMT%2B8
+spring.datasource.username= root
+spring.datasource.password= yeejoin_1234
+
+fdfs.so-timeout=1501
+fdfs.connect-timeout=601
+fdfs.thumb-image.height=200
+fdfs.thumb-image.width=200
+fdfs.tracker-list[0]=172.16.10.175:22122
+fileserver_domain=http://172.16.10.175:8888
+
+eureka.instance.hostname: amos-euraka
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
\ No newline at end of file

YeeAmosConnectStart/src/main/resources/application-dev.properties

@@ -65,6 +65,7 @@ server.compression.min-response-size = 2048
 liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 liquibase.enabled: true
 
+
 #redis database index
 spring.redis.database=5
 #redis ip  
@@ -80,6 +81,12 @@ spring.redis.pool.max-idle=10
 spring.redis.pool.min-idle=0  
 spring.redis.timeout=1000 
 
+#redis
+params.remoteurl = http://172.16.11.33:8800/
+#params.remoteurl = http://172.16.10.74:8800/
+params.time = 5
+params.period = 1800
+
 #iec104.debug = false
 #iec104.tcp.service.reomteIp=172.233.0.4
 #iec104.tcp.service.reomtePort=2404

YeeAmosConnectStart/src/main/resources/application-docker.properties

+eureka.client.serviceUrl.defaultZone = http://amos-eureka:10001/eureka/
+eureka.client.register-with-eureka = false
+eureka.client.fetch-registry = false
+eureka.client.healthcheck.enabled = false
+
+eureka.instance.hostname = ${spring.cloud.client.ipAddress}
+eureka.instance.statusPageUrlPath = ${management.context-path}/info
+eureka.instance.healthCheckUrlPath = ${management.context-path}/health
+eureka.instance.preferIpAddress = false
+eureka.instance.instance-id = ${spring.cloud.client.ipAddress}:${server.port}
+eureka.instance.lease-expiration-duration-in-seconds = 10
+eureka.instance.lease-renewal-interval-in-seconds = 5
+
+#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
+ribbon.ReadTimeout = 120000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
+ribbon.ConnectTimeout = 30000
+
+
+#DB properties:
+#spring.datasource.url = jdbc:mysql://172.233.0.6:3306/amos_beijing_command_dev?useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://amos-mysql:3306/amos_iec?useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+
+spring.datasource.username = root
+spring.datasource.password = admin_1234
+spring.datasource.driver-class-name = com.mysql.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.jpa.hibernate.ddl-auto=none
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+#JPA Configuration:
+# Show or not log for each sql query
+spring.jpa.show-sql = true
+# Hibernate ddl auto (create, create-drop, update): with "update" the database
+# schema will be automatically updated accordingly to java entities found in
+# the project
+
+# Naming strategy
+#spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
+# Allows Hibernate to generate SQL optimized for a particular DBMS
+spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
+
+#mybatis mapper file
+mybatis.mapper-locations = classpath:db/mapper/*.xml
+# mybatis entity package
+mybatis.type-aliases-package = com.yeejoin.amos.fireAutoIntf.business.entity.mybatis
+
+#equipment check
+param.protocol.not.check = HTTP
+
+#enable Gzip compression
+server.compression.enabled = true
+server.compression.mime-types = application/json,application/xml,text/html,text/xml,text/plain\u3001
+server.compression.min-response-size = 2048
+
+#liquibase
+liquibase.change-log = classpath:/db/changelog/changelog-master.xml
+liquibase.enabled: true
+
+#redis database index
+spring.redis.database=5
+#redis ip  
+spring.redis.host=amos-redis
+spring.redis.port=6379  
+#redis password (default is empty)
+spring.redis.password=1234560
+#max connect number
+spring.redis.pool.max-active=200  
+# redis max wait time ( -1 is not limit)
+spring.redis.pool.max-wait=-1  
+spring.redis.pool.max-idle=10 
+spring.redis.pool.min-idle=0  
+spring.redis.timeout=1000 
+
+#redis 
+params.remoteurl = http://172.16.11.33:8800/
+#params.remoteurl = http://172.16.10.74:8800/
+params.time = 5
+params.period = 1800
+
+#iec104.debug = false
+#iec104.tcp.service.reomteIp=172.233.0.4
+#iec104.tcp.service.reomtePort=2404
+#iec104.server.Id=1
+#iec104.tcp.bind.port=2404
+#iec104.client.commonAddress=0000
+#iec104.server.start.infomation.address = 1
+#iec104.server.consecutive.transmissions.number = 6
+#iec104.server.zz.max.transmissions.number = 100
+#iec104.server.soe.max.transmissions.number = 10
+#iec104.server.sec.max.transmissions.number = 10
\ No newline at end of file

YeeAmosConnectStart/src/main/resources/application-prod.properties

@@ -81,4 +81,10 @@ spring.redis.pool.max-idle=10
 # \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5  
 spring.redis.pool.min-idle=0  
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09  
-spring.redis.timeout=1000
+spring.redis.timeout=1000
\ No newline at end of file
+
+#redis
+params.remoteurl = http://172.16.11.33:8800/
+#params.remoteurl = http://172.16.10.74:8800/
+params.time = 5
+params.period = 1800
\ No newline at end of file

YeeAmosConnectStart/src/main/resources/application-test.properties

@@ -90,3 +90,9 @@ spring.redis.pool.max-idle=10
 spring.redis.pool.min-idle=0  
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09  
 spring.redis.timeout=1000
+
+#redis
+params.remoteurl = http://172.16.11.33:8800/
+#params.remoteurl = http://172.16.10.74:8800/
+params.time = 5
+params.period = 1800

YeeAmosConnectStart/src/main/resources/application.properties

@@ -6,10 +6,4 @@ spring.profiles.active=dev
 
 #netty
 so.keepalive = true
-so.backlog = 128
-
+so.backlog = 128
\ No newline at end of file
-#redis
-params.remoteurl = http://172.16.11.33:8800/
-#params.remoteurl = http://172.16.10.74:8800/
-params.time = 5
-params.period = 1800
\ No newline at end of file