😎清理代码

This commit is contained in:
zuohuaijun 2025-08-30 00:22:20 +08:00
parent 9daa513bd0
commit feb3318dbc
16 changed files with 31 additions and 57 deletions

View File

@ -16,8 +16,8 @@
"VirtualHost": "/" "VirtualHost": "/"
}, },
//RabbitMQ // RabbitMQ
"RabbitMqConsumerOptions": { "RabbitMqConsumerOptions": {
"ConsumerCount": 1 // 线 "ConsumerCount": 1 // 线
} }
} }

View File

@ -4,11 +4,9 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
using Admin.NET.Core;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using NewLife.Reflection;
namespace Admin.NET.Application; namespace Admin.NET.Application;

View File

@ -27,7 +27,7 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" /> <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.5" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.114" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.114" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.114" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.114" />
<PackageReference Include="Furion.Pure" Version="4.9.7.114" /> <PackageReference Include="Furion.Pure" Version="4.9.7.114" />

View File

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

View File

@ -7,7 +7,7 @@
namespace Admin.NET.Core; namespace Admin.NET.Core;
/// <summary> /// <summary>
/// RabbitMQ消费者配置 /// RabbitMQ 消费者配置
/// </summary> /// </summary>
public class RabbitMqConsumerOptions : IConfigurableOptions public class RabbitMqConsumerOptions : IConfigurableOptions
{ {

View File

@ -339,17 +339,16 @@ public class SysAuthService : IDynamicApiController, ITransient
}; };
} }
///// <summary> /// <summary>
///// 获取刷新Token 🔖 /// 刷新Token
///// </summary> /// </summary>
///// <param name="accessToken"></param> /// <param name="userId"></param>
///// <returns></returns> [NonAction]
//[DisplayName("获取刷新Token")] public async Task RefreshToken(long userId)
//public string GetRefreshToken([FromQuery] string accessToken) {
//{ var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
// var refreshTokenExpire = _sysConfigService.GetRefreshTokenExpire().GetAwaiter().GetResult(); await CreateToken(user);
// return JWTEncryption.GenerateRefreshToken(accessToken, refreshTokenExpire); }
//}
/// <summary> /// <summary>
/// 退出系统 🔖 /// 退出系统 🔖
@ -440,15 +439,4 @@ public class SysAuthService : IDynamicApiController, ITransient
return 401; return 401;
} }
} }
/// <summary>
/// 刷新token
/// </summary>
/// <param name="userId"></param>
[NonAction]
public async Task RefreshToken(long userId)
{
var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
await CreateToken(user);
}
} }

View File

@ -110,7 +110,6 @@ public class PageLogHttpOutput
/// 创建用户 /// 创建用户
/// </summary> /// </summary>
public string CreateUserName { get; set; } public string CreateUserName { get; set; }
} }
/// <summary> /// <summary>

View File

@ -8,11 +8,6 @@ global using Admin.NET.Core;
global using Admin.NET.Core.Service; global using Admin.NET.Core.Service;
global using Furion; global using Furion;
global using Furion.DependencyInjection; global using Furion.DependencyInjection;
global using Furion.EventBus;
global using Furion.HttpRemote; global using Furion.HttpRemote;
global using Lazy.Captcha.Core;
global using Microsoft.AspNetCore.Http;
global using Microsoft.AspNetCore.Mvc;
global using Newtonsoft.Json; global using Newtonsoft.Json;
global using System.ComponentModel.DataAnnotations; global using System.ComponentModel.DataAnnotations;
global using System.Text.Json.Serialization;

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Plugin.WorkWeixin; namespace Admin.NET.Plugin.WorkWeixin;
/// <summary> /// <summary>

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Plugin.WorkWeixin; namespace Admin.NET.Plugin.WorkWeixin;
/// <summary> /// <summary>

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Plugin.WorkWeixin; namespace Admin.NET.Plugin.WorkWeixin;
/// <summary> /// <summary>
@ -39,7 +38,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
/// <returns></returns> /// <returns></returns>
public async Task<BaseWorkWxOutput> Delete(long id) public async Task<BaseWorkWxOutput> Delete(long id)
{ {
return await baseService.SendAsync<DeleteTagWorkWxInput, BaseWorkWxOutput>(new(){ TagId = id }); return await baseService.SendAsync<DeleteTagWorkWxInput, BaseWorkWxOutput>(new() { TagId = id });
} }
/// <summary> /// <summary>
@ -49,7 +48,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
/// <returns></returns> /// <returns></returns>
public async Task<TagMembersWorkWxOutput> Get(long id) public async Task<TagMembersWorkWxOutput> Get(long id)
{ {
return await baseService.SendAsync<TagMembersWorkWxInput, TagMembersWorkWxOutput>(new(){ TagId = id }); return await baseService.SendAsync<TagMembersWorkWxInput, TagMembersWorkWxOutput>(new() { TagId = id });
} }
/// <summary> /// <summary>

View File

@ -786,7 +786,7 @@ public class JoinQrcodeWorkWxOutput : BaseWorkWxOutput
{ {
get get
{ {
if (string.IsNullOrEmpty(JoinQrcode))return null; if (string.IsNullOrEmpty(JoinQrcode)) return null;
var match = Regex.Match(JoinQrcode, @"qr_size=(\d)"); var match = Regex.Match(JoinQrcode, @"qr_size=(\d)");
return match.Success ? int.Parse(match.Groups[1].Value) : null; return match.Success ? int.Parse(match.Groups[1].Value) : null;
} }

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
namespace Admin.NET.Plugin.WorkWeixin; namespace Admin.NET.Plugin.WorkWeixin;
/// <summary> /// <summary>
@ -150,7 +149,7 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
/// <returns></returns> /// <returns></returns>
public async Task<UserIdWorkWxOutput> GetUserIdByEmail(string email, int? emailType = 1) public async Task<UserIdWorkWxOutput> GetUserIdByEmail(string email, int? emailType = 1)
{ {
return await baseService.SendAsync<UserIdByEmailWorkWxInput, UserIdWorkWxOutput>(new(){ Email = email, EmailType = emailType }); return await baseService.SendAsync<UserIdByEmailWorkWxInput, UserIdWorkWxOutput>(new() { Email = email, EmailType = emailType });
} }
/// <summary> /// <summary>
@ -161,6 +160,6 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
/// <returns></returns> /// <returns></returns>
public async Task<UserIdListWorkWxOutput> GetUserIdList(string cursor = null, int? limit = 20) public async Task<UserIdListWorkWxOutput> GetUserIdList(string cursor = null, int? limit = 20)
{ {
return await baseService.SendAsync<UserIdListWorkWxInput, UserIdListWorkWxOutput>(new(){ Cursor = cursor, Limit = limit }); return await baseService.SendAsync<UserIdListWorkWxInput, UserIdListWorkWxOutput>(new() { Cursor = cursor, Limit = limit });
} }
} }

View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.08.28", "lastBuildTime": "2025.08.30",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -81,8 +81,8 @@
"vue-router": "^4.5.1", "vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.9.6", "vxe-pc-ui": "^4.9.8",
"vxe-table": "^4.16.1", "vxe-table": "^4.16.2",
"xe-utils": "^3.7.8", "xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0" "xlsx-js-style": "^1.2.0"
}, },
@ -114,7 +114,7 @@
"vite": "^7.1.3", "vite": "^7.1.3",
"vite-auto-i18n-plugin": "^1.1.7", "vite-auto-i18n-plugin": "^1.1.7",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^2.2.0", "vite-plugin-compression2": "^2.2.1",
"vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^10.2.0" "vue-eslint-parser": "^10.2.0"
}, },

View File

@ -65,10 +65,10 @@ interface MutexConfig {
const MultipleModel = { const MultipleModel = {
Array: 'array', Array: 'array',
Comma: 'comma', Comma: 'comma',
} as const } as const;
// //
type MultipleModelType = typeof MultipleModel[keyof typeof MultipleModel]; type MultipleModelType = (typeof MultipleModel)[keyof typeof MultipleModel];
/** /**
* 检查是否为合法的渲染类型 * 检查是否为合法的渲染类型
@ -94,7 +94,7 @@ function isMultipleModel(value: any): value is MultipleModelType {
<script setup lang="ts"> <script setup lang="ts">
import { reactive, watch, computed, PropType } from 'vue'; import { reactive, watch, computed, PropType } from 'vue';
import { useUserInfo } from '/@/stores/userInfo'; import { useUserInfo } from '/@/stores/userInfo';
import {Nullable} from "/@/types/global"; import { Nullable } from '/@/types/global';
const userStore = useUserInfo(); const userStore = useUserInfo();
const emit = defineEmits(['update:modelValue', 'change']); const emit = defineEmits(['update:modelValue', 'change']);
@ -308,7 +308,7 @@ const getDataList = (): DictItem[] => {
})); }));
} }
if (!props.code ) { if (!props.code) {
console.error('[g-sys-dict] code和data不能同时为空'); console.error('[g-sys-dict] code和data不能同时为空');
return []; return [];
} }

View File

@ -11,8 +11,8 @@ import { BaseAPI, BASE_PATH } from '../api-services/system/base';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { Local, Session } from '../utils/storage'; import { Local, Session } from '../utils/storage';
import {useThemeConfig} from "/@/stores/themeConfig"; import { useThemeConfig } from '/@/stores/themeConfig';
import {storeToRefs} from "pinia"; import { storeToRefs } from 'pinia';
const storesThemeConfig = useThemeConfig(); const storesThemeConfig = useThemeConfig();
const { themeConfig } = storeToRefs(storesThemeConfig); const { themeConfig } = storeToRefs(storesThemeConfig);
@ -249,4 +249,4 @@ export function getJWTDate(timestamp: number): Date {
*/ */
export function sleep(delay: number) { export function sleep(delay: number) {
return new Promise((resolve) => setTimeout(resolve, delay)); return new Promise((resolve) => setTimeout(resolve, delay));
} }