diff --git a/src/admin/api/Admin.Application/Configuration/MiniProgram/MiniProgramSettingsAppService.cs b/src/admin/api/Admin.Application/Configuration/MiniProgram/MiniProgramSettingsAppService.cs index 9214e8f638a57a0bc29e4f71f95864bb4fb2666f..dd0d8b160f6d5119a014121b80fc0ff5c5bfcf21 100644 --- a/src/admin/api/Admin.Application/Configuration/MiniProgram/MiniProgramSettingsAppService.cs +++ b/src/admin/api/Admin.Application/Configuration/MiniProgram/MiniProgramSettingsAppService.cs @@ -5,6 +5,7 @@ using Abp.Dependency; using Magicodes.Admin.Authorization; using Magicodes.Admin.Configuration.MiniProgram.Dto; using Magicodes.MiniProgram.Startup; +using System; using System.Threading.Tasks; namespace Magicodes.Admin.Configuration.MiniProgram @@ -29,8 +30,8 @@ namespace Magicodes.Admin.Configuration.MiniProgram private async Task GetWeChatMiniProgramSettingsAsync() => new WeChatMiniProgramSettingsEditDto { AppId = await SettingManager.GetSettingValueAsync(AppSettings.WeChatMiniProgram.AppId), - AppSecret = - await SettingManager.GetSettingValueAsync(AppSettings.WeChatMiniProgram.AppSecret) + AppSecret = await SettingManager.GetSettingValueAsync(AppSettings.WeChatMiniProgram.AppSecret), + IsActive = Convert.ToBoolean(await SettingManager.GetSettingValueAsync(AppSettings.WeChatMiniProgram.IsActive)) }; public async Task UpdateAllSettings(MiniProgramSettingsEditDto input) @@ -44,6 +45,7 @@ namespace Magicodes.Admin.Configuration.MiniProgram { await SaveSettings(AppSettings.WeChatMiniProgram.AppId, input.AppId); await SaveSettings(AppSettings.WeChatMiniProgram.AppSecret, input.AppSecret); + await SaveSettings(AppSettings.WeChatMiniProgram.IsActive, Convert.ToString(input.IsActive)); } /// diff --git a/src/admin/api/Admin.Host/Admin.Host.csproj b/src/admin/api/Admin.Host/Admin.Host.csproj index ca5deea78182a042c3a17435a1f359f6fb878c51..540fdfcc874a2d42121f81c8cd15daf2abe6afb1 100644 --- a/src/admin/api/Admin.Host/Admin.Host.csproj +++ b/src/admin/api/Admin.Host/Admin.Host.csproj @@ -75,5 +75,5 @@ - + \ No newline at end of file diff --git a/src/admin/ui/package-lock.json b/src/admin/ui/package-lock.json index 18838ba56d9fcbf0b26d56b79141085ca31e5a3f..4923c739da4c00ae55b40644b7c8ab56d4a19faa 100644 --- a/src/admin/ui/package-lock.json +++ b/src/admin/ui/package-lock.json @@ -4393,8 +4393,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -4407,7 +4407,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -4471,7 +4471,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -4486,14 +4486,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -4502,12 +4502,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -4522,7 +4522,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -4531,7 +4531,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -4540,8 +4540,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -4560,7 +4560,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -4574,7 +4574,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -4587,8 +4587,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -4597,7 +4597,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -4620,9 +4620,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -4631,16 +4631,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -4649,8 +4649,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -4665,8 +4665,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -4675,10 +4675,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -4697,7 +4697,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -4718,8 +4718,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -4740,10 +4740,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -4760,13 +4760,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -4775,7 +4775,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -4818,9 +4818,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -4829,7 +4829,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -4837,7 +4837,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -4852,13 +4852,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -4873,7 +4873,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { diff --git a/src/admin/ui/src/app/admin/settings/miniProgram-settings.component.html b/src/admin/ui/src/app/admin/settings/miniProgram-settings.component.html index ceac1544eb20dd9acd103b9d8f48545300901c98..63ad3f6dc332f68a70ed03c0ac68356174a2a2ba 100644 --- a/src/admin/ui/src/app/admin/settings/miniProgram-settings.component.html +++ b/src/admin/ui/src/app/admin/settings/miniProgram-settings.component.html @@ -20,6 +20,13 @@
+
+ +
diff --git a/src/admin/ui/src/shared/service-proxies/service-proxies.ts b/src/admin/ui/src/shared/service-proxies/service-proxies.ts index 0b77b4d18b43cb3646d05c3b4537fe63a87b3684..20efe91738095bc140d8b53a32241e441b04dd8f 100644 --- a/src/admin/ui/src/shared/service-proxies/service-proxies.ts +++ b/src/admin/ui/src/shared/service-proxies/service-proxies.ts @@ -18279,6 +18279,7 @@ export interface IMiniProgramSettingsEditDto { export class WeChatMiniProgramSettingsEditDto implements IWeChatMiniProgramSettingsEditDto { appId!: string; appSecret!: string; + isActive!: boolean; constructor(data?: IWeChatMiniProgramSettingsEditDto) { if (data) { @@ -18293,6 +18294,7 @@ export class WeChatMiniProgramSettingsEditDto implements IWeChatMiniProgramSetti if (data) { this.appId = data["appId"]; this.appSecret = data["appSecret"]; + this.isActive = data["isActive"]; } } @@ -18307,6 +18309,7 @@ export class WeChatMiniProgramSettingsEditDto implements IWeChatMiniProgramSetti data = typeof data === 'object' ? data : {}; data["appId"] = this.appId; data["appSecret"] = this.appSecret; + data["isActive"] = this.isActive; return data; } } @@ -18314,6 +18317,7 @@ export class WeChatMiniProgramSettingsEditDto implements IWeChatMiniProgramSetti export interface IWeChatMiniProgramSettingsEditDto { appId: string; appSecret: string; + isActive: boolean; } export class GetNotificationsOutput implements IGetNotificationsOutput { diff --git a/src/application/Application.Shared/Configuration/MiniProgram/Dto/WeChatMiniProgramSettingsEditDto.cs b/src/application/Application.Shared/Configuration/MiniProgram/Dto/WeChatMiniProgramSettingsEditDto.cs index 37229513c76573cfe10f7bd6197a74c106539cca..da79d4e17779868f6d5cfdf98d1ce662f4c3d1d4 100644 --- a/src/application/Application.Shared/Configuration/MiniProgram/Dto/WeChatMiniProgramSettingsEditDto.cs +++ b/src/application/Application.Shared/Configuration/MiniProgram/Dto/WeChatMiniProgramSettingsEditDto.cs @@ -7,9 +7,20 @@ namespace Magicodes.Admin.Configuration.MiniProgram.Dto { public class WeChatMiniProgramSettingsEditDto { + /// + /// 小程序Id + /// [Required] public string AppId { get; set; } + /// + /// 小程序密钥 + /// [Required] public string AppSecret { get; set; } + /// + /// 是否启用 + /// + [Required] + public bool IsActive { get; set; } } } diff --git a/src/core/Magicodes.Admin.Core/Configuration/AppSettingProvider.cs b/src/core/Magicodes.Admin.Core/Configuration/AppSettingProvider.cs index 582f5541386c9d9c2a7c0fada80af458aeb92413..358448c72b3dac6394410bfc05f6bcbcf1e0df0b 100644 --- a/src/core/Magicodes.Admin.Core/Configuration/AppSettingProvider.cs +++ b/src/core/Magicodes.Admin.Core/Configuration/AppSettingProvider.cs @@ -74,7 +74,8 @@ namespace Magicodes.Admin.Configuration { return new[] { new SettingDefinition(AppSettings.WeChatMiniProgram.AppId, GetFromAppSettings(AppSettings.WeChatMiniProgram.AppId, ""),scopes: SettingScopes.Tenant|SettingScopes.Application), - new SettingDefinition(AppSettings.WeChatMiniProgram.AppSecret, GetFromAppSettings(AppSettings.WeChatMiniProgram.AppSecret, ""),scopes: SettingScopes.Tenant|SettingScopes.Application) + new SettingDefinition(AppSettings.WeChatMiniProgram.AppSecret, GetFromAppSettings(AppSettings.WeChatMiniProgram.AppSecret, ""),scopes: SettingScopes.Tenant|SettingScopes.Application), + new SettingDefinition(AppSettings.WeChatMiniProgram.IsActive, GetFromAppSettings(AppSettings.WeChatMiniProgram.IsActive, "false"),scopes: SettingScopes.Tenant|SettingScopes.Application), }; } private SettingDefinition[] GetPaySettings() => new[] {