Merge branch 'master' of git.mycht.cn:developers/information-system

merge origin

application/config/config.php

@@ -1015,7 +1015,7 @@ $config['project_state'] = array(
 //上传图片是异步上网的，所以用此url进行本地预览
 $config['media_image_url'] = 'http://202.103.68.44/upload';
 $config['media_image_url2'] = 'http://video.chtcdn.com/upload';
-$config['media_image_url_org'] = 'http://202.103.68.35/image';
+$config['media_image_url_org'] = 'http://photo.chtcdn.com:3581/upload';
 $config['media_image_url_remote'] = 'http://photo.chtcdn.com/upload';
 $config['media_image_url_remote2'] = 'http://116.251.217.48:3581/upload';