Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rel 8.1.3 #954

Merged
merged 2 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Publish"

on:
push:
branches: [ rel-8.1.2 ]
branches: [ rel-8.1.3 ]
env:
DOTNET_VERSION: "8.0.200"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Tagged Release"

on:
push:
branches: [ rel-8.1.2 ]
branches: [ rel-8.1.3 ]

jobs:
tagged-release:
Expand All @@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "8.1.2"
automatic_release_tag: "8.1.3"
12 changes: 8 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<DotNetCoreCAPPackageVersion>8.1.1</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<VoloAbpPackageVersion>8.1.2</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.1.2</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>8.1.3</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.1.3</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftAspNetCorePackageVersion>8.0.0</MicrosoftAspNetCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
Expand Down Expand Up @@ -236,12 +236,16 @@
<PackageVersion Include="NEST" Version="7.15.1" />
<PackageVersion Include="NRules" Version="0.9.2" />
<PackageVersion Include="Ocelot.Provider.Polly" Version="20.0.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
<PackageVersion Include="Polly" Version="8.2.0" />
<PackageVersion Include="QRCoder" Version="1.5.1" />
<PackageVersion Include="Quartz.Serialization.Json" Version="3.7.0" />
<PackageVersion Include="RulesEngine" Version="4.0.0" />
<PackageVersion Include="Scriban" Version="5.9.0" />
Expand Down
1 change: 1 addition & 0 deletions apps/vue/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = {
extends: [
'plugin:vue/vue3-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:prettier/recommended',
],
rules: {
Expand Down
2 changes: 1 addition & 1 deletion apps/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"log": "conventional-changelog -p angular -i CHANGELOG.md -s",
"clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
"clean:lib": "rimraf node_modules",
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
"lint:eslint": "eslint --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
"lint:prettier": "prettier --write \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
"lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged",
Expand Down
78 changes: 0 additions & 78 deletions apps/vue/src/api/account/accounts.ts

This file was deleted.

67 changes: 67 additions & 0 deletions apps/vue/src/api/account/accounts/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import { defHttp } from '/@/utils/http/axios';
import {
Register,
PhoneRegister,
PhoneResetPassword,
SendPhoneSigninCodeInput,
SendEmailSigninCodeInput,
SendPhoneRegisterCodeInput,
SendPhoneResetPasswordCodeInput,
GetTwoFactorProvidersInput,
} from './model';
import { User } from '/@/api/identity/model/userModel';

export const passwordRegister = (input: Register) => {
return defHttp.post<User>({
url: '/api/account/register',
data: input,
});
};

export const phoneRegister = (input: PhoneRegister) => {
return defHttp.post<void>({
url: '/api/account/phone/register',
data: input,
});
};

export const resetPassword = (input: PhoneResetPassword) => {
return defHttp.put<void>({
url: '/api/account/phone/reset-password',
data: input,
});
};

export const sendPhoneSigninCode = (input: SendPhoneSigninCodeInput) => {
return defHttp.post<void>({
url: '/api/account/phone/send-signin-code',
data: input,
});
};

export const sendEmailSigninCode = (input: SendEmailSigninCodeInput) => {
return defHttp.post<void>({
url: '/api/account/email/send-signin-code',
data: input,
});
};

export const sendPhoneRegisterCode = (input: SendPhoneRegisterCodeInput) => {
return defHttp.post<void>({
url: '/api/account/phone/send-register-code',
data: input,
});
};

export const sendPhoneResetPasswordCode = (input: SendPhoneResetPasswordCodeInput) => {
return defHttp.post<void>({
url: '/api/account/phone/send-password-reset-code',
data: input,
});
};

export const getTwoFactorProviders = (input: GetTwoFactorProvidersInput) => {
return defHttp.get<ListResultDto<NameValue<string>>>({
url: `/api/account/two-factor-providers?userId=${input.userId}`,
});
}
46 changes: 46 additions & 0 deletions apps/vue/src/api/account/accounts/model/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
export interface Register {
userName: string;
emailAddress: string;
password: string;
appName: string;
}

export interface PhoneRegister {
phoneNumber: string;
password: string;
code: string;
name?: string;
userName?: string;
emailAddress?: string;
}

export interface PhoneResetPassword {
phoneNumber: string;
newPassword: string;
code: string;
}

export interface SendPhoneSecurityCode {
phoneNumber: string;
}

export interface SendPhoneRegisterCodeInput {
phoneNumber: string;
}

export interface SendPhoneSigninCodeInput {
phoneNumber: string;
}

export interface SendPhoneResetPasswordCodeInput {
phoneNumber: string;
}

export interface SendEmailSigninCodeInput {
emailAddress: string;
}

export interface GetTwoFactorProvidersInput {
userId: string;
}

13 changes: 0 additions & 13 deletions apps/vue/src/api/account/claims.ts

This file was deleted.

9 changes: 9 additions & 0 deletions apps/vue/src/api/account/claims/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defHttp } from '/@/utils/http/axios';
import { ChangeAvatarInput } from './model';

export const changeAvatar = (input: ChangeAvatarInput) => {
return defHttp.post<void>({
url: '/api/account/my-claim/change-avatar',
data: input,
});
};
4 changes: 4 additions & 0 deletions apps/vue/src/api/account/claims/model/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export interface ChangeAvatarInput {
avatarUrl: string;
}

25 changes: 0 additions & 25 deletions apps/vue/src/api/account/model/accountsModel.ts

This file was deleted.

3 changes: 0 additions & 3 deletions apps/vue/src/api/account/model/claimsModel.ts

This file was deleted.

40 changes: 0 additions & 40 deletions apps/vue/src/api/account/model/profilesModel.ts

This file was deleted.

Loading
Loading