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

😎清理代码

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Application/Configuration/MessageQueue.json
View File

@ -16,8 +16,8 @@
"VirtualHost": "/"
},
//RabbitMQ消费者配置
// RabbitMQ 消费者配置
"RabbitMqConsumerOptions": {
"ConsumerCount": 1 // 消费者数量，多消费者实现多线程消费队列
"ConsumerCount": 1 // 消费者数量，多消费者实现多线程消费队列
}
}

2
Admin.NET/Admin.NET.Application/Startup.cs
View File

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

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

@ -27,7 +27,7 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<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.ObjectMapper.Mapster" Version="4.9.7.114" />
<PackageReference Include="Furion.Pure" Version="4.9.7.114" />

2
Admin.NET/Admin.NET.Core/Logging/HttpLoggingHandler.cs
View File

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

2
Admin.NET/Admin.NET.Core/RabbitMQ/RabbitMqConsumerOptions.cs
View File

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

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

@ -339,17 +339,16 @@ public class SysAuthService : IDynamicApiController, ITransient
};
}
///// <summary>
///// 获取刷新Token 🔖
///// </summary>
///// <param name="accessToken"></param>
///// <returns></returns>
//[DisplayName("获取刷新Token")]
//public string GetRefreshToken([FromQuery] string accessToken)
//{
// var refreshTokenExpire = _sysConfigService.GetRefreshTokenExpire().GetAwaiter().GetResult();
// return JWTEncryption.GenerateRefreshToken(accessToken, refreshTokenExpire);
//}
/// <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);
}
/// <summary>
/// 退出系统 🔖
@ -440,15 +439,4 @@ public class SysAuthService : IDynamicApiController, ITransient
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);
}
}

1
Admin.NET/Admin.NET.Core/Service/Log/Dto/LogHttpOutput.cs
View File

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

7
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs
View File

@ -8,11 +8,6 @@ global using Admin.NET.Core;
global using Admin.NET.Core.Service;
global using Furion;
global using Furion.DependencyInjection;
global using Furion.EventBus;
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 System.ComponentModel.DataAnnotations;
global using System.Text.Json.Serialization;
global using System.ComponentModel.DataAnnotations;

1
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Chat/WorkWxAppChatService.cs
View File

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

1
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/WorkWxDeptService.cs
View File

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

5
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Tag/WorkWxTagService.cs
View File

@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
namespace Admin.NET.Plugin.WorkWeixin;
/// <summary>
@ -39,7 +38,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
/// <returns></returns>
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>
@ -49,7 +48,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
/// <returns></returns>
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>

2
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/Dto/UserWorkWxOutput.cs
View File

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

5
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/WorkWxUserService.cs
View File

@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
namespace Admin.NET.Plugin.WorkWeixin;
/// <summary>
@ -150,7 +149,7 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
/// <returns></returns>
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>
@ -161,6 +160,6 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
/// <returns></returns>
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 });
}
}

8
Web/package.json
View File

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

8
Web/src/components/sysDict/sysDict.vue
View File

@ -65,10 +65,10 @@ interface MutexConfig {
const MultipleModel = {
Array: 'array',
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">
import { reactive, watch, computed, PropType } from 'vue';
import { useUserInfo } from '/@/stores/userInfo';
import {Nullable} from "/@/types/global";
import { Nullable } from '/@/types/global';
const userStore = useUserInfo();
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不能同时为空');
return [];
}

6
Web/src/utils/axios-utils.ts
View File

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