调整配置

fjs-scenic-manager/src/main/java/com/fjs/scenic/component/Configration.java

@@ -1,34 +0,0 @@
-package com.fjs.scenic.component;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-@Component
-@PropertySource("classpath:application.properties")
-public class Configration {
-
-	@Value("${ordersTasks.timmer}")
-	private String ordersTasks;
-	
-	@Value("${materialTasks.timmer}")
-	private String materialTasks;
-
-	public String getOrdersTasks() {
-		return ordersTasks;
-	}
-
-	public void setOrdersTasks(String ordersTasks) {
-		this.ordersTasks = ordersTasks;
-	}
-
-	public String getMaterialTasks() {
-		return materialTasks;
-	}
-
-	public void setMaterialTasks(String materialTasks) {
-		this.materialTasks = materialTasks;
-	}
-	
-	
-}

fjs-scenic-manager/src/main/resources/application-ddm.properties

@@ -1,125 +0,0 @@
-server.port=8089
-
-#spring.thymeleaf.cache=false
-#spring.thymeleaf.mode=LEGACYHTML5
-#spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.servlet.content-type=text/html
-#spring.thymeleaf.prefix=classpath:/templates/
-#spring.thymeleaf.suffix=.html
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://119.23.48.168:61111/fjs_scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=Ectrip2019
-spring.datasource.url=jdbc:mysql://47.95.230.126:33066/fjs-scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-#spring.redis.database=4
-#spring.redis.host=119.23.48.168
-##spring.redis.cluster.nodes=119.23.48.168:61379,47.95.230.126:6379
-#spring.redis.port=61379
-#spring.redis.password=
-#spring.redis.pool.max-active=8
-#spring.redis.pool.max-wait=-1
-#spring.redis.pool.max-idle=8
-#spring.redis.pool.min-idle=0
-#spring.redis.timeout=5000
-spring.redis.database=0
-spring.redis.host=119.23.48.168
-spring.redis.port=61379
-spring.redis.password=
-#spring.redis.host=47.111.181.152
-#spring.redis.port=6379
-#spring.redis.password=fjsfjq
-
-#spring.redis.host=47.95.230.126
-#spring.redis.port=6379
-#spring.redis.password=
-spring.redis.pool.max-active=8
-spring.redis.pool.max-wait=-1
-spring.redis.pool.max-idle=8
-spring.redis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-
-spring.servlet.multipart.max-file-size=100Mb
-spring.servlet.multipart.max-request-size=100Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-# 驼峰命�规范 如：数�库字段是  order_id 那么 实体字段就�写� orderId
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /void/fjs
-NGINX_PORT = 8081
-
-
-#img.path=D://yangya//workspace//fjs-parent//fjs-scenic-manager//src//main//resources//static//images/
-#img.addr=http://127.0.0.1:8089/images/
-img.path=/data/fjs/images/
-img.addr=http://t.cqhsrj.com/images/
-
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-
-
-#°¢Àï¶ÌÐÅ
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#Ä£°åID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-manager/src/main/resources/application-dev.properties

@@ -1,56 +1,10 @@
 server.port=8081
-spring.thymeleaf.cache=false
-spring.thymeleaf.mode=LEGACYHTML5
-spring.thymeleaf.encoding=UTF-8
-spring.thymeleaf.servlet.content-type=text/html
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://119.23.48.168:61111/fjs_scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://47.108.219.126:3306/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=Ectrip2019
-
-
-spring.redis.database=4
-spring.redis.host=119.23.48.168
-#spring.redis.cluster.nodes=119.23.48.168:61379,47.95.230.126:6379
-spring.redis.port=61379
-spring.redis.password=
-spring.redis.pool.max-active=8
-spring.redis.pool.max-wait=-1
-spring.redis.pool.max-idle=8
-spring.redis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-
-spring.servlet.multipart.max-file-size=100Mb
-spring.servlet.multipart.max-request-size=100Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-# 驼峰命名规范 如：数据库字段是  order_id 那么 实体字段就要写成 orderId
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /void/fjs
-NGINX_PORT = 8081
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = 12345678
-ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.153:8080/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
+spring.datasource.password=sRGjx8iLlTfV.
+spring.redis.database=0
+spring.redis.host=47.108.219.126
+spring.redis.port=6379
+spring.redis.password=Dingyou2020
+#票务接口
+pw.api=http://localhost:8080/services/cytDataService/doWxQueryRequest.action

fjs-scenic-manager/src/main/resources/application-fjs.properties

@@ -1,111 +0,0 @@
-server.port=8089
-
-
-#logging.level.com.fjs.scenic.mapper=debug
-
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.111.185.0:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.url=jdbc:mysql://127.0.0.1:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=Fjsdy@123
-
-spring.redis.database=4
-#spring.redis.host=47.111.181.152
-#spring.redis.host=172.16.151.164
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=fjsfjq
-#spring.redis.host=127.0.0.1
-#spring.redis.password=fjsfjq
-#spring.redis.port=6379
-spring.redis.pool.max-active=8
-spring.redis.pool.max-wait=-1
-spring.redis.pool.max-idle=8
-spring.redis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-
-spring.servlet.multipart.max-file-size=500Mb
-spring.servlet.multipart.max-request-size=500Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-#logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = wx.fjsfjq.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /images/fjs
-
-NGINX_PORT = 8081
-
-#img.path=/data/fjs/images/
-#img.addr=http://jq.fjsfjq.com/images/
-img.path=/data/fjs/images/
-img.addr=https://wx.fjsstlyq.com/images/
-
-
-
-wechat.mpAppId=wx0e590add1244fd18
-wechat.mpAppSecret=8258bce8b4ebfde0ea6b8a391478ad26
-wechat.token=mywechattoken2297455150
-#CERT_FILE_NAME=F:\\apiclient_cert.p12
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=https://wx.fjsstlyq.com/wechat/notify
-FEFUND_NOTIFY=https://wx.fjsstlyq.com/wechat/refund/notify
-
-#�������
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#ģ��ID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.153:8080/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-ota.cyt.apiUrl = https://fx.fjsstlyq.com/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-manager/src/main/resources/application-fjsfjq.properties

@@ -1,124 +0,0 @@
-server.port=8089
-#spring.thymeleaf.cache=false
-#spring.thymeleaf.mode=LEGACYHTML5
-#spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.servlet.content-type=text/html
-#spring.thymeleaf.prefix=classpath:/templates/
-#spring.thymeleaf.suffix=.html
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://119.23.48.168:61111/fjs_scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=Ectrip2019
-spring.datasource.url=jdbc:mysql://47.95.230.126:33066/fjs-scenic?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-#spring.redis.database=4
-#spring.redis.host=119.23.48.168
-##spring.redis.cluster.nodes=119.23.48.168:61379,47.95.230.126:6379
-#spring.redis.port=61379
-#spring.redis.password=
-#spring.redis.pool.max-active=8
-#spring.redis.pool.max-wait=-1
-#spring.redis.pool.max-idle=8
-#spring.redis.pool.min-idle=0
-#spring.redis.timeout=5000
-spring.redis.database=0
-spring.redis.host=119.23.48.168
-spring.redis.port=61379
-spring.redis.password=
-#spring.redis.host=47.111.181.152
-#spring.redis.port=6379
-#spring.redis.password=fjsfjq
-
-#spring.redis.host=47.95.230.126
-#spring.redis.port=6379
-#spring.redis.password=
-spring.redis.pool.max-active=8
-spring.redis.pool.max-wait=-1
-spring.redis.pool.max-idle=8
-spring.redis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-
-spring.servlet.multipart.max-file-size=100Mb
-spring.servlet.multipart.max-request-size=100Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-# 驼峰命�规范 如：数�库字段是  order_id 那么 实体字段就�写� orderId
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /void/fjs
-NGINX_PORT = 8081
-
-
-#img.path=D://yangya//workspace//fjs-parent//fjs-scenic-manager//src//main//resources//static//images/
-#img.addr=http://127.0.0.1:8089/images/
-img.path=/data/java/images/
-img.addr=https://fjsstlyq.com/images/
-
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=https://fjsstlyq.com/wechat/notify
-FEFUND_NOTIFY=https://fjsstlyq.com/wechat/refund/notify
-
-
-
-#°¢Àï¶ÌÐÅ
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#Ä£°åID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-manager/src/main/resources/application-local.properties

@@ -1,106 +0,0 @@
-server.port=8089
-
-
-logging.level.com.fjs.scenic.mapper=debug
-
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.111.181.152:13306/fjswx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=fjsdyFx
-
-spring.redis.database=4
-spring.redis.host=47.111.181.152
-#spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=fjsfjq
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-
-
-spring.servlet.multipart.max-file-size=500Mb
-spring.servlet.multipart.max-request-size=500Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-#logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = wx.fjsfjq.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /images/fjs
-
-NGINX_PORT = 8081
-
-img.path=/data/fjs/images/
-img.addr=http://t.cqhsrj.com/images/
-
-
-wechat.mpAppId=wx0e590add1244fd18
-wechat.mpAppSecret=8258bce8b4ebfde0ea6b8a391478ad26
-wechat.token=mywechattoken2297455150
-#CERT_FILE_NAME=F:\\apiclient_cert.p12
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-#°¢Àï¶ÌÐÅ
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#Ä£°åID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = 12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-#ota.cyt.apiUrl = http://192.168.100.153:8080/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-ota.cyt.apiUrl = http://172.16.151.165/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-manager/src/main/resources/application-prod.properties

@@ -0,0 +1,10 @@
+spring.datasource.url=jdbc:mysql://222.179.205.139:16004/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=ExcriptQj2020ABCD!@
+
+spring.redis.database=0
+spring.redis.host=localhost
+spring.redis.port=6379
+spring.redis.password=
+#票务接口
+pw.api=http://localhost:8080/services/cytDataService/doWxQueryRequest.action

fjs-scenic-manager/src/main/resources/application-qjldcx.properties

@@ -1,107 +0,0 @@
-server.port=8111
-
-#spring.thymeleaf.cache=false
-#spring.thymeleaf.mode=LEGACYHTML5
-#spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.servlet.content-type=text/html
-#spring.thymeleaf.prefix=classpath:/templates/
-#spring.thymeleaf.suffix=.html
-#freemarker
-spring.freemarker.allow-request-override=false
-spring.freemarker.allow-session-override=false
-spring.freemarker.cache=false
-spring.freemarker.charset=UTF-8
-spring.freemarker.spring.freemarker.check-template-location=true
-spring.freemarker.content-type=text/html
-spring.freemarker.enabled=true
-spring.freemarker.expose-request-attributes=false
-spring.freemarker.expose-session-attributes=false
-spring.freemarker.expose-spring-macro-helpers=true
-spring.freemarker.prefer-file-system-access=true
-spring.freemarker.suffix=.html
-spring.freemarker.template-loader-path=classpath:/templates/
-spring.freemarker.settings.template_update_delay=0
-spring.freemarker.settings.default_encoding=UTF-8
-spring.freemarker.settings.classic_compatible=true
-
-
-
-jdbc.driverClass=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://192.168.100.218/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#spring.datasource.password=ExcriptQj2020ABCD!@#
-spring.datasource.url=jdbc:mysql://222.179.205.139:16004/lingdaochaxun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=ExcriptQj2020ABCD!@#
-
-
-spring.redis.database=0
-spring.redis.host=localhost
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.min-idle=0
-spring.redis.timeout=5000
-
-#票务接口
-pw.api = http://localhost:8080/services/cytDataService/doWxQueryRequest.action
-
-spring.servlet.multipart.max-file-size=100Mb
-spring.servlet.multipart.max-request-size=100Mb
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.fjs.scenic.entity
-# 驼峰命名规范 如：数据库字段是  order_id 那么 实体字段就要写成 orderId
-mybatis.configuration.map-underscore-to-camel-case=true
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.level.com.fjs.scenic.mapper=debug
-
-#FTP
-FTP_ADDRESS = ftp.cqhsrj.com
-FTP_PORT = 21
-FTP_USERNAME = ftpuser
-FTP_PASSWORD = ectrip2018
-FTP_BASEPATH = /images/fjs
-FTP_VOID_BASEPATH = /void/fjs
-NGINX_PORT = 8081
-
-
-#img.path=D://yangya//workspace//fjs-parent//fjs-scenic-manager//src//main//resources//static//images/
-#img.addr=http://127.0.0.1:8089/images/
-img.path=/data/fjs/images/
-img.addr=http://t.cqhsrj.com/images/
-
-
-CERT_FILE_NAME=/opt/fjs/cert/apiclient_cert.p12
-APPID=wx0e590add1244fd18
-MCH_ID=1532732751
-API_KEY=bd3be4ff95714b07bdaf1373e5577761
-NOTIFY_URL=http://wx.fjsfjq.com/wechat/notify
-FEFUND_NOTIFY=http://wx.fjsfjq.com/wechat/refund/notify
-
-
-
-#�������
-ACCESS_KEY_ID= LTAIJWmL1IRgUsUh
-ACCESS_KEY_SECRET = 0v8d87GzDdlmKkkOBqxlACPhLSo0mM
-SIGN_NAME = \u68b5\u51c0\u5c71
-#ģ��ID
-CAPTACHA_PHONE = SMS_163450757
-
-
-
-
-ota.cyt.createUser = cytfjszy
-#ota.cyt.key = Test1234
-ota.cyt.key = fjsWx12345678
-#ota.cyt.apiUrl = http://192.168.100.122:8080/service/distributor.do
-ota.cyt.apiUrl = http://fx.fjsfjq.com:8086/service/distributor.do
-#ota.cyt.apiUrl = http://47.99.243.13:8081/service/distributor.do
-
-
-#timmer
-ordersTasks.timmer=* 0/5 * * * ?
-materialTasks.timmer=0 0 1 * * ?
-
-
-

fjs-scenic-manager/src/main/resources/application.properties

@@ -1 +1,58 @@
-spring.profiles.active = qjldcx
+spring.profiles.active=@profiles.active@
+#freemarker
+spring.freemarker.allow-request-override=false
+spring.freemarker.allow-session-override=false
+spring.freemarker.cache=false
+spring.freemarker.charset=UTF-8
+spring.freemarker.spring.freemarker.check-template-location=true
+spring.freemarker.content-type=text/html
+spring.freemarker.enabled=true
+spring.freemarker.expose-request-attributes=false
+spring.freemarker.expose-session-attributes=false
+spring.freemarker.expose-spring-macro-helpers=true
+spring.freemarker.prefer-file-system-access=true
+spring.freemarker.suffix=.html
+spring.freemarker.template-loader-path=classpath:/templates/
+spring.freemarker.settings.template_update_delay=0
+spring.freemarker.settings.default_encoding=UTF-8
+spring.freemarker.settings.classic_compatible=true
+jdbc.driverClass=com.mysql.jdbc.Driver
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=5000
+spring.servlet.multipart.max-file-size=100Mb
+spring.servlet.multipart.max-request-size=100Mb
+mybatis.mapper-locations=classpath:mapper/**/*.xml
+mybatis.type-aliases-package=com.fjs.scenic.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+logging.level.com.fjs.scenic.mapper=debug
+#FTP
+FTP_ADDRESS=null
+FTP_PORT=0
+FTP_USERNAME=null
+FTP_PASSWORD=null
+FTP_BASEPATH=null
+FTP_VOID_BASEPATH=null
+# 上传
+NGINX_PORT=0
+img.path=null
+img.addr=null
+# 微信
+CERT_FILE_NAME=null
+APPID=null
+MCH_ID=null
+API_KEY=null
+NOTIFY_URL=null
+FEFUND_NOTIFY=null
+#短信
+ACCESS_KEY_ID=null
+ACCESS_KEY_SECRET=null
+SIGN_NAME=null
+CAPTACHA_PHONE=null
+# cyt
+ota.cyt.createUser=null
+ota.cyt.key=null
+ota.cyt.apiUrl=null

pom.xml

@@ -63,6 +63,26 @@
 		</dependencies>
 
 	</dependencyManagement>
+	<profiles>
+		<profile>
+			<!-- 测试环境 -->
+			<id>dev</id>
+			<properties>
+				<profiles.active>dev</profiles.active>
+			</properties>
+			<!-- 默认测试开发环境 -->
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<!-- 生产环境 -->
+			<id>prod</id>
+			<properties>
+				<profiles.active>prod</profiles.active>
+			</properties>
+		</profile>
+	</profiles>
 	<build>
 		<plugins>
 			<!-- <plugin>