diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8ca56284..b5b5adb13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.2.2 ] + branches: [ rel-7.3.2 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.2.2" + automatic_release_tag: "7.3.2" diff --git a/apps/vue/src/api/sys/model/userModel.ts b/apps/vue/src/api/sys/model/userModel.ts index ae40d20e8..359e2d2df 100644 --- a/apps/vue/src/api/sys/model/userModel.ts +++ b/apps/vue/src/api/sys/model/userModel.ts @@ -6,6 +6,7 @@ export interface LoginParams { password: string; twoFactorProvider?: string; twoFactorCode?: string; + enterpriseId?: string; } export interface LoginByPhoneParams { @@ -32,6 +33,12 @@ export interface LoginResultModel { refresh_token: string; } +export interface PortalLoginModel { + id: string; + name: string; + logo?: string; +} + /** * @description: Get user information return value */ diff --git a/apps/vue/src/api/sys/user.ts b/apps/vue/src/api/sys/user.ts index 478a94e4c..e8bdf0b40 100644 --- a/apps/vue/src/api/sys/user.ts +++ b/apps/vue/src/api/sys/user.ts @@ -25,14 +25,15 @@ enum Api { /** * @description: user login api */ -export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') { +export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal', isPortalLogin: boolean = false) { const setting = useGlobSetting(); const tokenParams = { client_id: setting.clientId, client_secret: setting.clientSecret, - grant_type: 'password', + grant_type: isPortalLogin ? 'portal' : 'password', username: params.username, password: params.password, + enterpriseId: params.enterpriseId, scope: 'openid email address phone profile offline_access lingyun-abp-application', TwoFactorProvider: params.twoFactorProvider, TwoFactorCode: params.twoFactorCode, diff --git a/apps/vue/src/locales/lang/en/sys.ts b/apps/vue/src/locales/lang/en/sys.ts index c0104f6ea..11379f89b 100644 --- a/apps/vue/src/locales/lang/en/sys.ts +++ b/apps/vue/src/locales/lang/en/sys.ts @@ -66,12 +66,14 @@ export default { login: { backSignIn: 'Back sign in', mobileSignInFormTitle: 'Mobile sign in', + portalSignInFormTitle: 'Portal sign in', qrSignInFormTitle: 'Qr code sign in', signInFormTitle: 'Sign in', signUpFormTitle: 'Sign up', forgetFormTitle: 'Reset password', twoFactorFormTitle: 'Two factor', + loginToPortalTitle: 'Login To Portal', signInTitle: 'Backstage management system', signInDesc: 'Enter your personal details and get started!', policy: 'I agree to the xxx Privacy Policy', diff --git a/apps/vue/src/locales/lang/zh-CN/sys.ts b/apps/vue/src/locales/lang/zh-CN/sys.ts index 94af3aa2a..7bb7b8d55 100644 --- a/apps/vue/src/locales/lang/zh-CN/sys.ts +++ b/apps/vue/src/locales/lang/zh-CN/sys.ts @@ -62,11 +62,13 @@ export default { backSignIn: '返回', signInFormTitle: '登录', mobileSignInFormTitle: '手机登录', + portalSignInFormTitle: '平台登录', qrSignInFormTitle: '二维码登录', signUpFormTitle: '注册', forgetFormTitle: '重置密码', twoFactorFormTitle: '二次认证', + loginToPortalTitle: '登陆到门户', signInTitle: '开箱即用的中后台管理系统', signInDesc: '输入您的个人详细信息开始使用！', policy: '我同意xxx隐私政策', diff --git a/apps/vue/src/store/modules/user.ts b/apps/vue/src/store/modules/user.ts index c9ff48144..8b2949d5f 100644 --- a/apps/vue/src/store/modules/user.ts +++ b/apps/vue/src/store/modules/user.ts @@ -99,16 +99,18 @@ export const useUserStore = defineStore({ async login( params: LoginParams & { goHome?: boolean; + isPortalLogin?: boolean; mode?: ErrorMessageMode; + loginCallback?: () => Promise; }, ): Promise { try { - const { goHome = true, mode, ...loginParams } = params; - const data = await loginApi(loginParams, mode); + const { goHome = true, mode, isPortalLogin, loginCallback, ...loginParams } = params; + const data = await loginApi(loginParams, mode, isPortalLogin); const { access_token } = data; this.setSso(false); this.setToken(access_token); - return this.afterLoginAction(goHome); + return this.afterLoginAction(goHome, loginCallback); } catch (error) { return Promise.reject(error); } @@ -118,15 +120,16 @@ export const useUserStore = defineStore({ params: LoginByPhoneParams & { goHome?: boolean; mode?: ErrorMessageMode; + loginCallback?: () => Promise; }, ): Promise { try { - const { goHome = true, mode, ...loginParams } = params; + const { goHome = true, mode, loginCallback, ...loginParams } = params; const data = await loginPhoneApi(loginParams, mode); const { access_token } = data; this.setSso(false); this.setToken(access_token); - return this.afterLoginAction(goHome); + return this.afterLoginAction(goHome, loginCallback); } catch (error) { return Promise.reject(error); } @@ -138,10 +141,10 @@ export const useUserStore = defineStore({ return this.afterLoginAction(true); }, - async afterLoginAction(goHome?: boolean): Promise { + async afterLoginAction(goHome?: boolean, loginCallback?: () => Promise): Promise { if (!this.getToken) return null; // get user info - await this.getUserInfoAction(); + await this.getUserInfoAction(loginCallback); try { const appStore = useAppStoreWithOut(); @@ -167,10 +170,11 @@ export const useUserStore = defineStore({ } return this.userInfo; }, - async getUserInfoAction(): Promise { + async getUserInfoAction(loginCallback?: () => Promise): Promise { const userInfo = await getUserInfo(); const abpStore = useAbpStoreWithOut(); + let currentUser = abpStore.getApplication.currentUser; // 避免多次请求接口 if (userInfo?.sub !== currentUser.id) { @@ -178,6 +182,10 @@ export const useUserStore = defineStore({ currentUser = abpStore.getApplication.currentUser; } + if (loginCallback) { + await loginCallback(); + } + const outgoingUserInfo: { [key: string]: any } = { // 从 currentuser 接口获取 userId: currentUser.id, diff --git a/apps/vue/src/utils/http/axios/checkStatus.ts b/apps/vue/src/utils/http/axios/checkStatus.ts index d285c8d0b..142a47c14 100644 --- a/apps/vue/src/utils/http/axios/checkStatus.ts +++ b/apps/vue/src/utils/http/axios/checkStatus.ts @@ -97,6 +97,10 @@ export function checkResponse(response: any): string | undefined { return undefined; } + if (response.data.Enterprises) { + return response.data.Enterprises; + } + let errorJson = response.data.error; // abp框架抛出异常信息 diff --git a/apps/vue/src/views/oss-management/objects/components/FolderTree.vue b/apps/vue/src/views/oss-management/objects/components/FolderTree.vue index fdd01e022..19255b2c7 100644 --- a/apps/vue/src/views/oss-management/objects/components/FolderTree.vue +++ b/apps/vue/src/views/oss-management/objects/components/FolderTree.vue @@ -59,6 +59,7 @@ key: './', path: '', name: './', + isLeaf: false, children: [], }, ]); @@ -66,8 +67,18 @@ () => props.bucket, (bucket) => { if (bucket) { + expandedKeys.value = []; + selectedKeys.value = []; fetchFolders(bucket).then((fs) => { - folders.value[0].children = fs; + var foldersRoot: Folder[] = [{ + title: L('Objects:Root'), + key: './', + path: '', + name: './', + isLeaf: false, + children: fs, + }]; + folders.value = foldersRoot; }); } }, @@ -77,10 +88,10 @@ ) const fetchChildren: TreeProps['loadData'] = treeNode => { return new Promise((resolve) => { - if (treeNode.dataRef!.children!.length > 0) { - resolve(); - return; - } + // if (treeNode.dataRef!.children!.length > 0) { + // resolve(); + // return; + // } let path = ''; if (treeNode.dataRef?.path) { path = path + treeNode.dataRef?.path; @@ -119,6 +130,7 @@ title: item.name, path: item.path, children: [], + isLeaf: false, }; }); return resolve(fs); diff --git a/apps/vue/src/views/oss-management/objects/datas/typing.ts b/apps/vue/src/views/oss-management/objects/datas/typing.ts index 07ecb5dab..ac4df551e 100644 --- a/apps/vue/src/views/oss-management/objects/datas/typing.ts +++ b/apps/vue/src/views/oss-management/objects/datas/typing.ts @@ -3,5 +3,6 @@ export interface Folder { title: string, path?: string, name: string, + isLeaf?: boolean, children?: Folder[], } diff --git a/apps/vue/src/views/sys/login/Login.vue b/apps/vue/src/views/sys/login/Login.vue index 4b24488ff..7e0f48ebd 100644 --- a/apps/vue/src/views/sys/login/Login.vue +++ b/apps/vue/src/views/sys/login/Login.vue @@ -37,6 +37,7 @@ class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x" > + @@ -57,6 +58,7 @@ import RegisterForm from './RegisterForm.vue'; import MobileForm from './MobileForm.vue'; import QrCodeForm from './QrCodeForm.vue'; + import PortalForm from './PortalForm.vue'; import MobileRegisterForm from './MobileRegisterForm.vue'; import { useGlobSetting } from '/@/hooks/setting'; import { useI18n } from '/@/hooks/web/useI18n'; diff --git a/apps/vue/src/views/sys/login/LoginForm.vue b/apps/vue/src/views/sys/login/LoginForm.vue index fd3a2e773..a5b888ed9 100644 --- a/apps/vue/src/views/sys/login/LoginForm.vue +++ b/apps/vue/src/views/sys/login/LoginForm.vue @@ -76,6 +76,11 @@ {{ t('sys.login.otherSignIn') }}
+ + + + diff --git a/apps/vue/src/views/sys/login/useLogin.ts b/apps/vue/src/views/sys/login/useLogin.ts index 8448fbe7d..2d18c701e 100644 --- a/apps/vue/src/views/sys/login/useLogin.ts +++ b/apps/vue/src/views/sys/login/useLogin.ts @@ -13,6 +13,7 @@ export enum LoginStateEnum { WECHAT, SSO, TwoFactor, + Portal, } const currentState = ref(LoginStateEnum.LOGIN); diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 406b0b303..93acb9511 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,18 +1,18 @@  - 7.2.2 + 7.3.2 2.0.1 - 7.2.2 + 7.3.2 1.11.0 1.0.2 - 7.1.0 + 7.2.0 2.11.0 1.5.10 2.13.0 3.0.712 1.6.9 2.0.3 - 1.7.29 + 1.8.2 7.15.1 13.0.1 1.0.0-rc8 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index 4b18bfb25..901bccb12 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 7.2.2 + 7.3.2 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml index 931554637..00835c108 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml @@ -219,7 +219,7 @@ 取消令牌 - + constructor @@ -236,6 +236,7 @@ + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs index b95b3de34..0f23bafb0 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs @@ -12,6 +12,7 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus; using Volo.Abp.EventBus.Distributed; +using Volo.Abp.EventBus.Local; using Volo.Abp.Guids; using Volo.Abp.Json; using Volo.Abp.MultiTenancy; @@ -77,6 +78,7 @@ public class CAPDistributedEventBus : DistributedEventBusBase, IDistributedEvent /// /// /// + /// public CAPDistributedEventBus(IServiceScopeFactory serviceScopeFactory, IOptions distributedEventBusOptions, ICapPublisher capPublisher, @@ -89,7 +91,8 @@ public CAPDistributedEventBus(IServiceScopeFactory serviceScopeFactory, IClock clock, ICancellationTokenProvider cancellationTokenProvider, ICustomDistributedEventSubscriber customDistributedEventSubscriber, - IEventHandlerInvoker eventHandlerInvoker) + IEventHandlerInvoker eventHandlerInvoker, + ILocalEventBus localEventBus) : base( serviceScopeFactory, currentTenant, @@ -97,7 +100,8 @@ public CAPDistributedEventBus(IServiceScopeFactory serviceScopeFactory, distributedEventBusOptions, guidGenerator, clock, - eventHandlerInvoker) + eventHandlerInvoker, + localEventBus) { CapPublisher = capPublisher; CurrentUser = currentUser; diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj index 2ef55c741..3fbed615c 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj @@ -12,6 +12,7 @@ + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs index d3b2e46da..40f8034f9 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.EventBus.Abstractions; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Volo.Abp.TextTemplating; namespace LINGYUN.Abp.Notifications; @@ -14,7 +15,8 @@ namespace LINGYUN.Abp.Notifications; typeof(AbpTextTemplatingCoreModule), typeof(AbpRealTimeModule), typeof(AbpLocalizationModule), - typeof(AbpEventBusAbstractionsModule))] + typeof(AbpEventBusAbstractionsModule), + typeof(AbpMultiTenancyAbstractionsModule))] public class AbpNotificationsCoreModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/modules/notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN/Abp/Notifications/Dto/UserNotificationDto.cs b/aspnet-core/modules/notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN/Abp/Notifications/Dto/UserNotificationDto.cs index 1eff8c49d..cec7388f4 100644 --- a/aspnet-core/modules/notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN/Abp/Notifications/Dto/UserNotificationDto.cs +++ b/aspnet-core/modules/notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN/Abp/Notifications/Dto/UserNotificationDto.cs @@ -9,6 +9,7 @@ public class UserNotificationDto public NotificationData Data { get; set; } public DateTime CreationTime { get; set; } public NotificationType Type { get; set; } + public NotificationLifetime Lifetime { get; set; } public NotificationSeverity Severity { get; set; } public NotificationReadState State { get; set; } public NotificationContentType ContentType { get; set; } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN/Abp/OpenIddict/LinkUser/LinkUserTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN/Abp/OpenIddict/LinkUser/LinkUserTokenExtensionGrant.cs index bfdfeaefc..f2a74bdb6 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN/Abp/OpenIddict/LinkUser/LinkUserTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN/Abp/OpenIddict/LinkUser/LinkUserTokenExtensionGrant.cs @@ -203,9 +203,9 @@ protected virtual Task FindClientIdAsync(ExtensionGrantContext context) protected async virtual Task SetClaimsDestinationsAsync(ExtensionGrantContext context, ClaimsPrincipal principal) { - var claimDestinationsManager = GetRequiredService(context); + var openIddictClaimsPrincipalManager = GetRequiredService(context); - await claimDestinationsManager.SetAsync(principal); + await openIddictClaimsPrincipalManager.HandleAsync(context.Request, principal); } protected async virtual Task> GetResourcesAsync(ExtensionGrantContext context) diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs index d5b880970..2382fbcac 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs @@ -176,9 +176,9 @@ protected virtual Task FindClientIdAsync(ExtensionGrantContext context) protected async virtual Task SetClaimsDestinationsAsync(ExtensionGrantContext context, ClaimsPrincipal principal) { - var claimDestinationsManager = GetRequiredService(context); + var openIddictClaimsPrincipalManager = GetRequiredService(context); - await claimDestinationsManager.SetAsync(principal); + await openIddictClaimsPrincipalManager.HandleAsync(context.Request, principal); } protected async virtual Task> GetResourcesAsync(ExtensionGrantContext context) diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs index 3b103af0a..a4df8be3a 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs @@ -213,9 +213,9 @@ protected virtual Task FindClientIdAsync(ExtensionGrantContext context) protected async virtual Task SetClaimsDestinationsAsync(ExtensionGrantContext context, ClaimsPrincipal principal) { - var claimDestinationsManager = GetRequiredService(context); + var openIddictClaimsPrincipalManager = GetRequiredService(context); - await claimDestinationsManager.SetAsync(principal); + await openIddictClaimsPrincipalManager.HandleAsync(context.Request, principal); } protected async virtual Task> GetResourcesAsync(ExtensionGrantContext context) diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj index f60ef768a..cca23a760 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj @@ -18,6 +18,7 @@ + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/PlatformDomainSharedModule.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/PlatformDomainSharedModule.cs index 9117c3db2..e1e4ebea3 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/PlatformDomainSharedModule.cs +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/PlatformDomainSharedModule.cs @@ -2,12 +2,15 @@ using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Platform { - [DependsOn(typeof(AbpLocalizationModule))] + [DependsOn( + typeof(AbpLocalizationModule), + typeof(AbpMultiTenancyAbstractionsModule))] public class PlatformDomainSharedModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj index 847e645b5..92fb11eef 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj @@ -18,6 +18,7 @@ + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN/Platform/Settings/VueVbenAdmin/PlatformSettingsVueVbenAdminModule.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN/Platform/Settings/VueVbenAdmin/PlatformSettingsVueVbenAdminModule.cs index 6d4f9c351..b3e675f46 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN/Platform/Settings/VueVbenAdmin/PlatformSettingsVueVbenAdminModule.cs +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN/Platform/Settings/VueVbenAdmin/PlatformSettingsVueVbenAdminModule.cs @@ -1,12 +1,14 @@ using LINGYUN.Platform.Localization; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Platform.Settings.VueVbenAdmin; [DependsOn( - typeof(PlatformDomainSharedModule))] + typeof(PlatformDomainSharedModule), + typeof(AbpMultiTenancyModule))] public class PlatformSettingsVueVbenAdminModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj index d8f1642fc..c5a69a24d 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj @@ -10,6 +10,7 @@ + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs index cfe41e1aa..0d6b21598 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs @@ -4,10 +4,13 @@ using System.Collections.Generic; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; namespace LINGYUN.Abp.BackgroundTasks; -[DependsOn(typeof(AbpLocalizationModule))] +[DependsOn( + typeof(AbpLocalizationModule), + typeof(AbpMultiTenancyAbstractionsModule))] public class AbpBackgroundTasksAbstractionsModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj index 9c44b07af..27de4fced 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj @@ -15,6 +15,7 @@ + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/AbpTextTemplatingDomainSharedModule.cs b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/AbpTextTemplatingDomainSharedModule.cs index 64cd26226..f6757dbdd 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/AbpTextTemplatingDomainSharedModule.cs +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/AbpTextTemplatingDomainSharedModule.cs @@ -2,13 +2,15 @@ using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Volo.Abp.Validation; using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Abp.TextTemplating; [DependsOn( - typeof(AbpValidationModule))] + typeof(AbpValidationModule), + typeof(AbpMultiTenancyAbstractionsModule))] public class AbpTextTemplatingDomainSharedModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index 6001fcee7..c0821af8b 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -88,7 +88,7 @@ private void PreConfigureAuth() { builder.AddValidation(options => { - options.AddAudiences("lingyun-abp-application"); + //options.AddAudiences("lingyun-abp-application"); options.UseLocalServer(); diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index dfd33c7b3..3778bee2b 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,14 +1,14 @@  - 7.2.2 - 7.2.2 - 1.10.0 - 7.1.0 + 7.3.2 + 7.3.2 + 1.11.0 + 7.2.0 1.5.10 2.13.0 1.2.1.5 2.0.3 - 1.7.27 + 1.8.2 7.15.1 2.0.593 2.10.0 diff --git a/gateways/common.props b/gateways/common.props index 8dfc4cef2..2f65212b0 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 7.2.2 + 7.3.2 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Dockerfile b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Dockerfile index e87c64490..11fc8461a 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Dockerfile +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app