Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD_WebService
This commit is contained in:
commit
e971db92ad
2 files changed
+4
No files matched your search
@@ -194,7 +194,9 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
mySql.Close();
|
mySql.Close();
|
||||||
var prodApiUrl = (System.Configuration.ConfigurationManager.ConnectionStrings["ProdApiUrl"]?.ConnectionString).ParseToString();
|
var prodApiUrl = (System.Configuration.ConfigurationManager.ConnectionStrings["ProdApiUrl"]?.ConnectionString).ParseToString();
|
||||||
var orderApiUrl = (System.Configuration.ConfigurationManager.ConnectionStrings["OrderApiUrl"]?.ConnectionString).ParseToString();
|
var orderApiUrl = (System.Configuration.ConfigurationManager.ConnectionStrings["OrderApiUrl"]?.ConnectionString).ParseToString();
|
||||||
|
var AllowTraditionalBuyAddress = (System.Configuration.ConfigurationManager.ConnectionStrings["AllowTraditionalBuyAddress"]?.ConnectionString).ParseToString();
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"prod_api_url\":\"" + prodApiUrl + "\",\"order_api_url\":\"" + orderApiUrl +
|
return "{\"code\":200,\"msg\":\"success\",\"prod_api_url\":\"" + prodApiUrl + "\",\"order_api_url\":\"" + orderApiUrl +
|
||||||
|
"\",\"allow_traditional_buy_address\":\"" + AllowTraditionalBuyAddress +
|
||||||
"\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
|
"\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
|
||||||
}
|
}
|
||||||
mySql.Close();
|
mySql.Close();
|
||||||
|
|||||||
@@ -27,6 +27,8 @@
|
|||||||
<add name="WxFindOrderLowVersion" connectionString="99" />
|
<add name="WxFindOrderLowVersion" connectionString="99" />
|
||||||
<add name="OrderApiUrl" connectionString="http://119.45.29.75:9000" />
|
<add name="OrderApiUrl" connectionString="http://119.45.29.75:9000" />
|
||||||
<add name="ProdApiUrl" connectionString="http://1.13.195.131:9000" />
|
<add name="ProdApiUrl" connectionString="http://1.13.195.131:9000" />
|
||||||
|
|
||||||
|
<add name="AllowTraditionalBuyAddress" connectionString="1" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<!-- 禁用 OWIN 启动类的自动发现,避免与现有项目结构冲突 -->
|
<!-- 禁用 OWIN 启动类的自动发现,避免与现有项目结构冲突 -->
|
||||||
|
|||||||
Reference in new issue
Block a user