作者 yangfu

Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/opp into test

# Conflicts:
#	Dockerfile
@@ -20,8 +20,8 @@ redis_auth = "" @@ -20,8 +20,8 @@ redis_auth = ""
20 yunpian_sms_sdk_url ="https://sms.yunpian.com/v2/sms/single_send.json" 20 yunpian_sms_sdk_url ="https://sms.yunpian.com/v2/sms/single_send.json"
21 yunpian_app_key ="0bf6fb10a11a68a95dee80901eb545b5" 21 yunpian_app_key ="0bf6fb10a11a68a95dee80901eb545b5"
22 22
23 -#存储 http:https://public-interface.fjmaimaimai.com/opportunity/  
24 -source_host ="http://mmm-opp-prd.fjmaimaimai.com/" 23 +#存储 http:https://public-interface.fjmaimaimai.com/opportunity/ http://mmm-opp-prd.fjmaimaimai.com/
  24 +source_host ="https://public-interface.fjmaimaimai.com"
25 source_virtual_path=file/opp 25 source_virtual_path=file/opp
26 source_path ="${aliyun_file_access||/var/www/opp/file/opportunity}" 26 source_path ="${aliyun_file_access||/var/www/opp/file/opportunity}"
27 27