gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、优化状态枚举字段 2、修改记录组件显示逻辑 3、升级微信组件

Browse Source
This commit is contained in:
zuohuaijun 2024-11-05 23:45:29 +08:00
parent 66faf5c493
commit f1cd29e38c
10 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -41,7 +41,7 @@
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.8.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.9.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />

7
Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictDataInput.cs
View File

@ -6,13 +6,8 @@
namespace Admin.NET.Core.Service;
public class DictDataInput : BaseIdInput
public class DictDataInput : BaseStatusInput
{
/// <summary>
/// 状态
/// </summary>
[Dict("StatusEnum")]
public StatusEnum Status { get; set; }
}
public class PageDictDataInput : BasePageInput

7
Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictTypeInput.cs
View File

@ -6,13 +6,8 @@
namespace Admin.NET.Core.Service;
public class DictTypeInput : BaseIdInput
public class DictTypeInput : BaseStatusInput
{
/// <summary>
/// 状态
/// </summary>
[Dict("StatusEnum")]
public StatusEnum Status { get; set; }
}
public class PageDictTypeInput : BasePageInput

7
Admin.NET/Admin.NET.Core/Service/User/Dto/UserInput.cs
View File

@ -9,13 +9,8 @@ namespace Admin.NET.Core.Service;
/// <summary>
/// 设置用户状态输入参数
/// </summary>
public class UserInput : BaseIdInput
public class UserInput : BaseStatusInput
{
/// <summary>
/// 状态
/// </summary>
[Dict("StatusEnum")]
public StatusEnum Status { get; set; }
}
/// <summary>

6
Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
View File

@ -368,7 +368,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
{
TransactionId = input.OutTradeNumber,
OutTradeNumber = request.OutTradeNumber,
OutRefundNo = request.OutTradeNumber, //每笔付款只退一次，所以这里直接用付款单号
OutRefundNo = request.OutTradeNumber, // 每笔付款只退一次，所以这里直接用付款单号
Reason = request.Reason,
Refund = input.Refund,
Total = input.Total,
@ -422,7 +422,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
{
MerchantId = _wechatPayOptions.MerchantId,
TransactionId = transactionId,
WechatpayCertificateSerialNumber = _wechatPayOptions.MerchantCertificateSerialNumber
WechatpaySerialNumber = _wechatPayOptions.MerchantCertificateSerialNumber
};
var response = await _wechatTenpayClient.ExecuteGetPayTransactionByIdAsync(request);
if (response.TradeState == "SUCCESS" || response.TradeState == "CLOSED")
@ -463,7 +463,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
{
MerchantId = _wechatPayOptions.MerchantId,
OutTradeNumber = outTradeNumber,
WechatpayCertificateSerialNumber = _wechatPayOptions.MerchantCertificateSerialNumber
WechatpaySerialNumber = _wechatPayOptions.MerchantCertificateSerialNumber,
};
var response = await _wechatTenpayClient.ExecuteGetPayTransactionByOutTradeNumberAsync(request);
if (response.TradeState == "SUCCESS" || response.TradeState == "CLOSED")

19
Admin.NET/Admin.NET.Core/Utils/BaseStatusInput.cs Normal file
View File

@ -0,0 +1,19 @@
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
//
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
namespace Admin.NET.Core;
/// <summary>
/// 设置状态输入参数
/// </summary>
public class BaseStatusInput : BaseIdInput
{
/// <summary>
/// 状态
/// </summary>
[Dict(nameof(StatusEnum))]
public StatusEnum Status { get; set; }
}

3
Admin.NET/Admin.NET.Web.Core/Startup.cs
View File

@ -240,6 +240,9 @@ public class Startup : AppStartup
"image/svg+xml"
});
});
// 注册虚拟文件系统服务
services.AddVirtualFileServer();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

14
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2024.11.04",
"lastBuildTime": "2024.11.05",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -20,7 +20,7 @@
"@microsoft/signalr": "^8.0.7",
"@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.7",
"@vue-office/pdf": "^2.0.8",
"@vueuse/core": "^11.2.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
@ -35,7 +35,7 @@
"echarts-wordcloud": "^2.1.0",
"element-plus": "^2.8.7",
"exceljs": "^4.4.0",
"ezuikit-js": "^8.1.1-alpha.2",
"ezuikit-js": "^8.1.1-alpha.3",
"gcoord": "^1.0.6",
"js-cookie": "^3.0.5",
"js-table2excel": "^1.1.2",
@ -71,7 +71,7 @@
"vue-router": "^4.4.5",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.2.38",
"vxe-pc-ui": "^4.2.40",
"vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
@ -85,15 +85,15 @@
"@types/node": "^20.16.5",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.12.2",
"@typescript-eslint/parser": "^8.12.2",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/compiler-sfc": "^3.5.12",
"code-inspector-plugin": "^0.17.7",
"eslint": "^9.14.0",
"eslint-plugin-vue": "^9.29.1",
"globals": "^15.11.0",
"globals": "^15.12.0",
"less": "^4.2.0",
"prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0",

16
Web/src/api-services/models/sys-oauth-user.ts
View File

@ -85,14 +85,6 @@ export interface SysOAuthUser {
*/
isDelete?: boolean;
/**
* 邮箱
*
* @type {string}
* @memberof SysOAuthUser
*/
email?: string | null;
/**
* 系统用户Id
*
@ -155,6 +147,14 @@ export interface SysOAuthUser {
*/
avatar?: string | null;
/**
* 邮箱
*
* @type {string}
* @memberof SysOAuthUser
*/
email?: string | null;
/**
* 手机号码
*

2
Web/src/components/table/modifyRecord.vue
View File

@ -38,7 +38,7 @@
</template>
<el-tag>{{ props.data.updateTime ?? '无' }}</el-tag>
</el-descriptions-item>
<el-descriptions-item>
<el-descriptions-item v-if="'remark' in props.data">
<template #label>
<el-text>
<el-icon><ele-Tickets /></el-icon>备注