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

合并冲突

Browse Source
This commit is contained in:
DEVICE8\12494
2023-03-30 16:21:49 +08:00
parent a6cbcc59d6 0a6fba29cd
commit f1e9e5a113
8 changed files with 81 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
system/Tnb.Systems/Common/HeartbeatService.cs Normal file
View File

@@ -0,0 +1,35 @@
using System.Data;
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Extras.Thirdparty.JSEngine;
using JNPF.JsonSerialization;
using JNPF.Logging.Attributes;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.TaskScheduler;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
namespace JNPF.Systems.Common;
/// <summary>
/// 测试接口.
/// </summary>
[ApiDescriptionSettings(Name = "Test", Order = 900)]
[Route("api")]
public class HeartbeatService : IDynamicApiController, ITransient
{
[HttpGet("heartbeat")]
[AllowAnonymous]
[IgnoreLog]
public string Heartbeat()
{
return DateTime.Now.ToString();
}
}

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

@@ -8,6 +8,7 @@ using JNPF.Extras.Thirdparty.JSEngine;
using JNPF.JsonSerialization;
using JNPF.Logging.Attributes;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.TaskScheduler;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
@@ -69,11 +70,11 @@ public class TestService : IDynamicApiController, ITransient
}
}
public void xx(UserEntity user)
{
user.Account = "2312321";
public void xx(UserEntity user)
{
user.Account = "2312321";
}
}
public void xx1(UserEntity user)
{