配置文件环境区分

4dkankan-modeling/src/main/java/com/fdkankan/job/EcsJob.java

@@ -21,7 +21,7 @@ public class EcsJob {
     @Autowired
     private RubberSheetingUtil rubberSheetingUtil;
 
-    @PostConstruct
+    //@PostConstruct
     public void deleteEcs() {
         if (SysConstants.isResidenceService) {
             log.info("此服务是常驻服务,不启动关闭弹性伸缩定时任务！");

4dkankan-modeling/src/main/resources/application-prod.properties

@@ -0,0 +1,138 @@
+server.port=8089
+server.servlet.context-path=/4dkankan_v2
+server.file.location=/mnt/4Dkankan/
+
+spring.mvc.async.request-timeout=1800000
+#log
+logging.path=/home/data-zfb/logs/zfb-modeling/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+#mybatis
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.fdkankan.*.mapper
+mybatis.configuration.mapUnderscoreToCamelCase=true
+mapper.identity=MYSQL
+mapper.mappers=tk.mybatis.mapper.common.Mapper
+#pager
+pagehelper.helper-dialect=mysql
+pagehelper.params=count=countSql
+pagehelper.reasonable=false
+pagehelper.support-methods-arguments=true
+#DB (new)
+spring.datasource.primary.url=jdbc:mysql://172.17.0.1:3306/zhi_house?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=root
+spring.datasource.primary.password=zfb@20210727%
+spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+#DB (old)
+#????  ??????
+#spring.datasource.druid.remove-abandoned=true
+#??????10????????????? ???
+#spring.datasource.druid.remove-abandoned-timeout=600
+#spring.datasource.druid.log-abandoned=true
+
+#spring servlet
+
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.location=/mnt/data/
+#redis
+spring.redis.database=0
+spring.redis.host=172.17.0.1
+spring.redis.port=6379
+spring.redis.password=
+# ?????? ?? ms????
+spring.redis.timeout=3000ms
+# ?????????????????8?
+spring.redis.jedis.pool.max-idle=50
+# ?????????????????0?
+spring.redis.jedis.pool.min-idle=8
+# ?????-1??????????pool?????maxActive?jedis??????pool????exhausted(??)?
+spring.redis.jedis.pool.max-active=8
+# ?????????????????????-1??????????????????????JedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+# file route
+file.route.hardDisk=/mnt/data/
+file.route.imageFolder=IMAGE
+file.route.documentFolder=VIDEO
+file.route.videoFolder=DOCUMENT
+file.route.musicFolder=MUSIC
+file.route.imageType=[".bmp", ".jpg", ".jpeg", ".png", ".tiff", ".gif", ".pcx", ".tga", ".exif", ".fpx", ".svg", ".psd",".cdr", ".pcd", ".dxf", ".ufo", ".eps", ".ai", ".raw", ".wmf"]
+file.route.documentType=[".txt", ".doc", ".docx", ".xls", ".htm", ".html", ".jsp", ".rtf", ".wpd", ".pdf", ".ppt",".js"]
+file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", ".mkv", ".f4v", ".rmvb", ".webm"]
+file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf", ".aac", ".vqf", ".ape", ".mid", ".ogg",".m4a", ".vqf"]
+file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
+#swagger
+swagger.basePackage=com.fdkankan.web.controller
+swagger.title=????2.0???
+swagger.description=api??
+swagger.serviceUrl=http://39.108.220.65:8080
+swagger.version=2.0
+#rabbitmq
+spring.rabbitmq.host=172.17.0.1
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=admin123
+
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
+server.tomcat.uri-encoding=UTF-8
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
+oss.key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
+oss.bucket=zfb-4dkankan
+#oss???oss??????s3?????
+oss.type=oss
+oss.s3key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.s3secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
+oss.s3bucket=4dkankan
+
+main.url=https://test.4dkankan.com/
+scene.url=show.html?m=
+scene.pro.url=showProMobile.html?m=
+scene.pro.new.url=smobile.html?m=
+
+prefix.ali=https://zfb.4dage.com/
+
+#shop.goods.url=http://192.168.0.83:8089/goods/getGoodsListByScene
+#shop.category.url=http://192.168.0.83:8089/goods/getCategoryListByScene
+
+#??????dev??????formal?????
+environment=formal
+
+#????????
+phone.code.cn=SMS_179150247
+phone.code.en=SMS_139242688
+phone.sign=????
+
+#??s3???
+#phone.code.cn=SMS_190720510
+#phone.code.en=SMS_190780147
+#phone.sign=4Dkankan
+
+#mq???key
+rabbitmq.queue=QUEUE_MODELING_A
+rabbitmq.queue.enable=true
+rabbitmq.queue.video=QUEUE_VIDEO_A
+#mq??????????????????
+mq.base.num=300
+#?????id
+scaling.group.id=asg-wz92989gdhgek3ktdlsw
+#??????id
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+
+
+#?????????????
+hot.domain.list=https://testopen.4dkankan.com/domainList/hot
+#??????????
+hot.delete=/deleteHot
+
+gy.company.id=1058

4dkankan-modeling/src/main/resources/application-test.properties

@@ -0,0 +1,138 @@
+server.port=8089
+server.servlet.context-path=/4dkankan_v2
+server.file.location=/mnt/4Dkankan/
+
+spring.mvc.async.request-timeout=1800000
+#log
+logging.path=/home/data-zfb/logs/zfb-modeling/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+#mybatis
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.fdkankan.*.mapper
+mybatis.configuration.mapUnderscoreToCamelCase=true
+mapper.identity=MYSQL
+mapper.mappers=tk.mybatis.mapper.common.Mapper
+#pager
+pagehelper.helper-dialect=mysql
+pagehelper.params=count=countSql
+pagehelper.reasonable=false
+pagehelper.support-methods-arguments=true
+#DB (new)
+spring.datasource.primary.url=jdbc:mysql://172.18.159.127:3306/zhi_house?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=root
+spring.datasource.primary.password=zfb20211015G
+spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+#DB (old)
+#????  ??????
+#spring.datasource.druid.remove-abandoned=true
+#??????10????????????? ???
+#spring.datasource.druid.remove-abandoned-timeout=600
+#spring.datasource.druid.log-abandoned=true
+
+#spring servlet
+
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.location=/mnt/data/
+#redis
+spring.redis.database=0
+spring.redis.host=172.18.159.127
+spring.redis.port=6379
+spring.redis.password=
+# ?????? ?? ms????
+spring.redis.timeout=3000ms
+# ?????????????????8?
+spring.redis.jedis.pool.max-idle=50
+# ?????????????????0?
+spring.redis.jedis.pool.min-idle=8
+# ?????-1??????????pool?????maxActive?jedis??????pool????exhausted(??)?
+spring.redis.jedis.pool.max-active=8
+# ?????????????????????-1??????????????????????JedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+# file route
+file.route.hardDisk=/mnt/data/
+file.route.imageFolder=IMAGE
+file.route.documentFolder=VIDEO
+file.route.videoFolder=DOCUMENT
+file.route.musicFolder=MUSIC
+file.route.imageType=[".bmp", ".jpg", ".jpeg", ".png", ".tiff", ".gif", ".pcx", ".tga", ".exif", ".fpx", ".svg", ".psd",".cdr", ".pcd", ".dxf", ".ufo", ".eps", ".ai", ".raw", ".wmf"]
+file.route.documentType=[".txt", ".doc", ".docx", ".xls", ".htm", ".html", ".jsp", ".rtf", ".wpd", ".pdf", ".ppt",".js"]
+file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", ".mkv", ".f4v", ".rmvb", ".webm"]
+file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf", ".aac", ".vqf", ".ape", ".mid", ".ogg",".m4a", ".vqf"]
+file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
+#swagger
+swagger.basePackage=com.fdkankan.web.controller
+swagger.title=????2.0???
+swagger.description=api??
+swagger.serviceUrl=http://39.108.220.65:8080
+swagger.version=2.0
+#rabbitmq
+spring.rabbitmq.host=172.18.159.127
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=zfb1234
+
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
+server.tomcat.uri-encoding=UTF-8
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
+oss.key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
+oss.bucket=zfb-4dkankan
+#oss???oss??????s3?????
+oss.type=oss
+oss.s3key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.s3secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
+oss.s3bucket=4dkankan
+
+main.url=https://test.4dkankan.com/
+scene.url=show.html?m=
+scene.pro.url=showProMobile.html?m=
+scene.pro.new.url=smobile.html?m=
+
+prefix.ali=https://zfb.4dage.com/
+
+#shop.goods.url=http://192.168.0.83:8089/goods/getGoodsListByScene
+#shop.category.url=http://192.168.0.83:8089/goods/getCategoryListByScene
+
+#??????dev??????formal?????
+environment=formal
+
+#????????
+phone.code.cn=SMS_179150247
+phone.code.en=SMS_139242688
+phone.sign=????
+
+#??s3???
+#phone.code.cn=SMS_190720510
+#phone.code.en=SMS_190780147
+#phone.sign=4Dkankan
+
+#mq???key
+rabbitmq.queue=QUEUE_MODELING_A
+rabbitmq.queue.enable=true
+rabbitmq.queue.video=QUEUE_VIDEO_A
+#mq??????????????????
+mq.base.num=300
+#?????id
+scaling.group.id=asg-wz92989gdhgek3ktdlsw
+#??????id
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+
+
+#?????????????
+hot.domain.list=https://testopen.4dkankan.com/domainList/hot
+#??????????
+hot.delete=/deleteHot
+
+gy.company.id=1058

4dkankan-modeling/src/main/resources/application.properties

@@ -1,138 +1 @@
-server.port=8089
-server.servlet.context-path=/4dkankan_v2
-server.file.location=/mnt/4Dkankan/
-
-spring.mvc.async.request-timeout=1800000
-#log
-logging.path=/home/data-zfb/logs/zfb-modeling/
-logging.config=classpath:logback-spring.xml
-logging.level.com.fdkankan=debug
-#mybatis
-mybatis.mapper-locations=classpath:mapper/*.xml
-mybatis.type-aliases-package=com.fdkankan.*.mapper
-mybatis.configuration.mapUnderscoreToCamelCase=true
-mapper.identity=MYSQL
-mapper.mappers=tk.mybatis.mapper.common.Mapper
-#pager
-pagehelper.helper-dialect=mysql
-pagehelper.params=count=countSql
-pagehelper.reasonable=false
-pagehelper.support-methods-arguments=true
-#DB (new)
-spring.datasource.primary.url=jdbc:mysql://127.0.0.1:3306/zhi_house?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=root
-spring.datasource.primary.password=zfb@20210727%
-spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
-#DB (old)
-#????  ??????
-#spring.datasource.druid.remove-abandoned=true
-#??????10????????????? ???
-#spring.datasource.druid.remove-abandoned-timeout=600
-#spring.datasource.druid.log-abandoned=true
-
-#spring servlet
-
-spring.servlet.multipart.max-file-size=500MB
-spring.servlet.multipart.max-request-size=1000MB
-spring.servlet.multipart.enabled=true
-spring.servlet.multipart.location=/mnt/data/
-#redis
-spring.redis.database=0
-spring.redis.host=120.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-# ?????? ?? ms????
-spring.redis.timeout=3000ms
-# ?????????????????8?
-spring.redis.jedis.pool.max-idle=50
-# ?????????????????0?
-spring.redis.jedis.pool.min-idle=8
-# ?????-1??????????pool?????maxActive?jedis??????pool????exhausted(??)?
-spring.redis.jedis.pool.max-active=8
-# ?????????????????????-1??????????????????????JedisConnectionException
-spring.redis.jedis.pool.max-wait=-1ms
-# file route
-file.route.hardDisk=/mnt/data/
-file.route.imageFolder=IMAGE
-file.route.documentFolder=VIDEO
-file.route.videoFolder=DOCUMENT
-file.route.musicFolder=MUSIC
-file.route.imageType=[".bmp", ".jpg", ".jpeg", ".png", ".tiff", ".gif", ".pcx", ".tga", ".exif", ".fpx", ".svg", ".psd",".cdr", ".pcd", ".dxf", ".ufo", ".eps", ".ai", ".raw", ".wmf"]
-file.route.documentType=[".txt", ".doc", ".docx", ".xls", ".htm", ".html", ".jsp", ".rtf", ".wpd", ".pdf", ".ppt",".js"]
-file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", ".mkv", ".f4v", ".rmvb", ".webm"]
-file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf", ".aac", ".vqf", ".ape", ".mid", ".ogg",".m4a", ".vqf"]
-file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
-#swagger
-swagger.basePackage=com.fdkankan.web.controller
-swagger.title=????2.0???
-swagger.description=api??
-swagger.serviceUrl=http://39.108.220.65:8080
-swagger.version=2.0
-#rabbitmq
-spring.rabbitmq.host=127.0.0.1
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=admin123
-
-spring.mvc.static-path-pattern=/**
-spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
-
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-server.tomcat.uri-encoding=UTF-8
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAI5tC5Ema4raGNCZYSNrkN
-oss.secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
-oss.bucket=zfb-4dkankan
-#oss???oss??????s3?????
-oss.type=oss
-oss.s3key=LTAI5tC5Ema4raGNCZYSNrkN
-oss.s3secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
-oss.s3bucket=4dkankan
-
-main.url=https://test.4dkankan.com/
-scene.url=show.html?m=
-scene.pro.url=showProMobile.html?m=
-scene.pro.new.url=smobile.html?m=
-
-prefix.ali=https://zfb.4dage.com/
-
-#shop.goods.url=http://192.168.0.83:8089/goods/getGoodsListByScene
-#shop.category.url=http://192.168.0.83:8089/goods/getCategoryListByScene
-
-#??????dev??????formal?????
-environment=formal
-
-#????????
-phone.code.cn=SMS_179150247
-phone.code.en=SMS_139242688
-phone.sign=????
-
-#??s3???
-#phone.code.cn=SMS_190720510
-#phone.code.en=SMS_190780147
-#phone.sign=4Dkankan
-
-#mq???key
-rabbitmq.queue=QUEUE_MODELING_A
-rabbitmq.queue.enable=true
-rabbitmq.queue.video=QUEUE_VIDEO_A
-#mq??????????????????
-mq.base.num=300
-#?????id
-scaling.group.id=asg-wz92989gdhgek3ktdlsw
-#??????id
-scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
-
-
-#?????????????
-hot.domain.list=https://testopen.4dkankan.com/domainList/hot
-#??????????
-hot.delete=/deleteHot
-
-gy.company.id=1058
+spring.profiles.active=test