From 143f7be25ff19896e70ffc486999a64a3bc3b76f Mon Sep 17 00:00:00 2001 From: zhouwei <zhouweiwansui@gmail.com> Date: 星期五, 12 七月 2019 13:02:22 +0800 Subject: [PATCH] 11 --- src/main/resources/application.properties | 52 +---------------- /dev/null | 34 ----------- src/main/resources/application-dev.properties | 89 +++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 83 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..83045c4 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,89 @@ +spring.devtools.restart.enabled=false +#与LiveReload一起使用时，自动重启的效果非常好。 +spring.devtools.livereload.enabled=true +spring.main.allow-bean-definition-overriding=true +server.port=8001 + +spring.swagger.enabled=true + +spring.application.name=aaej-app-2019 +debug=true + +#config.payService=http://192.168.40.228:8087/service +config.payService=https://pay.aaej.cn/service/ +## dubbo springboot 配置 +#spring.dubbo.application.id=aaej-app-2019 +#spring.dubbo.application.name=aaej-app-2019 +#spring.dubbo.registry.address=zookeeper://www.aaej.cn:22181 +#spring.dubbo.server=false +#spring.dubbo.protocol.name=zookeeper +#spring.dubbo.protocol.port=20880 + +# Dubbo Config properties +## ApplicationConfig Bean +#dubbo.application.name= dubbo-demo-client +# +### RegistryConfig Bean +#dubbo.registry.id = aliyun +#dubbo.registry.address = zookeeper://www.aaej.cn:22181 +#dubbo.application.qosEnable=false + + + +# 默认值为 /** +#spring.mvc.static-path-pattern=/static/** +## 默认值为 classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ +#spring.resources.static-locations=/static/ +# Redis_config + +cache.prefix = aaej +cache.time = 10 + +spring.redis.database=1 +spring.redis.host=192.168.0.33 +spring.redis.port=6379 +spring.redis.password= +spring.redis.timeout=3000ms +spring.redis.jedis.pool.max-active=100 +spring.redis.jedis.pool.max-wait=1000ms +spring.redis.jedis.shutdown-timeout=100 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss + + +jdbc.url6=jdbc:edb://rm-2ze3y8tt71h1fh204227.ppas.rds.aliyuncs.com:3433/ay_aaej +jdbc.username6=aykj +#jdbc.password6=safeluck +jdbc.password6=Safeluck#0604 + +jdbc.url13=jdbc:edb://rm-2zej9if1424mdt98i855.ppas.rds.aliyuncs.com:3433/ay_aaej_32 +jdbc.username13=g_ayyy +jdbc.password13=SafelucK131229 + + +jdbc.ay_exam_url=jdbc:edb://rm-2zepoq9x3sam49vwn.ppas.rds.aliyuncs.com:3433/ay_exam +jdbc.ay_exam_username=exam +jdbc.ay_exam_password=safeluck + + +jdbc.gps_url=jdbc:mysql://rm-2ze4t2ca44k29n515116.mysql.rds.aliyuncs.com:3306/track_db?useUnicode=true&characterEncoding=utf-8 +jdbc.gps_username=anyun +jdbc.gps_password=safeLuckAl9038 + +jdbc.gps_url2=jdbc:mysql://rm-2zev94tsrc1jd923j329.mysql.rds.aliyuncs.com:3306/track_db?useUnicode=true&characterEncoding=utf-8 +jdbc.gps_username2=anyun +jdbc.gps_password2=safeLuckAl9038 + +jdbc.user_db_url=jdbc:mysql://rm-2zeolm2h08z2079ev130.mysql.rds.aliyuncs.com:3306/user_center?useUnicode=true&characterEncoding=utf-8 +jdbc.userdb_username=root +jdbc.userdb_password=safeluck2017! + +jdbc.image_url=jdbc:mysql://rm-2ze822s1jmh581bdt.mysql.rds.aliyuncs.com:3306/image-db?useUnicode=true&characterEncoding=utf-8 +jdbc.image_username=anyun +jdbc.image_password=safeLuckAl9038 + + +jdbc.gps_driver_class=com.mysql.jdbc.Driver +jdbc.driver_class=com.edb.Driver + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6525c30..253a2a8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,49 +1,3 @@ -spring.devtools.restart.enabled=false -#与LiveReload一起使用时，自动重启的效果非常好。 -spring.devtools.livereload.enabled=true -spring.main.allow-bean-definition-overriding=true -server.port=8001 - -spring.swagger.enabled=true - -spring.application.name=aaej-app-2019 - -## dubbo springboot 配置 -#spring.dubbo.application.id=aaej-app-2019 -#spring.dubbo.application.name=aaej-app-2019 -#spring.dubbo.registry.address=zookeeper://www.aaej.cn:22181 -#spring.dubbo.server=false -#spring.dubbo.protocol.name=zookeeper -#spring.dubbo.protocol.port=20880 - -# Dubbo Config properties -## ApplicationConfig Bean -#dubbo.application.name= dubbo-demo-client -# -### RegistryConfig Bean -#dubbo.registry.id = aliyun -#dubbo.registry.address = zookeeper://www.aaej.cn:22181 -#dubbo.application.qosEnable=false - - - -# 默认值为 /** -#spring.mvc.static-path-pattern=/static/** -## 默认值为 classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ -#spring.resources.static-locations=/static/ -# Redis_config - -cache.prefix = aaej -cache.time = 10 - -spring.redis.database=1 -spring.redis.host=192.168.0.33 -spring.redis.port=6379 -spring.redis.password= -spring.redis.timeout=3000ms -spring.redis.jedis.pool.max-active=100 -spring.redis.jedis.pool.max-wait=1000ms -spring.redis.jedis.shutdown-timeout=100 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss \ No newline at end of file +spring.profiles.active=dev +logging.level.org.springframework.boot.autoconfigure = ERROR +#logging.level.root=warn \ No newline at end of file diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties deleted file mode 100644 index 2d896ac..0000000 --- a/src/main/resources/config.properties +++ /dev/null @@ -1,4 +0,0 @@ -debug=true - -#config.payService=http://192.168.40.228:8087/service -config.payService=https://pay.aaej.cn/service/ \ No newline at end of file diff --git a/src/main/resources/database.properties b/src/main/resources/database.properties deleted file mode 100644 index fc36252..0000000 --- a/src/main/resources/database.properties +++ /dev/null @@ -1,34 +0,0 @@ -jdbc.url6=jdbc:edb://rm-2ze3y8tt71h1fh204227.ppas.rds.aliyuncs.com:3433/ay_aaej -jdbc.username6=aykj -#jdbc.password6=safeluck -jdbc.password6=Safeluck#0604 - -jdbc.url13=jdbc:edb://rm-2zej9if1424mdt98i855.ppas.rds.aliyuncs.com:3433/ay_aaej_32 -jdbc.username13=g_ayyy -jdbc.password13=SafelucK131229 - - -jdbc.ay_exam_url=jdbc:edb://rm-2zepoq9x3sam49vwn.ppas.rds.aliyuncs.com:3433/ay_exam -jdbc.ay_exam_username=exam -jdbc.ay_exam_password=safeluck - - -jdbc.gps_url=jdbc:mysql://rm-2ze4t2ca44k29n515116.mysql.rds.aliyuncs.com:3306/track_db?useUnicode=true&characterEncoding=utf-8 -jdbc.gps_username=anyun -jdbc.gps_password=safeLuckAl9038 - -jdbc.gps_url2=jdbc:mysql://rm-2zev94tsrc1jd923j329.mysql.rds.aliyuncs.com:3306/track_db?useUnicode=true&characterEncoding=utf-8 -jdbc.gps_username2=anyun -jdbc.gps_password2=safeLuckAl9038 - -jdbc.user_db_url=jdbc:mysql://rm-2zeolm2h08z2079ev130.mysql.rds.aliyuncs.com:3306/user_center?useUnicode=true&characterEncoding=utf-8 -jdbc.userdb_username=root -jdbc.userdb_password=safeluck2017! - -jdbc.image_url=jdbc:mysql://rm-2ze822s1jmh581bdt.mysql.rds.aliyuncs.com:3306/image-db?useUnicode=true&characterEncoding=utf-8 -jdbc.image_username=anyun -jdbc.image_password=safeLuckAl9038 - - -jdbc.gps_driver_class=com.mysql.jdbc.Driver -jdbc.driver_class=com.edb.Driver -- Gitblit v1.8.0