Merge branch 'zhz' of git.shenbd.com:qm-develop/shenbd into master_dev

conf/url.ini

@@ -12,7 +12,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
 config.url.userHost = ""
 ;
 ; ; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
+;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 ;
 ; ;推送域名
 config.url.pushHost="172.16.142.15:9503";
@@ -36,8 +37,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
 ; 用户中心host
 config.url.userHost = ""
 
-; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
+;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
@@ -54,9 +55,9 @@ config.url.convert=/usr/local/bin/wkhtmltoimage
 config.url.resourcesHost = "http://apitest.shenbd.com"
 ; 用户中心host
 config.url.userHost = ""
-
+config.url.ossHost = "https://imgpre.shenbd.com"
 ; oss 域名
-config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
@@ -74,9 +75,9 @@ config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
 config.url.resourcesHost = "http://apitest.qm.com"
 ; 用户中心host
 config.url.userHost = ""
-
+config.url.ossHost = "https://img.shenbd.com"
 ; oss 域名
-config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+;config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
@@ -90,11 +91,16 @@ config.url.resourcesHost = "http://test.qm.com"
 config.url.userHost = ""
 
 ; oss 域名
-config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
 
+config.url.indexUrl="/www/web/test_qm_com/application/library/React"
+config.url.libary="/www/web/test_qm_com/application/library"
+
+config.url.source="/www/web/test_qm_com/public_html/data/upload/"
+
 ;config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
 ; 文件目录
 ;店铺图片报错目录
@@ -116,10 +122,10 @@ config.url.resourcesHost = "http://local.qm.com"
 config.url.userHost = ""
 
 ; oss 域名
-config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://imgpre.shenbd.com"
 
 ;推送域名
-config.url.pushHost="127.0.0.1:9503";
+config.url.pushHost="192.168.1.201:9503";
 
 
 config.url.convert="/usr/local/bin/wkhtmltoimage";