😎1、修复swagger登录错误 2、代码调整优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.3.17" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.3.17" />
-    <PackageReference Include="Furion.Pure" Version="4.9.3.17" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.3.18" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.3.18" />
+    <PackageReference Include="Furion.Pure" Version="4.9.3.18" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -6,6 +6,7 @@
 
 using Furion.SpecificationDocument;
 using Lazy.Captcha.Core;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionRequest.Types;
 
 namespace Admin.NET.Core.Service;
 
@@ -370,7 +371,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     {
         try
         {
-            _sysCacheService.Set(CommonConst.SysCaptcha, false);
+            _sysCacheService.Set($"{CacheConst.KeyConfig}{CommonConst.SysCaptcha}", false);
 
             await Login(new LoginInput
             {
@@ -378,7 +379,7 @@ public class SysAuthService : IDynamicApiController, ITransient
                 Password = CryptogramUtil.SM2Encrypt(auth.Password),
             });
 
-            _sysCacheService.Remove(CommonConst.SysCaptcha);
+            _sysCacheService.Remove($"{CacheConst.KeyConfig}{CommonConst.SysCaptcha}");
 
             return 200;
         }

Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rezero.Api" Version="1.5.15" />
+    <PackageReference Include="Rezero.Api" Version="1.5.16" />
   </ItemGroup>  
 
   <ItemGroup>

Web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "admin.net",
-    "type": "module",
+	"type": "module",
 	"version": "2.4.33",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",

Web/src/api-services/apis/sys-code-gen-api.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
- * 所有接口
+ * Admin.NET 通用权限开发平台
  * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
  *
  * OpenAPI spec version: 1.0.0
@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+
 import globalAxios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
 import { Configuration } from '../configuration';
 // Some imports not used depending on template conditions
@@ -55,6 +56,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -95,6 +103,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -143,6 +158,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -179,6 +201,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -216,6 +245,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -261,6 +297,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -302,6 +345,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -343,6 +393,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -384,6 +441,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -430,6 +494,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -467,6 +538,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

Web/src/api-services/models/admin-result-dictionary-string-string.ts

@@ -0,0 +1,70 @@
+/* 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 AdminResultDictionaryStringString
+ */
+export interface AdminResultDictionaryStringString {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminResultDictionaryStringString
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminResultDictionaryStringString
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminResultDictionaryStringString
+     */
+    message?: string | null;
+
+    /**
+     * 数据
+     *
+     * @type {{ [key: string]: string; }}
+     * @memberof AdminResultDictionaryStringString
+     */
+    result?: { [key: string]: string; } | null;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminResultDictionaryStringString
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminResultDictionaryStringString
+     */
+    time?: Date;
+}

Web/src/api-services/models/index.ts

@@ -21,6 +21,7 @@ export * from './add-user-input';
 export * from './admin-result-boolean';
 export * from './admin-result-data-set';
 export * from './admin-result-data-table';
+export * from './admin-result-dictionary-string-string';
 export * from './admin-result-iaction-result';
 export * from './admin-result-int32';
 export * from './admin-result-int64';

Web/src/api-services/models/sql-sugar-paged-list-approval-flow-output.ts

@@ -1,63 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * 所有接口
- * 让 .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 { ApprovalFlowOutput } from './approval-flow-output';
-/**
- * 分页泛型集合
- * @export
- * @interface SqlSugarPagedListApprovalFlowOutput
- */
-export interface SqlSugarPagedListApprovalFlowOutput {
-    /**
-     * 页码
-     * @type {number}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    page?: number;
-    /**
-     * 页容量
-     * @type {number}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    pageSize?: number;
-    /**
-     * 总条数
-     * @type {number}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    total?: number;
-    /**
-     * 总页数
-     * @type {number}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    totalPages?: number;
-    /**
-     * 当前页集合
-     * @type {Array<ApprovalFlowOutput>}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    items?: Array<ApprovalFlowOutput> | null;
-    /**
-     * 是否有上一页
-     * @type {boolean}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    hasPrevPage?: boolean;
-    /**
-     * 是否有下一页
-     * @type {boolean}
-     * @memberof SqlSugarPagedListApprovalFlowOutput
-     */
-    hasNextPage?: boolean;
-}

Web/src/views/system/codeGen/component/previewDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-codeGenPreview-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="90vw">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -45,9 +45,9 @@ const props = defineProps({
 const monacoEditorRef = ref();
 const state = reactive({
 	isShowDialog: false,
-	options: [], //分段器的选项
+	options: [] as any, //分段器的选项
 	current: '', // 选中的分段
-	codes: [], //预览的代码
+	codes: [] as any, //预览的代码
 });
 
 // 防止 monaco 报黄

Web/src/views/system/codeGen/index.vue

@@ -38,7 +38,7 @@
 						<el-tag type="danger" v-else> 生成到本项目 </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="200" fixed="right" align="center" show-overflow-tooltip>
+				<el-table-column label="操作" width="240" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button size="small" text type="primary" @click="handleGenerate(scope.row)">开始生成</el-button>
 						<el-button size="small" text type="primary" @click="handlePreview(scope.row)">预览</el-button>
@@ -198,7 +198,7 @@ const handleGenerate = (row: any) => {
 
 // 预览代码
 const handlePreview = (row: any) => {
-	state.editMenuTitle = '预览';
+	state.editMenuTitle = '预览代码';
 	PreviewRef.value?.openDialog(row);
 };
 </script>