优化

Admin.NET/Admin.NET.Application/AppConfig.json

@@ -12,13 +12,17 @@
       }
     ]
   },
+  // 代码生成配置项-程序集名称集合
+  "CodeGen": {
+    "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ]
+  },
   "Wechat": {
-    //公众号
+    // 公众号
     "WechatAppId": "",
     "WechatAppSecret": "",
     "EncodingAESKey": "",
     "Token": "",
-    //小程序
+    // 小程序
     "WxOpenAppId": "",
     "WxOpenAppSecret": "",
     "WxOpenToken": "",
@@ -32,13 +36,9 @@
     "MerchantCertificatePrivateKey": "\\WxPayCert\\apiclient_key.pem" // 商户平台的API证书私钥(apiclient_key.pem文件内容)
   },
   "PayCallBack": {
-    "WechatPayUrl": "/notify/weChatPay/unifiedorder", //微信支付回调
-    "WechatRefundUrl": "/notify/weChatPay/refund", //微信退款回调
-    "AlipayUrl": "", //支付宝支付回调
-    "AlipayRefundUrl": "" //支付宝退款回调
-  },
-  //生成代码配置项
-  "CodeGen": {
-    "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ] //数据库实体程序集名称集合
+    "WechatPayUrl": "/notify/weChatPay/unifiedorder", // 微信支付回调
+    "WechatRefundUrl": "/notify/weChatPay/refund", // 微信退款回调
+    "AlipayUrl": "", // 支付宝支付回调
+    "AlipayRefundUrl": "" // 支付宝退款回调
   }
 }

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -211,11 +211,6 @@
             开启操作日志配置
             </summary>
         </member>
-        <member name="F:Admin.NET.Core.CommonConst.EntityAssemblyName">
-            <summary>
-            实体所在程序集-代码生成
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.SqlSugarConst">
             <summary>
             SqlSugar相关常量
@@ -2568,6 +2563,21 @@
             <param name="list"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Core.ObjectExtension.ToJson(System.Object)">
+            <summary>
+            对象序列化成Json字符串
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Admin.NET.Core.ObjectExtension.ToObject``1(System.String)">
+            <summary>
+            Json字符串反序列化成对象
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="json"></param>
+            <returns></returns>
+        </member>
         <member name="M:Admin.NET.Core.ObjectExtension.IsIgnoreColumn(System.Reflection.PropertyInfo)">
             <summary>
             排除SqlSugar忽略的列
@@ -2705,6 +2715,16 @@
             键值前缀
             </summary>
         </member>
+        <member name="T:Admin.NET.Core.CodeGenOptions">
+            <summary>
+            代码生成配置选项
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.CodeGenOptions.EntityAssemblyNames">
+            <summary>
+            数据库实体程序集名称集合
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.ConnectionStringsOptions">
             <summary>
             数据库链接配置

Admin.NET/Admin.NET.Core/Const/CommonConst.cs

@@ -29,5 +29,4 @@ public class CommonConst
     /// 开启操作日志配置
     /// </summary>
     public const string SysOpLogFlag = "sys_op_log";
-
 }

Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -103,9 +103,9 @@ public static class ObjectExtension
         }
         return result;
     }
-    
+
     /// <summary>
-    /// 对象序列化成json字符串
+    /// 对象序列化成Json字符串
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
@@ -113,9 +113,9 @@ public static class ObjectExtension
     {
         return JSON.GetJsonSerializer().Serialize(obj);
     }
-    
+
     /// <summary>
-    /// json字符串反序列化成对象
+    /// Json字符串反序列化成对象
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="json"></param>

Admin.NET/Admin.NET.Core/Option/CodeGenOptions.cs

@@ -1,14 +1,12 @@
-
-namespace Admin.NET.Core
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 代码生成配置选项
+/// </summary>
+public class CodeGenOptions : IConfigurableOptions
 {
     /// <summary>
-    /// 代码生成配置选项
+    /// 数据库实体程序集名称集合
     /// </summary>
-    public class CodeGenOptions : IConfigurableOptions
-    {
-        /// <summary>
-        /// 数据库实体程序集名称集合
-        /// </summary>
-        public List<string> EntityAssemblyNames { get; set; }
-    }
-}
+    public List<string> EntityAssemblyNames { get; set; }
+}

Admin.NET/Admin.NET.Core/Service/Common/CommonService.cs

@@ -5,7 +5,8 @@ public class CommonService : ICommonService, IScoped
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly CodeGenOptions _codeGenOptions;
 
-    public CommonService(IHttpContextAccessor httpContextAccessor, IOptions<CodeGenOptions> codeGenOptions)
+    public CommonService(IHttpContextAccessor httpContextAccessor,
+        IOptions<CodeGenOptions> codeGenOptions)
     {
         _httpContextAccessor = httpContextAccessor;
         _codeGenOptions = codeGenOptions.Value;