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

😎1、调整登录服务类 2、适配多核处理器显示 3、升级npm包依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-09-10 13:37:16 +08:00
parent d73c666e5a
commit df22472d17
74 changed files with 225 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Admin.NET/Admin.NET.Application/Configuration/Swagger.json
View File

@ -25,7 +25,8 @@
"LoginInfo": {
"Enabled": true, // 是否开启Swagger登录
"CheckUrl": "/api/swagger/checkUrl",
"SubmitUrl": "/api/swagger/submitUrl"
"SubmitUrl": "/api/swagger/submitUrl",
"EnableOnProduction": false // 是否在生产环境中自动开启
},
"EnumToNumber": true // 枚举类型生成值类型
}

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

@ -32,7 +32,6 @@
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.8" />
<PackageReference Include="NewLife.Redis" Version="5.7.2024.801" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="PluginCore.AspNetCore" Version="1.4.3" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
@ -42,7 +41,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1082" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1084" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

21
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginOutput.cs
View File

@ -20,4 +20,25 @@ public class LoginOutput
/// 刷新Token
/// </summary>
public string RefreshToken { get; set; }
}
/// <summary>
/// 验证码输出
/// </summary>
public class CaptchaOutput
{
/// <summary>
/// Id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 图片
/// </summary>
public string Img { get; set; }
/// <summary>
/// 过期时间
/// </summary>
public int ExpirySeconds { get; set; }
}

57
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -18,36 +18,24 @@ public class SysAuthService : IDynamicApiController, ITransient
{
private readonly UserManager _userManager;
private readonly SqlSugarRepository<SysUser> _sysUserRep;
private readonly SqlSugarRepository<SysUserLdap> _sysUserLdap;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly SysRoleService _sysRoleService;
private readonly SysOnlineUserService _sysOnlineUserService;
private readonly SysConfigService _sysConfigService;
private readonly ICaptcha _captcha;
private readonly SysCacheService _sysCacheService;
private readonly SysLdapService _sysLdapService;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly ICaptcha _captcha;
public SysAuthService(UserManager userManager,
SqlSugarRepository<SysUser> sysUserRep,
SqlSugarRepository<SysUserLdap> sysUserLdapRep,
IHttpContextAccessor httpContextAccessor,
SysRoleService sysRoleService,
SysOnlineUserService sysOnlineUserService,
SysConfigService sysConfigService,
ICaptcha captcha,
SysCacheService sysCacheService,
SysLdapService sysLdapService)
IHttpContextAccessor httpContextAccessor,
ICaptcha captcha)
{
_userManager = userManager;
_sysUserRep = sysUserRep;
_sysUserLdap = sysUserLdapRep;
_httpContextAccessor = httpContextAccessor;
_sysRoleService = sysRoleService;
_sysOnlineUserService = sysOnlineUserService;
_sysConfigService = sysConfigService;
_captcha = captcha;
_sysCacheService = sysCacheService;
_sysLdapService = sysLdapService;
_httpContextAccessor = httpContextAccessor;
_captcha = captcha;
}
/// <summary>
@ -93,25 +81,15 @@ public class SysAuthService : IDynamicApiController, ITransient
if (tenant != null && tenant.Status == StatusEnum.Disable)
throw Oops.Oh(ErrorCodeEnum.Z1003);
// 国密SM2解密（前端密码传输SM2加密后的）
try
{
input.Password = CryptogramUtil.SM2Decrypt(input.Password);
}
catch
{
throw Oops.Oh(ErrorCodeEnum.D0010);
}
// 是否开启域登录验证
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysDomainLogin))
{
var userLdap = await _sysUserLdap.GetFirstAsync(u => u.UserId == user.Id && u.TenantId == tenant.Id);
var userLdap = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysUserLdap>>().GetFirstAsync(u => u.UserId == user.Id && u.TenantId == tenant.Id);
if (userLdap == null)
{
VerifyPassword(input, keyPasswordErrorTimes, passwordErrorTimes, user);
}
else if (!await _sysLdapService.AuthAccount(tenant.Id, userLdap.Account, input.Password))
else if (!await App.GetRequiredService<SysLdapService>().AuthAccount(tenant.Id, userLdap.Account, input.Password))
{
_sysCacheService.Set(keyPasswordErrorTimes, ++passwordErrorTimes, TimeSpan.FromMinutes(30));
throw Oops.Oh(ErrorCodeEnum.D1000);
@ -145,6 +123,9 @@ public class SysAuthService : IDynamicApiController, ITransient
}
else
{
// 国密SM2解密（前端密码传输SM2加密后的）
input.Password = CryptogramUtil.SM2Decrypt(input.Password);
if (!CryptogramUtil.Decrypt(user.Password).Equals(input.Password))
{
_sysCacheService.Set(keyPasswordErrorTimes, ++passwordErrorTimes, TimeSpan.FromMinutes(30));
@ -215,7 +196,7 @@ public class SysAuthService : IDynamicApiController, ITransient
loginMode = LoginModeEnum.PC;
// 单用户登录
await _sysOnlineUserService.SingleLogin(user.Id, loginMode);
await App.GetRequiredService<SysOnlineUserService>().SingleLogin(user.Id, loginMode);
// 生成Token令牌
var tokenExpire = await _sysConfigService.GetTokenExpire();
@ -277,8 +258,8 @@ public class SysAuthService : IDynamicApiController, ITransient
// 角色集合
var roleIds = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysUserRole>>().AsQueryable().Where(u => u.UserId == user.Id).Select(u => u.RoleId).ToListAsync();
// 接口集合
var apis = (await _sysRoleService.GetUserApiList())[0];
// 水印文字（若系统水印为空则禁止显示）
var apis = (await App.GetRequiredService<SysRoleService>().GetUserApiList())[0];
// 水印文字（若系统水印为空则不显示）
var watermarkText = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysWebWatermark);
if (!string.IsNullOrWhiteSpace(watermarkText))
watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(true)}-{DateTime.Now}";
@ -312,7 +293,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <param name="accessToken"></param>
/// <returns></returns>
[DisplayName("获取刷新Token")]
public virtual string GetRefreshToken([FromQuery] string accessToken)
public string GetRefreshToken([FromQuery] string accessToken)
{
var refreshTokenExpire = _sysConfigService.GetRefreshTokenExpire().GetAwaiter().GetResult();
return JWTEncryption.GenerateRefreshToken(accessToken, refreshTokenExpire);
@ -336,19 +317,19 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <returns></returns>
[SuppressMonitor]
[DisplayName("获取验证码")]
public dynamic GetCaptcha()
public CaptchaOutput GetCaptcha()
{
var codeId = YitIdHelper.NextId().ToString();
var captcha = _captcha.Generate(codeId);
var expirySeconds = App.GetOptions<CaptchaOptions>()?.ExpirySeconds ?? 60;
return new { Id = codeId, Img = captcha.Base64, ExpirySeconds = expirySeconds };
return new CaptchaOutput { Id = codeId, Img = captcha.Base64, ExpirySeconds = expirySeconds };
}
/// <summary>
/// Swagger登录检查 🔖
/// </summary>
/// <returns></returns>
[HttpPost("/api/swagger/checkUrl"), NonUnify]
[Route("/api/swagger/checkUrl"), NonUnify]
[DisplayName("Swagger登录检查")]
public int SwaggerCheckUrl()
{
@ -360,7 +341,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// </summary>
/// <param name="auth"></param>
/// <returns></returns>
[HttpPost("/api/swagger/submitUrl"), NonUnify]
[Route("/api/swagger/submitUrl"), NonUnify]
[DisplayName("Swagger登录提交")]
public async Task<int> SwaggerSubmitUrl([FromForm] SpecificationAuth auth)
{

2
Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs
View File

@ -58,7 +58,7 @@ public class SysServerService : IDynamicApiController, ITransient
memoryMetrics.UsedRam, // 已用内存
memoryMetrics.TotalRam, // 总内存
memoryMetrics.RamRate, // 内存使用率
memoryMetrics.CpuRate, // Cpu使用率
memoryMetrics.CpuRates, // Cpu使用率
StartTime = programStartTime.ToString("yyyy-MM-dd HH:mm:ss"), // 服务启动时间
RunTime = programRunTime, // 服务运行时间
};

20
Admin.NET/Admin.NET.Core/Util/ComputerUtil.cs
View File

@ -31,7 +31,11 @@ public static class ComputerUtil
memoryMetrics.UsedRam = Math.Round(memoryMetrics.Used / 1024, 2) + "GB";
memoryMetrics.TotalRam = Math.Round(memoryMetrics.Total / 1024, 2) + "GB";
memoryMetrics.RamRate = Math.Ceiling(100 * memoryMetrics.Used / memoryMetrics.Total).ToString() + "%";
memoryMetrics.CpuRate = Math.Ceiling(GetCPURate().ParseToDouble()) + "%";
var cpuRates = GetCPURates();
if (cpuRates != null)
{
memoryMetrics.CpuRates = cpuRates.Select(u => Math.Ceiling(u.ParseToDouble()) + "%").ToList();
}
return memoryMetrics;
}
@ -170,25 +174,25 @@ public static class ComputerUtil
return RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
}
public static string GetCPURate()
public static List<string> GetCPURates()
{
string cpuRate;
var cpuRates = new List<string>();
if (IsMacOS())
{
string output = ShellUtil.Bash("top -l 1 | grep \"CPU usage\" | awk '{print $3 + $5}'");
cpuRate = output.Trim();
cpuRates.Add(output.Trim());
}
else if (IsUnix())
{
string output = ShellUtil.Bash("top -b -n1 | grep \"Cpu(s)\" | awk '{print $2 + $4}'");
cpuRate = output.Trim();
cpuRates.Add(output.Trim());
}
else
{
string output = ShellUtil.Cmd("wmic", "cpu get LoadPercentage");
cpuRate = output.Replace("LoadPercentage", string.Empty).Trim();
cpuRates.AddRange(output.Replace("LoadPercentage", string.Empty).Trim().Split("\r\r\n"));
}
return cpuRate;
return cpuRates;
}
/// <summary>
@ -258,7 +262,7 @@ public class MemoryMetrics
/// <summary>
/// CPU使用率%
/// </summary>
public string CpuRate { get; set; }
public List<string> CpuRates { get; set; }
/// <summary>
/// 总内存 GB

9
Admin.NET/Admin.NET.Core/Util/CryptogramUtil.cs
View File

@ -75,7 +75,14 @@ public class CryptogramUtil
/// <returns></returns>
public static string SM2Decrypt(string cipherText)
{
return GMUtil.SM2Decrypt(PrivateKey, cipherText);
try
{
return GMUtil.SM2Decrypt(PrivateKey, cipherText);
}
catch
{
throw Oops.Oh(ErrorCodeEnum.D0010);
}
}
/// <summary>

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

@ -22,7 +22,6 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
using OnceMi.AspNetCore.OSS;
using PluginCore.AspNetCore.Extensions;
using SixLabors.ImageSharp.Web.DependencyInjection;
using System;
using System.Threading.Tasks;
@ -101,9 +100,6 @@ public class Startup : AppStartup
// 三方授权登录OAuth
services.AddOAuth();
// 插件 PluginCore
services.AddPluginCore();
// ElasticSearch
services.AddElasticSearch();
@ -259,9 +255,6 @@ public class Startup : AppStartup
// 启用跨域，必须在 UseRouting 和 UseAuthentication 之间注册
app.UseCorsAccessor();
// 插件 PluginCore
app.UsePluginCore();
// 启用鉴权授权
app.UseAuthentication();
app.UseAuthorization();

12
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2024.09.09",
"lastBuildTime": "2024.09.10",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -71,7 +71,7 @@
"vue-router": "^4.4.3",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.1.20",
"vxe-pc-ui": "^4.1.21",
"vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.5",
@ -85,8 +85,8 @@
"@types/node": "^20.14.14",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"@typescript-eslint/eslint-plugin": "^8.5.0",
"@typescript-eslint/parser": "^8.5.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/compiler-sfc": "^3.5.3",
@ -98,8 +98,8 @@
"prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.78.0",
"terser": "^5.31.6",
"typescript": "^5.5.4",
"terser": "^5.32.0",
"typescript": "^5.6.2",
"vite": "^5.4.3",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.0",

8
Web/src/api-services/apis/sys-auth-api.ts
View File

@ -18,9 +18,9 @@ import { Configuration } from '../configuration';
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
import { AdminResultBoolean } from '../models';
import { AdminResultCaptchaOutput } from '../models';
import { AdminResultLoginOutput } from '../models';
import { AdminResultLoginUserOutput } from '../models';
import { AdminResultObject } from '../models';
import { AdminResultString } from '../models';
import { LoginInput } from '../models';
import { LoginPhoneInput } from '../models';
@ -506,7 +506,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async apiSysAuthCaptchaGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
async apiSysAuthCaptchaGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultCaptchaOutput>>> {
const localVarAxiosArgs = await SysAuthApiAxiosParamCreator(configuration).apiSysAuthCaptchaGet(options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@ -630,7 +630,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async apiSysAuthCaptchaGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
async apiSysAuthCaptchaGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultCaptchaOutput>> {
return SysAuthApiFp(configuration).apiSysAuthCaptchaGet(options).then((request) => request(axios, basePath));
},
/**
@ -730,7 +730,7 @@ export class SysAuthApi extends BaseAPI {
* @throws {RequiredError}
* @memberof SysAuthApi
*/
public async apiSysAuthCaptchaGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
public async apiSysAuthCaptchaGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultCaptchaOutput>> {
return SysAuthApiFp(this.configuration).apiSysAuthCaptchaGet(options).then((request) => request(this.axios, this.basePath));
}
/**

2
Web/src/api-services/models/add-config-input.ts
View File

@ -83,7 +83,7 @@ export interface AddConfigInput {
* @type {boolean}
* @memberof AddConfigInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/add-dict-data-input.ts
View File

@ -83,7 +83,7 @@ export interface AddDictDataInput {
* @type {boolean}
* @memberof AddDictDataInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 字典类型Id

2
Web/src/api-services/models/add-dict-type-input.ts
View File

@ -84,7 +84,7 @@ export interface AddDictTypeInput {
* @type {boolean}
* @memberof AddDictTypeInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/add-menu-input.ts
View File

@ -85,7 +85,7 @@ export interface AddMenuInput {
* @type {boolean}
* @memberof AddMenuInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 父Id

2
Web/src/api-services/models/add-notice-input.ts
View File

@ -84,7 +84,7 @@ export interface AddNoticeInput {
* @type {boolean}
* @memberof AddNoticeInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 标题

2
Web/src/api-services/models/add-open-access-input.ts
View File

@ -83,7 +83,7 @@ export interface AddOpenAccessInput {
* @type {boolean}
* @memberof AddOpenAccessInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 绑定租户Id

2
Web/src/api-services/models/add-org-input.ts
View File

@ -84,7 +84,7 @@ export interface AddOrgInput {
* @type {boolean}
* @memberof AddOrgInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-plugin-input.ts
View File

@ -83,7 +83,7 @@ export interface AddPluginInput {
* @type {boolean}
* @memberof AddPluginInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-pos-input.ts
View File

@ -83,7 +83,7 @@ export interface AddPosInput {
* @type {boolean}
* @memberof AddPosInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-print-input.ts
View File

@ -84,7 +84,7 @@ export interface AddPrintInput {
* @type {boolean}
* @memberof AddPrintInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-role-input.ts
View File

@ -85,7 +85,7 @@ export interface AddRoleInput {
* @type {boolean}
* @memberof AddRoleInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-schedule-input.ts
View File

@ -83,7 +83,7 @@ export interface AddScheduleInput {
* @type {boolean}
* @memberof AddScheduleInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-sys-ldap-input.ts
View File

@ -83,7 +83,7 @@ export interface AddSysLdapInput {
* @type {boolean}
* @memberof AddSysLdapInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/add-tenant-input.ts
View File

@ -85,7 +85,7 @@ export interface AddTenantInput {
* @type {boolean}
* @memberof AddTenantInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 用户Id

2
Web/src/api-services/models/add-user-input.ts
View File

@ -89,7 +89,7 @@ export interface AddUserInput {
* @type {boolean}
* @memberof AddUserInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

69
Web/src/api-services/models/admin-result-captcha-output.ts Normal file
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 { CaptchaOutput } from './captcha-output';
/**
* 全局返回结果
*
* @export
* @interface AdminResultCaptchaOutput
*/
export interface AdminResultCaptchaOutput {
/**
* 状态码
*
* @type {number}
* @memberof AdminResultCaptchaOutput
*/
code?: number;
/**
* 类型success、warning、error
*
* @type {string}
* @memberof AdminResultCaptchaOutput
*/
type?: string | null;
/**
* 错误信息
*
* @type {string}
* @memberof AdminResultCaptchaOutput
*/
message?: string | null;
/**
* @type {CaptchaOutput}
* @memberof AdminResultCaptchaOutput
*/
result?: CaptchaOutput;
/**
* 附加数据
*
* @type {any}
* @memberof AdminResultCaptchaOutput
*/
extras?: any | null;
/**
* 时间
*
* @type {Date}
* @memberof AdminResultCaptchaOutput
*/
time?: Date;
}

44
Web/src/api-services/models/wechat-pay-para-output.ts → Web/src/api-services/models/captcha-output.ts
View File

@ -13,46 +13,34 @@
*/
/**
*
* 验证码输出
*
* @export
* @interface WechatPayParaOutput
* @interface CaptchaOutput
*/
export interface WechatPayParaOutput {
export interface CaptchaOutput {
/**
* Id
*
* @type {string}
* @memberof WechatPayParaOutput
* @memberof CaptchaOutput
*/
appId?: string | null;
id?: string | null;
/**
* 图片
*
* @type {string}
* @memberof WechatPayParaOutput
* @memberof CaptchaOutput
*/
timeStamp?: string | null;
img?: string | null;
/**
* @type {string}
* @memberof WechatPayParaOutput
* 过期时间
*
* @type {number}
* @memberof CaptchaOutput
*/
nonceStr?: string | null;
/**
* @type {string}
* @memberof WechatPayParaOutput
*/
_package?: string | null;
/**
* @type {string}
* @memberof WechatPayParaOutput
*/
signType?: string | null;
/**
* @type {string}
* @memberof WechatPayParaOutput
*/
paySign?: string | null;
expirySeconds?: number;
}

7
Web/src/api-services/models/create-pay-transaction-output.ts
View File

@ -12,7 +12,6 @@
* Do not edit the class manually.
*/
import { WechatPayParaOutput } from './wechat-pay-para-output';
/**
*
*
@ -32,10 +31,4 @@ export interface CreatePayTransactionOutput {
* @memberof CreatePayTransactionOutput
*/
outTradeNumber?: string | null;
/**
* @type {WechatPayParaOutput}
* @memberof CreatePayTransactionOutput
*/
singInfo?: WechatPayParaOutput;
}

3
Web/src/api-services/models/index.ts
View File

@ -20,6 +20,7 @@ export * from './add-sys-ldap-input';
export * from './add-tenant-input';
export * from './add-user-input';
export * from './admin-result-boolean';
export * from './admin-result-captcha-output';
export * from './admin-result-create-pay-transaction-native-output';
export * from './admin-result-create-pay-transaction-output';
export * from './admin-result-data-set';
@ -124,6 +125,7 @@ export * from './calendar';
export * from './calendar-algorithm-type';
export * from './calendar-week-rule';
export * from './calling-conventions';
export * from './captcha-output';
export * from './card-type-enum';
export * from './change-pwd-input';
export * from './cluster-status';
@ -422,7 +424,6 @@ export * from './visual-db-table';
export * from './visual-table';
export * from './wechat-pay-output';
export * from './wechat-pay-para-input';
export * from './wechat-pay-para-output';
export * from './wechat-pay-transaction-input';
export * from './wechat-user-login';
export * from './wx-open-id-login-input';

2
Web/src/api-services/models/oauth-user-output.ts
View File

@ -83,7 +83,7 @@ export interface OAuthUserOutput {
* @type {boolean}
* @memberof OAuthUserOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 系统用户Id

2
Web/src/api-services/models/open-access-output.ts
View File

@ -83,7 +83,7 @@ export interface OpenAccessOutput {
* @type {boolean}
* @memberof OpenAccessOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 身份标识

2
Web/src/api-services/models/page-pos-output.ts
View File

@ -83,7 +83,7 @@ export interface PagePosOutput {
* @type {boolean}
* @memberof PagePosOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/page-role-output.ts
View File

@ -85,7 +85,7 @@ export interface PageRoleOutput {
* @type {boolean}
* @memberof PageRoleOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/pos-output.ts
View File

@ -83,7 +83,7 @@ export interface PosOutput {
* @type {boolean}
* @memberof PosOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-code-gen-config.ts
View File

@ -82,7 +82,7 @@ export interface SysCodeGenConfig {
* @type {boolean}
* @memberof SysCodeGenConfig
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 代码生成主表Id

2
Web/src/api-services/models/sys-code-gen-template.ts
View File

@ -84,7 +84,7 @@ export interface SysCodeGenTemplate {
* @type {boolean}
* @memberof SysCodeGenTemplate
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 模板文件名

2
Web/src/api-services/models/sys-code-gen.ts
View File

@ -83,7 +83,7 @@ export interface SysCodeGen {
* @type {boolean}
* @memberof SysCodeGen
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 作者姓名

2
Web/src/api-services/models/sys-config.ts
View File

@ -83,7 +83,7 @@ export interface SysConfig {
* @type {boolean}
* @memberof SysConfig
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/sys-dict-data.ts
View File

@ -83,7 +83,7 @@ export interface SysDictData {
* @type {boolean}
* @memberof SysDictData
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 字典类型Id

2
Web/src/api-services/models/sys-dict-type.ts
View File

@ -84,7 +84,7 @@ export interface SysDictType {
* @type {boolean}
* @memberof SysDictType
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/sys-file.ts
View File

@ -82,7 +82,7 @@ export interface SysFile {
* @type {boolean}
* @memberof SysFile
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 创建者部门Id

2
Web/src/api-services/models/sys-ldap.ts
View File

@ -83,7 +83,7 @@ export interface SysLdap {
* @type {boolean}
* @memberof SysLdap
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-log-diff.ts
View File

@ -82,7 +82,7 @@ export interface SysLogDiff {
* @type {boolean}
* @memberof SysLogDiff
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 操作前记录

2
Web/src/api-services/models/sys-log-ex.ts
View File

@ -83,7 +83,7 @@ export interface SysLogEx {
* @type {boolean}
* @memberof SysLogEx
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-log-op.ts
View File

@ -83,7 +83,7 @@ export interface SysLogOp {
* @type {boolean}
* @memberof SysLogOp
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-log-vis.ts
View File

@ -83,7 +83,7 @@ export interface SysLogVis {
* @type {boolean}
* @memberof SysLogVis
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-menu.ts
View File

@ -85,7 +85,7 @@ export interface SysMenu {
* @type {boolean}
* @memberof SysMenu
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 父Id

2
Web/src/api-services/models/sys-notice.ts
View File

@ -84,7 +84,7 @@ export interface SysNotice {
* @type {boolean}
* @memberof SysNotice
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 标题

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

@ -83,7 +83,7 @@ export interface SysOAuthUser {
* @type {boolean}
* @memberof SysOAuthUser
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 系统用户Id

2
Web/src/api-services/models/sys-org.ts
View File

@ -84,7 +84,7 @@ export interface SysOrg {
* @type {boolean}
* @memberof SysOrg
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-plugin.ts
View File

@ -83,7 +83,7 @@ export interface SysPlugin {
* @type {boolean}
* @memberof SysPlugin
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-print.ts
View File

@ -84,7 +84,7 @@ export interface SysPrint {
* @type {boolean}
* @memberof SysPrint
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-schedule.ts
View File

@ -83,7 +83,7 @@ export interface SysSchedule {
* @type {boolean}
* @memberof SysSchedule
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

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

@ -88,7 +88,7 @@ export interface SysUser {
* @type {boolean}
* @memberof SysUser
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/sys-wechat-pay.ts
View File

@ -82,7 +82,7 @@ export interface SysWechatPay {
* @type {boolean}
* @memberof SysWechatPay
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 关联的商户订单号

2
Web/src/api-services/models/sys-wechat-refund.ts
View File

@ -82,7 +82,7 @@ export interface SysWechatRefund {
* @type {boolean}
* @memberof SysWechatRefund
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 微信支付订单号(原支付交易对应的微信订单号)

2
Web/src/api-services/models/tenant-output.ts
View File

@ -85,7 +85,7 @@ export interface TenantOutput {
* @type {boolean}
* @memberof TenantOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 用户Id

2
Web/src/api-services/models/update-config-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdateConfigInput {
* @type {boolean}
* @memberof UpdateConfigInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/update-dict-data-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdateDictDataInput {
* @type {boolean}
* @memberof UpdateDictDataInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 字典类型Id

2
Web/src/api-services/models/update-dict-type-input.ts
View File

@ -84,7 +84,7 @@ export interface UpdateDictTypeInput {
* @type {boolean}
* @memberof UpdateDictTypeInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 名称

2
Web/src/api-services/models/update-menu-input.ts
View File

@ -85,7 +85,7 @@ export interface UpdateMenuInput {
* @type {boolean}
* @memberof UpdateMenuInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 父Id

2
Web/src/api-services/models/update-notice-input.ts
View File

@ -84,7 +84,7 @@ export interface UpdateNoticeInput {
* @type {boolean}
* @memberof UpdateNoticeInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 标题

2
Web/src/api-services/models/update-open-access-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdateOpenAccessInput {
* @type {boolean}
* @memberof UpdateOpenAccessInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 绑定租户Id

2
Web/src/api-services/models/update-org-input.ts
View File

@ -84,7 +84,7 @@ export interface UpdateOrgInput {
* @type {boolean}
* @memberof UpdateOrgInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-plugin-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdatePluginInput {
* @type {boolean}
* @memberof UpdatePluginInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-pos-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdatePosInput {
* @type {boolean}
* @memberof UpdatePosInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-print-input.ts
View File

@ -84,7 +84,7 @@ export interface UpdatePrintInput {
* @type {boolean}
* @memberof UpdatePrintInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-role-input.ts
View File

@ -85,7 +85,7 @@ export interface UpdateRoleInput {
* @type {boolean}
* @memberof UpdateRoleInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-schedule-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdateScheduleInput {
* @type {boolean}
* @memberof UpdateScheduleInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-sys-ldap-input.ts
View File

@ -83,7 +83,7 @@ export interface UpdateSysLdapInput {
* @type {boolean}
* @memberof UpdateSysLdapInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/update-tenant-input.ts
View File

@ -85,7 +85,7 @@ export interface UpdateTenantInput {
* @type {boolean}
* @memberof UpdateTenantInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 用户Id

2
Web/src/api-services/models/update-user-input.ts
View File

@ -89,7 +89,7 @@ export interface UpdateUserInput {
* @type {boolean}
* @memberof UpdateUserInput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

2
Web/src/api-services/models/user-output.ts
View File

@ -88,7 +88,7 @@ export interface UserOutput {
* @type {boolean}
* @memberof UserOutput
*/
isDelete?: boolean | null;
isDelete?: boolean;
/**
* 租户Id

8
Web/src/views/system/server/index.vue
View File

@ -60,13 +60,15 @@
</el-col>
<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" style="text-align: center">
<el-progress
v-for="(item, index) in state.machineUseInfo.cpuRates"
:key="index"
type="dashboard"
:percentage="parseInt(state.machineUseInfo.cpuRate == undefined ? 0 : state.machineUseInfo.cpuRate.substr(0, state.machineUseInfo.cpuRate.length - 1))"
:percentage="parseInt(item == undefined ? 0 : item.substr(0, item.length - 1))"
:color="'var(--el-color-primary)'"
>
<template #default>
<span>{{ state.machineUseInfo.cpuRate }}<br /></span>
<span style="font-size: 10px"> CPU使用率 </span>
<span>{{ item }}<br /></span>
<span style="font-size: 10px"> CPU使用率<br />核心 {{ index + 1 }}</span>
</template>
</el-progress>
</el-col>