Skip to content

M
mall.oytour.com
Commit 699c1dc6 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

parents 78369f0f bf944eaf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
Mall.Module.Product/ProductModule.cs
View file @ 699c1dc6
...@@ -1401,6 +1401,11 @@ namespace Mall.Module.Product ...@@ -1401,6 +1401,11 @@ namespace Mall.Module.Product
{ {
var appletWeChatModel = programRepository.GetEntity(mallBaseId); var appletWeChatModel = programRepository.GetEntity(mallBaseId);
string token = CacheManager.AppletWeChat.WeiXinReidsCache.Get(appletWeChatModel.MiniAppId); string token = CacheManager.AppletWeChat.WeiXinReidsCache.Get(appletWeChatModel.MiniAppId);
int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);
if (IsNormalServer != 1)
{
token = "37_0-lYjcCk7K4srJ_SWIumrzRMY4s2UdttdugOEOLBoeQEOUEXga2hutyJrM7PC9QZkK9aXu7g4nE62J7YWfA2T6CKbq1_qPq0njfMvmk2_OZndOv-Rr1BIRhkqa6gFq71zo2Dr73T5tFe5QQ9LWQhAFAEPJ";
}
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
token = Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret); token = Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret);
......
Mall.Module.User/UserModule.cs
View file @ 699c1dc6
...@@ -5713,7 +5713,7 @@ namespace Mall.Module.User ...@@ -5713,7 +5713,7 @@ namespace Mall.Module.User
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
if (IsNormalServer != 1) if (IsNormalServer != 1)
{ {
token = "37_Wqdr6PiecbnyvQKenIyOGyPGrXBZ7UOuRv0TaRwbscyTefDvUoi68KUVKfU4xrY2z6jK24swmQ1vsnR1EQFRapB-Do6L2eO8i-geeoGtRJa0hFIVHSSJaAK3Uk_lGyDcJf6ATCPJebtgjrz8WBQiAGAAFU"; token = "37_0-lYjcCk7K4srJ_SWIumrzRMY4s2UdttdugOEOLBoeQEOUEXga2hutyJrM7PC9QZkK9aXu7g4nE62J7YWfA2T6CKbq1_qPq0njfMvmk2_OZndOv-Rr1BIRhkqa6gFq71zo2Dr73T5tFe5QQ9LWQhAFAEPJ";
} }
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
...@@ -5797,7 +5797,7 @@ namespace Mall.Module.User ...@@ -5797,7 +5797,7 @@ namespace Mall.Module.User
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
if (IsNormalServer != 1) if (IsNormalServer != 1)
{ {
token = "37_Wqdr6PiecbnyvQKenIyOGyPGrXBZ7UOuRv0TaRwbscyTefDvUoi68KUVKfU4xrY2z6jK24swmQ1vsnR1EQFRapB-Do6L2eO8i-geeoGtRJa0hFIVHSSJaAK3Uk_lGyDcJf6ATCPJebtgjrz8WBQiAGAAFU"; token = "37_0-lYjcCk7K4srJ_SWIumrzRMY4s2UdttdugOEOLBoeQEOUEXga2hutyJrM7PC9QZkK9aXu7g4nE62J7YWfA2T6CKbq1_qPq0njfMvmk2_OZndOv-Rr1BIRhkqa6gFq71zo2Dr73T5tFe5QQ9LWQhAFAEPJ";
} }
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment