Merge branch 'master' of http://60.205.210.36/proudkids-pub/kiss-config-server.git

kiss-apps-dev.yml

@@ -59,10 +59,17 @@ logging:
   config: classpath:logback.xml
 
 
-
-wechat:
-  access_token:
-    url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
 file:
   tmp:
     location: /opt/tmp
+
+
+sms:
+  sign: 骄傲吧孩子
+  sms.accessKeyId: LTAIAMiJjEYtdsGH
+  sms.accessKeySecret: 4NB3Fm7CnSCOeq9QI4RCckwR2yZOVu
+  allow_ip: 172.17.229.80;140.143.35.92;172.17.229.78;172.17.229.79;140.143.35.92;106.38.28.148;39.106.15.229;59.110.225.13;219.143.153.14;119.80.41.62;39.106.15.229;59.110.225.13;47.95.115.100;60.205.204.60;192.168.1.163;
+  domain: dysmsapi.aliyuncs.com
+  product: Dysmsapi
+
+