Skip to content

Commit

Permalink
ITokenSetting
Browse files Browse the repository at this point in the history
  • Loading branch information
nnhy committed Oct 23, 2024
1 parent 50da3e6 commit e8785cd
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
5 changes: 3 additions & 2 deletions Samples/IoTZero/Services/DeviceOnlineService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using IoT.Data;
using NewLife;
using NewLife.Log;
using NewLife.Remoting.Extensions.Models;
using NewLife.Remoting.Extensions.Services;
using NewLife.Threading;

Expand All @@ -12,7 +13,7 @@ public class DeviceOnlineService : IHostedService
#region 属性
private TimerX _timer;
private readonly IDeviceService _deviceService;
private readonly IoTSetting _setting;
private readonly ITokenSetting _setting;
private readonly ITracer _tracer;
#endregion

Expand All @@ -23,7 +24,7 @@ public class DeviceOnlineService : IHostedService
/// <param name="deviceService"></param>
/// <param name="setting"></param>
/// <param name="tracer"></param>
public DeviceOnlineService(IDeviceService deviceService, IoTSetting setting, ITracer tracer)
public DeviceOnlineService(IDeviceService deviceService, ITokenSetting setting, ITracer tracer)
{
_deviceService = deviceService;
_setting = setting;
Expand Down
7 changes: 4 additions & 3 deletions Samples/IoTZero/Services/MyDeviceService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using NewLife.IoT.Models;
using NewLife.Log;
using NewLife.Remoting;
using NewLife.Remoting.Extensions.Models;
using NewLife.Remoting.Extensions.Services;
using NewLife.Remoting.Models;
using NewLife.Security;
Expand All @@ -20,7 +21,7 @@ public class MyDeviceService : IDeviceService
private readonly ICacheProvider _cacheProvider;
private readonly ICache _cache;
private readonly IPasswordProvider _passwordProvider;
private readonly IoTSetting _setting;
private readonly ITokenSetting _setting;
private readonly ITracer _tracer;

/// <summary>
Expand All @@ -30,7 +31,7 @@ public class MyDeviceService : IDeviceService
/// <param name="cacheProvider"></param>
/// <param name="setting"></param>
/// <param name="tracer"></param>
public MyDeviceService(IPasswordProvider passwordProvider, ICacheProvider cacheProvider, IoTSetting setting, ITracer tracer)
public MyDeviceService(IPasswordProvider passwordProvider, ICacheProvider cacheProvider, ITokenSetting setting, ITracer tracer)
{
_passwordProvider = passwordProvider;
_cacheProvider = cacheProvider;
Expand Down Expand Up @@ -367,7 +368,7 @@ public IProducerConsumer<String> GetQueue(String deviceCode)
/// <param name="name"></param>
/// <param name="set"></param>
/// <returns></returns>
public TokenModel IssueToken(String name, IoTSetting set)
public TokenModel IssueToken(String name, ITokenSetting set)
{
// 颁发令牌
var ss = set.TokenSecret.Split(':');
Expand Down
5 changes: 3 additions & 2 deletions Samples/IoTZero/Services/ThingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using NewLife.Data;
using NewLife.IoT.ThingModels;
using NewLife.Log;
using NewLife.Remoting.Extensions.Models;
using NewLife.Remoting.Extensions.Services;
using NewLife.Security;

Expand All @@ -16,7 +17,7 @@ public class ThingService
private readonly QueueService _queueService;
private readonly IDeviceService _deviceService;
private readonly ICacheProvider _cacheProvider;
private readonly IoTSetting _setting;
private readonly ITokenSetting _setting;
private readonly ITracer _tracer;
static Snowflake _snowflake = new();

Expand All @@ -29,7 +30,7 @@ public class ThingService
/// <param name="cacheProvider"></param>
/// <param name="setting"></param>
/// <param name="tracer"></param>
public ThingService(DataService dataService, QueueService queueService, IDeviceService deviceService, ICacheProvider cacheProvider, IoTSetting setting, ITracer tracer)
public ThingService(DataService dataService, QueueService queueService, IDeviceService deviceService, ICacheProvider cacheProvider, ITokenSetting setting, ITracer tracer)
{
_dataService = dataService;
_queueService = queueService;
Expand Down
5 changes: 3 additions & 2 deletions Samples/ZeroServer/Services/NodeOnlineService.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using NewLife;
using NewLife.Log;
using NewLife.Remoting.Extensions.Models;
using NewLife.Remoting.Extensions.Services;
using NewLife.Threading;
using Zero.Data.Nodes;
Expand All @@ -12,7 +13,7 @@ public class NodeOnlineService : IHostedService
#region 属性
private TimerX _timer;
private readonly IDeviceService _nodeService;
private readonly IoTSetting _setting;
private readonly ITokenSetting _setting;
private readonly ITracer _tracer;
#endregion

Expand All @@ -23,7 +24,7 @@ public class NodeOnlineService : IHostedService
/// <param name="nodeService"></param>
/// <param name="setting"></param>
/// <param name="tracer"></param>
public NodeOnlineService(IDeviceService nodeService, IoTSetting setting, ITracer tracer)
public NodeOnlineService(IDeviceService nodeService, ITokenSetting setting, ITracer tracer)
{
_nodeService = nodeService;
_setting = setting;
Expand Down
7 changes: 4 additions & 3 deletions Samples/ZeroServer/Services/NodeService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using NewLife.Caching.Queues;
using NewLife.Log;
using NewLife.Remoting;
using NewLife.Remoting.Extensions.Models;
using NewLife.Remoting.Extensions.Services;
using NewLife.Remoting.Models;
using NewLife.Security;
Expand All @@ -21,7 +22,7 @@ public class NodeService : IDeviceService
private readonly ICacheProvider _cacheProvider;
private readonly ICache _cache;
private readonly IPasswordProvider _passwordProvider;
private readonly IoTSetting _setting;
private readonly ITokenSetting _setting;
private readonly ITracer _tracer;

/// <summary>
Expand All @@ -31,7 +32,7 @@ public class NodeService : IDeviceService
/// <param name="cacheProvider"></param>
/// <param name="setting"></param>
/// <param name="tracer"></param>
public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvider, IoTSetting setting, ITracer tracer)
public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvider, ITokenSetting setting, ITracer tracer)
{
_passwordProvider = passwordProvider;
_cacheProvider = cacheProvider;
Expand Down Expand Up @@ -329,7 +330,7 @@ public IUpgradeInfo Upgrade(IDeviceModel device, String channel, String ip)
/// <param name="name"></param>
/// <param name="set"></param>
/// <returns></returns>
public TokenModel IssueToken(String name, IoTSetting set)
public TokenModel IssueToken(String name, ITokenSetting set)
{
// 颁发令牌
var ss = set.TokenSecret.Split(':');
Expand Down

0 comments on commit e8785cd

Please sign in to comment.