wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-08-03 17:29:05 +08:00
parent 5c0a184cdd a115aba87e
commit 3d0747ae8e
59 changed files with 3815 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/Tnb.OAuth/Dto/LoginInput.cs
View File

@@ -12,14 +12,14 @@ public class LoginInput
/// <summary>
/// 用户名.
/// </summary>
/// <example>13459475357</example>
/// <example>admin</example>
[Required(ErrorMessage = "用户名不能为空")]
public string? account { get; set; }
/// <summary>
/// 密码.
/// </summary>
/// <example>e10adc3949ba59abbe56e057f20f883e</example>
/// <example>f5252ff163e76623601a9a84d275c842</example>
[Required(ErrorMessage = "密码不能为空")]
public string? password { get; set; }

10
system/Tnb.Systems/Common/TestService.cs
View File

@@ -24,14 +24,14 @@ namespace JNPF.Systems.Common;
[Route("api")]
public class TestService : IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<UserEntity> _repository;
//private readonly ISqlSugarRepository<UserEntity> _repository;
private readonly SqlSugarScope _sugar;
private readonly IDataBaseManager _databaseService;
public TestService(ISqlSugarRepository<UserEntity> repository, IDataBaseManager databaseService)
public TestService(ISqlSugarClient db, IDataBaseManager databaseService)
{
_repository = repository;
_sugar = (SqlSugarScope)repository.AsSugarClient();
//_repository = repository;
_sugar = (SqlSugarScope)db;
_databaseService = databaseService;
}
@@ -60,7 +60,7 @@ public class TestService : IDynamicApiController, ITransient
//var xx = App.HttpContext.Request.Host.ToString();
//var sql = "SELECT TOP 1 [F_PARENTID],[F_PROCESSID],[F_ENCODE],[F_FULLNAME],[F_FLOWURGENT],[F_FLOWID],[F_FLOWCODE],[F_FLOWNAME],[F_FLOWTYPE],[F_FLOWCATEGORY],[F_FLOWFORM],[F_FLOWFORMCONTENTJSON],[F_FLOWTEMPLATEJSON],[F_FLOWVERSION],[F_STARTTIME],[F_ENDTIME],[F_THISSTEP],[F_THISSTEPID],[F_GRADE],[F_STATUS],[F_COMPLETION],[F_DESCRIPTION],[F_SORTCODE],[F_ISASYNC],[F_ISBATCH],[F_TASKNODEID],[F_TEMPLATEID],[F_REJECTDATAID],[F_DELEGATEUSER],[F_CREATORTIME],[F_CREATORUSERID],[F_ENABLEDMARK],[F_LastModifyTime],[F_LastModifyUserId],[F_DeleteMark],[F_DeleteTime],[F_DeleteUserId],[F_Id] FROM [FLOW_TASK] WHERE (( [F_DeleteMark] IS NULL ) AND ( [F_Id] = N'367536153122855173' ))";
//var darta = _sqlSugarRepository.AsSugarClient().Ado.SqlQuery<dynamic>(sql);
var data = await _repository.GetFirstAsync(a => true);
var data = await _sugar.Queryable<UserEntity>().FirstAsync(a => true);
var json = App.GetService<IJsonSerializerProvider>();
return data;
}