Merge pull request #892 from colinin/rel-7.4.0

Rel 7.4.0

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
         - "**.csproj"
 
 env:
-  DOTNET_VERSION: "7.0.102"
+  DOTNET_VERSION: "7.0.401"
 
 jobs:
   build:

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: "Tagged Release"
 
 on:
   push:
-    branches: [ rel-7.3.3 ]
+    branches: [ rel-7.4.0 ]
 
 jobs:
   tagged-release:
@@ -14,4 +14,4 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
-        automatic_release_tag: "7.3.3"
+        automatic_release_tag: "7.4.0"

apps/vue/.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH=/
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY=[["/connect","http://127.0.0.1:44385"],["/api","http://127.0.0.1:30000"],["/signalr-hubs","ws://127.0.0.1:30000"]]
+VITE_PROXY=[["/connect","http://127.0.0.1:30000"],["/api","http://127.0.0.1:30000"],["/signalr-hubs","ws://127.0.0.1:30000"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console
@@ -25,6 +25,6 @@ VITE_GLOB_API_URL_PREFIX=
 VITE_GLOB_MULTITENANCY_KEY='__tenant'
 
 # STS Connect
-VITE_GLOB_AUTHORITY='http://127.0.0.1:44385'
+VITE_GLOB_AUTHORITY='http://127.0.0.1:30000'
 VITE_GLOB_CLIENT_ID='vue-admin-client'
 VITE_GLOB_CLIENT_SECRET='1q2w3e*'

apps/vue/src/api/feature-management/definitions/features/index.ts

@@ -0,0 +1,40 @@
+import { defHttp } from '/@/utils/http/axios';
+import {
+  FeatureDefinitionDto,
+  FeatureDefinitionCreateDto,
+  FeatureDefinitionUpdateDto,
+  FeatureDefinitionGetListInput,
+} from './model';
+
+export const CreateAsyncByInput = (input: FeatureDefinitionCreateDto) => {
+  return defHttp.post<FeatureDefinitionDto>({
+    url: '/api/feature-management/definitions',
+    data: input,
+  });
+};
+
+export const DeleteAsyncByName = (name: string) => {
+  return defHttp.delete<void>({
+    url: `/api/feature-management/definitions/${name}`,
+  });
+};
+
+export const GetAsyncByName = (name: string) => {
+  return defHttp.get<FeatureDefinitionDto>({
+    url: `/api/feature-management/definitions/${name}`,
+  });
+};
+
+export const GetListAsyncByInput = (input: FeatureDefinitionGetListInput) => {
+  return defHttp.get<ListResultDto<FeatureDefinitionDto>>({
+    url: '/api/feature-management/definitions',
+    params: input,
+  });
+};
+
+export const UpdateAsyncByNameAndInput = (name: string, input: FeatureDefinitionUpdateDto) => {
+  return defHttp.put<FeatureDefinitionDto>({
+    url: `/api/feature-management/definitions/${name}`,
+    data: input,
+  });
+};

apps/vue/src/api/feature-management/definitions/features/model/index.ts

@@ -0,0 +1,36 @@
+interface FeatureDefinitionCreateOrUpdateDto extends IHasExtraProperties {
+  displayName: string;
+  parentName?: string;
+  description?: string;
+  defaultValue?: string;
+  valueType: string;
+  isVisibleToClients: boolean;
+  isAvailableToHost: boolean;
+  allowedProviders: string[];
+}
+
+export interface FeatureDefinitionCreateDto extends FeatureDefinitionCreateOrUpdateDto {
+  name: string;
+  groupName: string;
+}
+
+export interface FeatureDefinitionDto extends IHasExtraProperties {
+  name: string;
+  groupName: string;
+  displayName: string;
+  parentName?: string;
+  description?: string;
+  defaultValue?: string;
+  valueType: string;
+  isStatic: boolean;
+  isVisibleToClients: boolean;
+  isAvailableToHost: boolean;
+  allowedProviders: string[];
+}
+
+export interface FeatureDefinitionGetListInput {
+  filter?: string;
+  groupName?: string;
+}
+
+export type FeatureDefinitionUpdateDto = FeatureDefinitionCreateOrUpdateDto;

apps/vue/src/api/feature-management/definitions/groups/index.ts

@@ -0,0 +1,40 @@
+import { defHttp } from '/@/utils/http/axios';
+import {
+  FeatureGroupDefinitionDto,
+  FeatureGroupDefinitionCreateDto,
+  FeatureGroupDefinitionUpdateDto,
+  FeatureGroupDefinitionGetListInput,
+} from './model';
+
+export const CreateAsyncByInput = (input: FeatureGroupDefinitionCreateDto) => {
+  return defHttp.post<FeatureGroupDefinitionDto>({
+    url: '/api/feature-management/definitions/groups',
+    data: input,
+  });
+};
+
+export const DeleteAsyncByName = (name: string) => {
+  return defHttp.delete<void>({
+    url: `/api/feature-management/definitions/groups/${name}`,
+  });
+};
+
+export const GetAsyncByName = (name: string) => {
+  return defHttp.get<FeatureGroupDefinitionDto>({
+    url: `/api/feature-management/definitions/groups/${name}`,
+  });
+};
+
+export const GetListAsyncByInput = (input: FeatureGroupDefinitionGetListInput) => {
+  return defHttp.get<ListResultDto<FeatureGroupDefinitionDto>>({
+    url: '/api/feature-management/definitions/groups',
+    params: input,
+  });
+};
+
+export const UpdateAsyncByNameAndInput = (name: string, input: FeatureGroupDefinitionUpdateDto) => {
+  return defHttp.put<FeatureGroupDefinitionDto>({
+    url: `/api/feature-management/definitions/groups/${name}`,
+    data: input,
+  });
+};

apps/vue/src/api/feature-management/definitions/groups/model/index.ts

@@ -0,0 +1,19 @@
+interface FeatureGroupDefinitionCreateOrUpdateDto extends IHasExtraProperties {
+  displayName: string;
+}
+
+export interface FeatureGroupDefinitionCreateDto extends FeatureGroupDefinitionCreateOrUpdateDto {
+  name: string;
+}
+
+export interface FeatureGroupDefinitionDto extends IHasExtraProperties {
+  name: string;
+  displayName: string;
+  isStatic: boolean;
+}
+
+export interface FeatureGroupDefinitionGetListInput {
+  filter?: string;
+}
+
+export type FeatureGroupDefinitionUpdateDto = FeatureGroupDefinitionCreateOrUpdateDto;

apps/vue/src/api/feature-management/features/index.ts

@@ -0,0 +1,20 @@
+import { defAbpHttp } from '/@/utils/http/abp';
+import { FeatureGroupResult, UpdateFeatures, FeatureUpdateByProvider, FeatureGetByProvider } from './model';
+
+export const GetByProvider = (provider: FeatureGetByProvider) => {
+  return defAbpHttp.get<FeatureGroupResult>({
+    url: '/api/feature-management/features',
+    params: provider,
+  });
+};
+
+export const UpdateByProvider = (
+  provider: FeatureUpdateByProvider,
+  input: UpdateFeatures
+) => {
+  return defAbpHttp.put<void>({
+    url: '/api/feature-management/features',
+    data: input,
+    params: provider,
+  });
+};

apps/vue/src/api/feature-management/features/model/index.ts

@@ -0,0 +1,44 @@
+export interface Provider {
+  name: string;
+  key: string;
+}
+
+export interface Feature {
+  name: string;
+  displayName: string;
+  value: any;
+  provider: Provider;
+  description?: string;
+  valueType: ValueType;
+  depth: number;
+  parentName?: string;
+}
+
+export interface FeatureGroup {
+  name: string;
+  displayName: string;
+  features: Feature[];
+}
+
+export class FeatureGroupResult {
+  groups!: FeatureGroup[];
+}
+
+export interface UpdateFeature {
+  name: string;
+  value: string;
+}
+
+export interface UpdateFeatures {
+  features: UpdateFeature[];
+}
+
+export interface FeatureGetByProvider {
+  providerName: string;
+  providerKey: string | null;
+}
+
+export interface FeatureUpdateByProvider {
+  providerName: string;
+  providerKey: string | null;
+}

apps/vue/src/api/messages/notifications.ts

@@ -10,7 +10,7 @@ import { format } from '/@/utils/strings';
 enum Api {
   GetById = '/api/notifications/my-notifilers/{id}',
   GetList = '/api/notifications/my-notifilers',
-  GetAssignableNotifiers = '/api/notifications/notifilers/assignables',
+  GetAssignableNotifiers = '/api/notifications/assignables',
   Read = '/api/notifications/my-notifilers/{id}/read',
   MarkReadState = '/api/notifications/my-notifilers/mark-read-state',
 }

apps/vue/src/api/oss-management/oss.ts

@@ -202,9 +202,6 @@ export const deleteObject = (input: GetOssObjectRequest) => {
       url: Api.DeleteObject,
       params: input,
     },
-    {
-      joinParamsToUrl: true,
-    },
   );
 };
 

apps/vue/src/api/permission-management/definitions/groups/index.ts

@@ -0,0 +1,40 @@
+import { defHttp } from '/@/utils/http/axios';
+import {
+  PermissionGroupDefinitionDto,
+  PermissionGroupDefinitionCreateDto,
+  PermissionGroupDefinitionUpdateDto,
+  PermissionGroupDefinitionGetListInput,
+} from './model';
+
+export const CreateAsyncByInput = (input: PermissionGroupDefinitionCreateDto) => {
+  return defHttp.post<PermissionGroupDefinitionDto>({
+    url: '/api/permission-management/definitions/groups',
+    data: input,
+  });
+};
+
+export const DeleteAsyncByName = (name: string) => {
+  return defHttp.delete<void>({
+    url: `/api/permission-management/definitions/groups/${name}`,
+  });
+};
+
+export const GetAsyncByName = (name: string) => {
+  return defHttp.get<PermissionGroupDefinitionDto>({
+    url: `/api/permission-management/definitions/groups/${name}`,
+  });
+};
+
+export const GetListAsyncByInput = (input: PermissionGroupDefinitionGetListInput) => {
+  return defHttp.get<ListResultDto<PermissionGroupDefinitionDto>>({
+    url: '/api/permission-management/definitions/groups',
+    params: input,
+  });
+};
+
+export const UpdateAsyncByNameAndInput = (name: string, input: PermissionGroupDefinitionUpdateDto) => {
+  return defHttp.put<PermissionGroupDefinitionDto>({
+    url: `/api/permission-management/definitions/groups/${name}`,
+    data: input,
+  });
+};

apps/vue/src/api/permission-management/definitions/groups/model/index.ts

@@ -0,0 +1,19 @@
+interface PermissionGroupDefinitionCreateOrUpdateDto extends IHasExtraProperties {
+  displayName: string;
+}
+
+export interface PermissionGroupDefinitionCreateDto extends PermissionGroupDefinitionCreateOrUpdateDto {
+  name: string;
+}
+
+export interface PermissionGroupDefinitionDto extends IHasExtraProperties {
+  name: string;
+  displayName: string;
+  isStatic: boolean;
+}
+
+export interface PermissionGroupDefinitionGetListInput {
+  filter?: string;
+}
+
+export type PermissionGroupDefinitionUpdateDto = PermissionGroupDefinitionCreateOrUpdateDto;