Merge branch 'master' of

git@60.205.210.36:proudkids-pub/config-center.git

Conflicts:
	proudkids-gateway-dev.yml

proudkids-apps-dev.yml

@@ -56,4 +56,14 @@ mybatis-plus:
     cache-enabled: true
     
 logging:
-  config: classpath:logback.xml
\ No newline at end of file
+  config: classpath:logback.xml
+
+wechat:
+  #share_url: http://test.proudkids.cn/fissionClass/index.html?cid=122682&inviteRuserId=inviteRuserIdR&pid=2
+  access_token:
+    url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
+ffmpeg:
+  location: ffmpeg
+file:
+  tmp:
+    location: /opt/tmp
\ No newline at end of file

proudkids-gateway-dev.yml

@@ -84,7 +84,6 @@ zuul:
         quota: 100
         refresh-interval: 3
 
-
 hystrix:
   command:
     default: