diff --git a/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs b/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
index 76758fde..00b0f2ae 100644
--- a/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
+++ b/Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs
@@ -158,7 +158,7 @@ namespace Tiobon.Core.Controllers
_sqlSugarClient.ChangeDatabase(ConnID.ToLower());
data.response += $"Controller层生成:{FrameSeed.CreateControllers(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
data.response += $"库{ConnID}-Model层生成:{FrameSeed.CreateModels(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
- data.response += $"库{ConnID}-IRepositorys层生成:{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
+ //data.response += $"库{ConnID}-IRepositorys层生成:{FrameSeed.CreateIRepositorys(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
data.response += $"库{ConnID}-IServices层生成:{FrameSeed.CreateIServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
data.response += $"库{ConnID}-Repository层生成:{FrameSeed.CreateRepository(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
data.response += $"库{ConnID}-Services层生成:{FrameSeed.CreateServices(_sqlSugarClient, ConnID, isMuti, tableNames)} || ";
diff --git a/Tiobon.Core.Api/Controllers/ImgController.cs b/Tiobon.Core.Api/Controllers/ImgController.cs
index 5ce38a3f..aa6f6749 100644
--- a/Tiobon.Core.Api/Controllers/ImgController.cs
+++ b/Tiobon.Core.Api/Controllers/ImgController.cs
@@ -108,7 +108,7 @@
//var memi = provider.Mappings[fileExt];
var fileName = Path.GetFileName(filepath);
- HttpContext.Response.Headers.Add("fileName", fileName);
+ HttpContext.Response.Headers.Append("fileName", fileName);
return File(stream, "application/octet-stream", fileName);
}
diff --git a/Tiobon.Core.Common/Seed/FrameSeed.cs b/Tiobon.Core.Common/Seed/FrameSeed.cs
index 4b461f2e..7aac5c52 100644
--- a/Tiobon.Core.Common/Seed/FrameSeed.cs
+++ b/Tiobon.Core.Common/Seed/FrameSeed.cs
@@ -19,7 +19,7 @@ namespace Tiobon.Core.Common.Seed
///
public static bool CreateControllers(SqlSugarScope sqlSugarClient, string ConnId = null, bool isMuti = false, string[] tableNames = null)
{
- Create_Controller_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Tiobon.Core.Api.Controllers", "Tiobon.Core.Api.Controllers", tableNames, "", isMuti);
+ Create_Controller_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Tiobon.Core.Api\Controllers", "Tiobon.Core.Api.Controllers", tableNames, "", isMuti);
return true;
}
@@ -132,22 +132,14 @@ namespace Tiobon.Core.Common.Seed
var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
.SettingClassTemplate(p => p =
-@"using Tiobon.Core.IServices;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace " + strNameSpace + @"
+@"namespace " + strNameSpace + @"
{
[Route(""api/[controller]/[action]"")]
[ApiController]
[Authorize(Permissions.Name)]
public class {ClassName}Controller : ControllerBase
{
+ #region 初始化
///
/// 服务器接口,因为是模板生成,所以首字母是大写的,自己可以重构下
///
@@ -157,14 +149,16 @@ namespace " + strNameSpace + @"
{
_{ClassName}Services = {ClassName}Services;
}
+ #endregion
+ #region 基础接口
+
+ #region 查询
[HttpGet]
public async Task>> Get(int page = 1, string key = """",int intPageSize = 50)
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
- {
key = """";
- }
Expression> whereExpression = a => true;
@@ -174,7 +168,6 @@ namespace " + strNameSpace + @"
success = true,
response = await _{ClassName}Services.QueryPage(whereExpression, page, intPageSize)
};
-
}
[HttpGet(""{id}"")]
@@ -187,7 +180,9 @@ namespace " + strNameSpace + @"
response = await _{ClassName}Services.QueryById(id)
};
}
+ #endregion
+ #region 新增
[HttpPost]
public async Task> Post([FromBody] {ClassName} request)
{
@@ -203,7 +198,9 @@ namespace " + strNameSpace + @"
return data;
}
+ #endregion
+ #region 新增
[HttpPut]
public async Task> Put([FromBody] {ClassName} request)
{
@@ -212,19 +209,21 @@ namespace " + strNameSpace + @"
if (data.success)
{
data.msg = ""更新成功"";
- data.response = request?.id.ObjToString();
+ data.response = request?.Id.ObjToString();
}
return data;
}
+ #endregion
+ #region 删除
[HttpDelete]
public async Task> Delete(int id)
{
var data = new MessageModel();
var model = await _{ClassName}Services.QueryById(id);
- model.IsDeleted = true;
- data.success = await _departmentServices.Update(model);
+ model.IsEnable = 1;
+ // data.success = await _departmentServices.Update(model);
if (data.success)
{
data.msg = ""删除成功"";
@@ -233,6 +232,9 @@ namespace " + strNameSpace + @"
return data;
}
+ #endregion
+
+ #endregion
}
}")