Browse Source

😉细节小调整

zuohuaijun 3 years ago
parent
commit
a27af224c3

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,8 +20,8 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.2" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.2" />
     <PackageReference Include="Furion.Pure" Version="4.8.7" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.1" />
@@ -29,7 +29,7 @@
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.14" />
     <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="NewLife.Redis" Version="5.1.2023.214-beta0217" />
+    <PackageReference Include="NewLife.Redis" Version="5.2.2023.301" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.15.2" />

+ 3 - 0
Admin.NET/Admin.NET.Core/Job/DynamicJobCompiler.cs

@@ -12,6 +12,9 @@ public class DynamicJobCompiler : ISingleton
     /// <returns></returns>
     public Type BuildJob(string script)
     {
+        // 初始化
+        NatashaInitializer.Preheating();
+
         // 动态创建作业
         var builder = new AssemblyCSharpBuilder("Admin.NET.Core")
         {

+ 7 - 9
Admin.NET/Admin.NET.Core/Service/BaseService.cs

@@ -18,9 +18,8 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Detail")]
     [DisplayName("获取实体详情")]
-    public async Task<TEntity> GetDetail(long id)
+    public virtual async Task<TEntity> GetDetail(long id)
     {
         return await _rep.GetByIdAsync(id);
     }
@@ -29,7 +28,6 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// 获取实体集合
     /// </summary>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "List")]
     [DisplayName("获取实体集合")]
     public async Task<List<TEntity>> GetList()
     {
@@ -53,9 +51,9 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Add")]
+    [ApiDescriptionSettings(Name = "Add"), HttpPost]
     [DisplayName("增加实体")]
-    public async Task<bool> Add(TEntity entity)
+    public virtual async Task<bool> Add(TEntity entity)
     {
         return await _rep.InsertAsync(entity);
     }
@@ -65,9 +63,9 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// </summary>
     /// <param name="entity"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Update")]
+    [ApiDescriptionSettings(Name = "Update"), HttpPost]
     [DisplayName("更新实体")]
-    public async Task<bool> Update(TEntity entity)
+    public virtual async Task<bool> Update(TEntity entity)
     {
         return await _rep.UpdateAsync(entity);
     }
@@ -77,9 +75,9 @@ public class BaseService<TEntity> : IDynamicApiController where TEntity : class,
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Delete")]
+    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
     [DisplayName("删除实体")]
-    public async Task<bool> Delete(long id)
+    public virtual async Task<bool> Delete(long id)
     {
         return await _rep.DeleteByIdAsync(id);
     }

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -162,7 +162,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [DisplayName("根据表名获取列集合")]
-    public  List<ColumnOuput> GetColumnListByTableName([Required] string tableName, string configId = SqlSugarConst.ConfigId)
+    public List<ColumnOuput> GetColumnListByTableName([Required] string tableName, string configId = SqlSugarConst.ConfigId)
     {
         // 切库---多库代码生成用
         var provider = _db.AsTenant().GetConnectionScope(configId);
@@ -179,7 +179,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             ColumnKey = u.IsPrimarykey.ToString(),
             DataType = u.DataType.ToString(),
             NetType = CodeGenUtil.ConvertDataType(u),
-            ColumnComment = u.ColumnDescription            
+            ColumnComment = u.ColumnDescription
         }).ToList();
     }
 

+ 1 - 4
Admin.NET/Admin.NET.Core/Service/Common/CommonService.cs

@@ -71,10 +71,7 @@ public class CommonService : ICommonService, IScoped
     /// <returns></returns>
     public string GetHost()
     {
-         var localhost=$"{_httpContextAccessor.HttpContext.Request.Scheme}://{_httpContextAccessor.HttpContext.Request.Host.Value}";
-        // 20230301 skywolf627 返回文件外链  使用服务的域名 
-        //if(_httpContextAccessor.HttpContext.Request.Headers.Referer.Count>0)
-        //    localhost = _httpContextAccessor.HttpContext.Request.Headers.Referer[0].TrimEnd('/');
+        var localhost = $"{_httpContextAccessor.HttpContext.Request.Scheme}://{_httpContextAccessor.HttpContext.Request.Host.Value}";
         return localhost;
     }
 

+ 2 - 2
Admin.NET/Admin.NET.Core/Util/BasePageInput.cs

@@ -9,14 +9,14 @@ public class BasePageInput
     /// 当前页码
     /// </summary>
     [DataValidation(ValidationTypes.Numeric)]
-    public virtual int Page { get; set; }
+    public virtual int Page { get; set; } = 1;
 
     /// <summary>
     /// 页码容量
     /// </summary>
     [Range(0, 100, ErrorMessage = "页码容量超过最大限制")]
     [DataValidation(ValidationTypes.Numeric)]
-    public virtual int PageSize { get; set; }
+    public virtual int PageSize { get; set; } = 20;
 
     /// <summary>
     /// 排序字段

+ 0 - 3
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -186,9 +186,6 @@ public class Startup : AppStartup
 
         // 验证码
         services.AddLazyCaptcha();
-
-        // 动态编译预热
-        NatashaInitializer.Preheating();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)