tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat: add more changes

pull/1040/head
colin 1 year ago
parent
0a3b3ac112
commit
cf2a27b48e
7 changed files with 98 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Directory.Packages.props
  2. 2
      apps/vue/src/api/webhooks/subscriptions/model/index.ts
  3. 43
      apps/vue/src/views/webhooks/subscriptions/components/SubscriptionModal.vue
  4. 50
      aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/appsettings.Development.json
  5. 3
      aspnet-core/services/.gitignore
  6. 7
      aspnet-core/services/LY.MicroService.Applications.Single/IdentityResources/CustomIdentityResources.cs
  7. 48
      aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json

2
Directory.Packages.props
View File

@ -2,6 +2,7 @@
<PropertyGroup>
<DotNetCoreCAPPackageVersion>8.2.0</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<ElsaNextPackageVersion>3.2.3</ElsaNextPackageVersion>
<VoloAbpPackageVersion>8.3.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.3.0</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
@ -95,6 +96,7 @@
<PackageVersion Include="Volo.Abp.Json" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Json.Abstractions" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Localization" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.MailKit" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.MultiTenancy" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.MultiTenancy.Abstractions" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.ObjectExtending" Version="$(VoloAbpPackageVersion)" />

2
apps/vue/src/api/webhooks/subscriptions/model/index.ts
View File

@ -5,6 +5,7 @@ export interface WebhookSubscription extends CreationAuditedEntityDto<string>, I
secret: string;
isActive: boolean;
webhooks: string[];
timeoutDuration?: number;
headers: Dictionary<string, string>;
}
@ -14,6 +15,7 @@ export interface WebhookSubscriptionCreateOrUpdate {
secret: string;
isActive: boolean;
webhooks: string[];
timeoutDuration?: number;
headers: Dictionary<string, string>;
}

43
apps/vue/src/views/webhooks/subscriptions/components/SubscriptionModal.vue
View File

@ -7,31 +7,34 @@
:mask-closable="false"
@ok="handleSubmit"
>
<Form ref="formElRef" :colon="true" layout="vertical" :model="modelRef" :rules="modelRules">
<FormItem name="isActive">
<Form
ref="formElRef"
:colon="true"
:model="modelRef"
:rules="modelRules"
:label-col="{ span: 4 }"
:wrapper-col="{ span: 20 }"
>
<FormItem name="isActive" :label="L('DisplayName:IsActive')" :extra="L('Description:IsActive')">
<Checkbox v-model:checked="modelRef.isActive">{{ L('DisplayName:IsActive') }}</Checkbox>
</FormItem>
<FormItem name="tenantId" :label="L('DisplayName:TenantId')">
<FormItem name="tenantId" :label="L('DisplayName:TenantId')" :extra="L('Description:TenantId')">
<Select v-model:value="modelRef.tenantId">
<SelectOption v-for="tenant in tenantsRef" :key="tenant.id" :value="tenant.id">{{
tenant.name
}}</SelectOption>
</Select>
</FormItem>
<FormItem name="webhookUri" required :label="L('DisplayName:WebhookUri')">
<Input v-model:value="modelRef.webhookUri" autocomplete="off" />
<FormItem name="webhookUri" required :label="L('DisplayName:WebhookUri')" :extra="L('Description:WebhookUri')">
<Input v-model:value="modelRef.webhookUri" :maxlength="255" show-count allow-clear autocomplete="off" />
</FormItem>
<FormItem name="description" :label="L('DisplayName:Description')">
<Textarea
v-model:value="modelRef.description"
:show-count="true"
:auto-size="{ minRows: 3 }"
/>
<FormItem name="timeoutDuration" :label="L('DisplayName:TimeoutDuration')" :extra="L('Description:TimeoutDuration')">
<InputNumber v-model:value="modelRef.timeoutDuration" show-count allow-clear :min="10" :max="300" />
</FormItem>
<FormItem name="secret" :label="L('DisplayName:Secret')">
<InputPassword v-model:value="modelRef.secret" autocomplete="off" />
<FormItem name="secret" :label="L('DisplayName:Secret')" :extra="L('Description:Secret')">
<InputPassword v-model:value="modelRef.secret" :maxlength="128" autocomplete="off" />
</FormItem>
<FormItem name="webhooks" :label="L('DisplayName:Webhooks')">
<FormItem name="webhooks" :label="L('DisplayName:Webhooks')" :extra="L('Description:Webhooks')">
<Select v-model:value="modelRef.webhooks" mode="multiple" :filterOption="optionFilter">
<SelectGroup
v-for="group in webhooksGroupRef"
@ -54,7 +57,15 @@
</SelectGroup>
</Select>
</FormItem>
<FormItem name="headers" :label="L('DisplayName:Headers')">
<FormItem name="description" :label="L('DisplayName:Description')">
<Textarea
v-model:value="modelRef.description"
:show-count="true"
:maxlength="128"
:auto-size="{ minRows: 3 }"
/>
</FormItem>
<FormItem name="headers" :label="L('DisplayName:Headers')" :extra="L('Description:Headers')">
<CodeEditor style="height: 300px" :mode="MODE.JSON" v-model:value="modelRef.headers" />
</FormItem>
</Form>
@ -66,7 +77,7 @@
import { useLocalization } from '/@/hooks/abp/useLocalization';
import { useValidation } from '/@/hooks/abp/useValidation';
import { useMessage } from '/@/hooks/web/useMessage';
import { Checkbox, Form, Select, Tooltip, Input, InputPassword, Textarea } from 'ant-design-vue';
import { Checkbox, Form, Select, Tooltip, Input, InputPassword, InputNumber, Textarea } from 'ant-design-vue';
import { isString } from '/@/utils/is';
import { CodeEditor, MODE } from '/@/components/CodeEditor';
import { BasicModal, useModalInner } from '/@/components/Modal';

50
aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/appsettings.Development.json
View File

@ -2,7 +2,7 @@
"App": {
"ShowPii": true,
"SelfUrl": "http://127.0.0.1:30001/",
"CorsOrigins": "http://127.0.0.1:3100,http://127.0.0.1:30001",
"CorsOrigins": "http://127.0.0.1:3100,http://127.0.0.1:30001,http://localhost:9010",
"Urls": {
"Applications": {
"MVC": {
@ -35,25 +35,39 @@
"AbsoluteExpirationRelativeToNow": "60:00:00"
}
},
"Databases": {
"Default": {
"DatabaseName": "Default",
"MappedConnections": [
"AbpAuditLogging",
"AbpIdentity",
"AbpFeatureManagement",
"AbpSettingManagement",
"AbpPermissionManagement",
"AppPlatform",
"TaskManagement",
"Notifications",
"MessageService"
],
"IsUsedByTenants": true
},
"HostOnly": {
"DatabaseName": "HostDb",
"MappedConnections": [
"AbpOpenIddict",
"AbpIdentityServer",
"AbpSaas",
"AbpTextTemplating",
"AbpLocalizationManagement",
"Workflow",
"Demo"
],
"IsUsedByTenants": false
}
},
"ConnectionStrings": {
"Default": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpAuditLogging": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpOpenIddict": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpSaas": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpTenantManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpSettingManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpTextTemplating": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AppPlatform": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"TaskManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"Workflow": "Server=127.0.0.1;Database=Workflow-V70;User Id=root;Password=123456;SslMode=None",
"Notifications": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None",
"MessageService": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None",
"Demo": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None"
"HostOnly": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None"
},
"DistributedLock": {
"IsEnabled": true,

3
aspnet-core/services/.gitignore
View File

@ -1,2 +1,3 @@
Modules
file-blob-storing
file-blob-storing
blobs

7
aspnet-core/services/LY.MicroService.Applications.Single/IdentityResources/CustomIdentityResources.cs
View File

@ -1,11 +1,8 @@
using IdentityServer4.Models;
using LINGYUN.Abp.Identity;
namespace LY.MicroService.Applications.Single.IdentityResources;
namespace LY.MicroService.Applications.Single.IdentityResources;
public class CustomIdentityResources
{
public class AvatarUrl : IdentityResource
public class AvatarUrl : IdentityServer4.Models.IdentityResource
{
public AvatarUrl()
{

48
aspnet-core/services/LY.MicroService.Applications.Single/appsettings.Development.json
View File

@ -35,25 +35,39 @@
"AbsoluteExpirationRelativeToNow": "60:00:00"
}
},
"Databases": {
"Default": {
"DatabaseName": "Default",
"MappedConnections": [
"AbpAuditLogging",
"AbpIdentity",
"AbpFeatureManagement",
"AbpSettingManagement",
"AbpPermissionManagement",
"AppPlatform",
"TaskManagement",
"Notifications",
"MessageService"
],
"IsUsedByTenants": true
},
"HostOnly": {
"DatabaseName": "HostDb",
"MappedConnections": [
"AbpOpenIddict",
"AbpIdentityServer",
"AbpSaas",
"AbpTextTemplating",
"AbpLocalizationManagement",
"Workflow",
"Demo"
],
"IsUsedByTenants": false
}
},
"ConnectionStrings": {
"Default": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpAuditLogging": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpOpenIddict": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer-V70;User Id=root;Password=123456;SslMode=None",
"AbpSaas": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpTenantManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpSettingManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AbpTextTemplating": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"AppPlatform": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"TaskManagement": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None",
"Workflow": "Server=127.0.0.1;Database=Workflow-V70;User Id=root;Password=123456;SslMode=None",
"Notifications": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None",
"MessageService": "Server=127.0.0.1;Database=Messages-V70;User Id=root;Password=123456;SslMode=None",
"Demo": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None"
"HostOnly": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456;SslMode=None"
},
"DistributedLock": {
"IsEnabled": true,

Write Preview
Loading…
Cancel
Save