Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

config/aliyun_vod.yml

@@ -1,16 +0,0 @@
-defaults: &defaults
-  access_key_id: 'test'
-  access_key_secret: 'test'
-  base_url: 'http://vod.cn-shanghai.aliyuncs.com'
-  cate_id: '-1'
-  callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
-  signature_key: 'test12345678'
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults