Merge remote-tracking branch 'origin/master'

src/main/java/com/zoniot/ccrc/security/smsCode/SmsCodeCheckUserFilter.java

@@ -56,19 +56,22 @@ public class SmsCodeCheckUserFilter extends OncePerRequestFilter {
         if(StringUtils.equals("sit",active)){
             return;
         }
-        if (StringUtils.equals(mobile, "18800000000") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000000") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000010") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "13265537610") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000011") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000010") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000012") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000011") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000013") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000012") && StringUtils.equals(smsCode,"8090")) {
+            return;
+        }
+        if (StringUtils.equals(mobile, "18800000013") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
 

src/main/resources/application-prd.properties

@@ -1,7 +1,7 @@
 server.port=8080
 server.servlet.context-path=/api
 
-project.path=/home/prd/ccrc
+project.path=/home/app/prd/ccrc
 #日志配置
 logging.level.root=info
 logging.path=${project.path}/logs
@@ -11,7 +11,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #使用druid数据源
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.url=jdbc:mysql://20.0.0.108:3306/ccrc?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
-#spring.datasource.url=jdbc:mysql://114.135.61.188:23305/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=ccrc
 spring.datasource.password=100zone@zoniot
 spring.datasource.druid.initial-size=5
@@ -66,8 +65,8 @@ iot.server=39.108.175.9
 iot.port=8090
 
 #########################################Rabbit MQ ����#############################################
-spring.rabbitmq.host=114.135.61.188
-spring.rabbitmq.port=55672
+spring.rabbitmq.host=47.112.217.10
+spring.rabbitmq.port=5672
 spring.rabbitmq.username=zoniot
 spring.rabbitmq.password=zcxk100
 spring.rabbitmq.virtual-host=/
@@ -94,5 +93,5 @@ spring.data.mongodb.database=meter-reading-database
 #中城信科公众号
 wechat.oa.appid=wx6b2ce547cd593413
 #小程序水查查服务
-wechat.mp.appid=wx27f831675081e293
-wechat.mp.app-secret=a01d7f75f15e1a6b7fa28a317f97ef1b
+wechat.mp.appid= wx6e9d9023b7b89797
+wechat.mp.app-secret=cde6834d701114722bdad092526572cf

src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=dev
+spring.profiles.active=prd