😎1、更新前端请求文件 2、升级依赖及整理代码

This commit is contained in:
zuohuaijun 2025-04-03 21:08:33 +08:00
parent ecd4a4c2ca
commit 93912d85f1
12 changed files with 137 additions and 31 deletions

View File

@ -26,7 +26,7 @@ public class DemoOpenApi : IDynamicApiController
/// </summary>
/// <returns></returns>
[HttpGet("helloWordSignatureAuthentication")]
[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]
public Task<string> HelloWordSignatureAuthentication()
{
return Task.FromResult($"Hello 只能支持 OpenApi, {_userManager.Account}.");
@ -37,7 +37,7 @@ public class DemoOpenApi : IDynamicApiController
/// </summary>
/// <returns></returns>
[HttpGet("HelloWordSignatureAuthenticationOrJwt")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)]
public Task<string> HelloWordSignatureAuthenticationOrJwt()
{
return Task.FromResult($"Hello 支持 OpenApi 或 Jwt, {_userManager.Account}.");

View File

@ -52,11 +52,11 @@
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.4" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.7.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.11.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.187" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.188" />
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1214" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1215" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

View File

@ -4,13 +4,8 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.NET.Core.Service;
public class GenerateSignatureOutput
{
/// <summary>

View File

@ -33,13 +33,13 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[DisplayName("生成签名")]
[DisplayName("生成签名")]
public GenerateSignatureOutput GenerateSignature(GenerateSignatureInput input)
{
if (input.Timestamp==0)
{
// 时间戳
if (input.Timestamp == 0)
input.Timestamp = DateTimeUtil.ToUnixTimestampByMilliseconds(DateTime.Now);
}
// 密钥
var appSecretByte = Encoding.UTF8.GetBytes(input.AccessSecret);
@ -61,7 +61,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[DisplayName("获取开放接口身份分页列表")]
[DisplayName("获取开放接口身份分页列表")]
public async Task<SqlSugarPagedList<OpenAccessOutput>> Page(PageOpenAccessInput input)
{
return await _sysOpenAccessRep.AsQueryable()
@ -83,7 +83,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// <param name="input"></param>
/// <returns></returns>
[ApiDescriptionSettings(Name = "Add"), HttpPost]
[DisplayName("增加开放接口身份")]
[DisplayName("增加开放接口身份")]
public async Task AddOpenAccess(AddOpenAccessInput input)
{
if (await _sysOpenAccessRep.AsQueryable().AnyAsync(u => u.AccessKey == input.AccessKey && u.Id != input.Id))
@ -99,7 +99,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// <param name="input"></param>
/// <returns></returns>
[ApiDescriptionSettings(Name = "Update"), HttpPost]
[DisplayName("更新开放接口身份")]
[DisplayName("更新开放接口身份")]
public async Task UpdateOpenAccess(UpdateOpenAccessInput input)
{
if (await _sysOpenAccessRep.AsQueryable().AnyAsync(u => u.AccessKey == input.AccessKey && u.Id != input.Id))
@ -117,7 +117,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// <param name="input"></param>
/// <returns></returns>
[ApiDescriptionSettings(Name = "Delete"), HttpPost]
[DisplayName("删除开放接口身份")]
[DisplayName("删除开放接口身份")]
public async Task DeleteOpenAccess(DeleteOpenAccessInput input)
{
var openAccess = await _sysOpenAccessRep.GetByIdAsync(input.Id);
@ -131,7 +131,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// 创建密钥 🔖
/// </summary>
/// <returns></returns>
[DisplayName("创建密钥")]
[DisplayName("创建密钥")]
public async Task<string> CreateSecret()
{
return await Task.FromResult(Convert.ToBase64String(Guid.NewGuid().ToByteArray())[..^2]);
@ -142,7 +142,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// </summary>
/// <param name="accessKey"></param>
/// <returns></returns>
[NonAction]
[NonAction]
public async Task<SysOpenAccess> GetByKey(string accessKey)
{
return await Task.FromResult(
@ -159,7 +159,7 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
/// <summary>
/// Signature 身份验证事件默认实现
/// </summary>
[NonAction]
[NonAction]
public static SignatureAuthenticationEvent GetSignatureAuthenticationEventImpl()
{
return new SignatureAuthenticationEvent

View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.04.01",
"lastBuildTime": "2025.04.03",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -77,7 +77,7 @@
"vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.5.10",
"vxe-pc-ui": "^4.5.12",
"vxe-table": "^4.12.5",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
@ -88,7 +88,7 @@
"@iconify/vue": "^4.3.0",
"@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.29",
"@types/node": "^20.17.30",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.29.0",
@ -104,10 +104,10 @@
"openapi-ts-request": "^1.3.0",
"prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.86.1",
"sass": "^1.86.2",
"terser": "^5.39.0",
"typescript": "^5.8.2",
"vite": "^6.2.4",
"vite": "^6.2.5",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3",
"vite-plugin-vue-setup-extend": "^0.4.0",

View File

@ -18,6 +18,7 @@ import { Configuration } from '../configuration';
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
import { AddOpenAccessInput } from '../models';
import { AdminNETResultGenerateSignatureOutput } from '../models';
import { AdminNETResultSqlSugarPagedListOpenAccessOutput } from '../models';
import { AdminNETResultString } from '../models';
import { DeleteOpenAccessInput } from '../models';
@ -357,7 +358,7 @@ export const SysOpenAccessApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultGenerateSignatureOutput>>> {
const localVarAxiosArgs = await SysOpenAccessApiAxiosParamCreator(configuration).apiSysOpenAccessGenerateSignaturePost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@ -441,7 +442,7 @@ export const SysOpenAccessApiFactory = function (configuration?: Configuration,
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultGenerateSignatureOutput>> {
return SysOpenAccessApiFp(configuration).apiSysOpenAccessGenerateSignaturePost(body, options).then((request) => request(axios, basePath));
},
/**
@ -513,7 +514,7 @@ export class SysOpenAccessApi extends BaseAPI {
* @throws {RequiredError}
* @memberof SysOpenAccessApi
*/
public async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
public async apiSysOpenAccessGenerateSignaturePost(body?: GenerateSignatureInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultGenerateSignatureOutput>> {
return SysOpenAccessApiFp(this.configuration).apiSysOpenAccessGenerateSignaturePost(body, options).then((request) => request(this.axios, this.basePath));
}
/**

View File

@ -0,0 +1,69 @@
/* tslint:disable */
/* eslint-disable */
/**
* Admin.NET
* .NET <br/><u><b><font color='FF0000'> 👮</font></b></u>
*
* OpenAPI spec version: 1.0.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
import { GenerateSignatureOutput } from './generate-signature-output';
/**
*
*
* @export
* @interface AdminNETResultGenerateSignatureOutput
*/
export interface AdminNETResultGenerateSignatureOutput {
/**
*
*
* @type {number}
* @memberof AdminNETResultGenerateSignatureOutput
*/
code?: number;
/**
* successwarningerror
*
* @type {string}
* @memberof AdminNETResultGenerateSignatureOutput
*/
type?: string | null;
/**
*
*
* @type {string}
* @memberof AdminNETResultGenerateSignatureOutput
*/
message?: string | null;
/**
* @type {GenerateSignatureOutput}
* @memberof AdminNETResultGenerateSignatureOutput
*/
result?: GenerateSignatureOutput;
/**
*
*
* @type {any}
* @memberof AdminNETResultGenerateSignatureOutput
*/
extras?: any | null;
/**
*
*
* @type {Date}
* @memberof AdminNETResultGenerateSignatureOutput
*/
time?: Date;
}

View File

@ -48,6 +48,7 @@ export enum DbType {
NUMBER_27 = 27,
NUMBER_28 = 28,
NUMBER_29 = 29,
NUMBER_30 = 30,
NUMBER_900 = 900
}

View File

@ -13,7 +13,7 @@
*/
/**
* ( 100,000)
* 100,000
*
* @export
* @interface GenerateQRImageInput

View File

@ -13,7 +13,7 @@
*/
/**
* ()
*
*
* @export
* @interface GenerateQRImageUnLimitInput

View File

@ -0,0 +1,38 @@
/* tslint:disable */
/* eslint-disable */
/**
* Admin.NET
* .NET <br/><u><b><font color='FF0000'> 👮</font></b></u>
*
* OpenAPI spec version: 1.0.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/**
*
*
* @export
* @interface GenerateSignatureOutput
*/
export interface GenerateSignatureOutput {
/**
*
*
* @type {number}
* @memberof GenerateSignatureOutput
*/
timestamp?: number;
/**
*
*
* @type {string}
* @memberof GenerateSignatureOutput
*/
signature?: string | null;
}

View File

@ -30,6 +30,7 @@ export * from './admin-netresult-data-set';
export * from './admin-netresult-data-table';
export * from './admin-netresult-dictionary-string-string';
export * from './admin-netresult-generate-qrimage-output';
export * from './admin-netresult-generate-signature-output';
export * from './admin-netresult-get-refund-domestic-refund-by-out-refund-number-response';
export * from './admin-netresult-grant-role-output';
export * from './admin-netresult-iaction-result';
@ -243,6 +244,7 @@ export * from './generate-qrimage-input';
export * from './generate-qrimage-output';
export * from './generate-qrimage-un-limit-input';
export * from './generate-signature-input';
export * from './generate-signature-output';
export * from './generic-parameter-attributes';
export * from './get-refund-domestic-refund-by-out-refund-number-response';
export * from './goods-detail';