From 5a61ba41ba34e7b10f172f0c0a84e5cb0e69c9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= Date: Thu, 17 Jul 2025 10:25:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?token=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DroneDocking/Response/DroneDockRes.cs | 56 +++++++++++++++++++ .../Domain/DroneDocktaskdetail.cs | 3 +- .../ServiceControllers/DroneDockController.cs | 34 +++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs diff --git a/OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs b/OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs new file mode 100644 index 0000000..1983d94 --- /dev/null +++ b/OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs @@ -0,0 +1,56 @@ +using OpenAuth.Repository.Domain; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.App.ServiceApp.DroneDocking.Response +{ + public class DroneDockRes + { + public string id { get; set; } + + /// + /// Desc:无人机机场设备唯一id（多个） + /// Default: + /// Nullable:True + /// + public string deviceid { get; set; } + + /// + /// Desc:业务类型，用于标识数据来源 + /// Default: + /// Nullable:False + /// + public string bizidname { get; set; } + + /// + /// Desc:下发任务名称 + /// Default: + /// Nullable:True + /// + public string taskname { get; set; } + + /// + /// Desc:下发任务id + /// Default: + /// Nullable:True + /// + public string taskid { get; set; } + + /// + /// Desc:数据类型， 用于后续成果上传获取上传路径 + /// Default: + /// Nullable:False + /// + public string datacode { get; set; } + /// + /// 任务是否开始执行（0未开始，1已开始，2已完成，3已取消） + /// + public int state { get; set; } + + public DateTime? createtime { get; set; } + public List tasklist { get; set; } + } +} diff --git a/OpenAuth.Repository/Domain/DroneDocktaskdetail.cs b/OpenAuth.Repository/Domain/DroneDocktaskdetail.cs index 9710d19..691893f 100644 --- a/OpenAuth.Repository/Domain/DroneDocktaskdetail.cs +++ b/OpenAuth.Repository/Domain/DroneDocktaskdetail.cs @@ -92,6 +92,7 @@ namespace OpenAuth.Repository.Domain /// Nullable:True /// public string taskid {get;set;} - + //飞行任务id + public string flighttaskid { get;set;} } } diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs index 6511bd9..8caf13b 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs @@ -403,5 +403,39 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers } } + + /// + /// 校验token + /// + /// + /// + [HttpGet] + [AllowAnonymous] + public Response VerifyToken(string token) + { + Response result= new Response(); + try + { + var tokenflag = _helper.Verify(token); + if (tokenflag) + { + result.Message = "校验成功"; + result.Result = true; + } + else + { + result.Message = "校验失败"; + result.Result = false; + result.Code = 500; + } + return result ; + } + catch (Exception ex) + { + result.Code = 500; + result.Message = "error"; + return result; + } + } } } From bb05da2b14664b3f265a9be6a768933e07856c88 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 17 Jul 2025 10:28:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/Cache/RedisCacheContext.cs | 2 +- OpenAuth.WebApi/appsettings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Infrastructure/Cache/RedisCacheContext.cs b/Infrastructure/Cache/RedisCacheContext.cs index 1374eec..e7ef8e0 100644 --- a/Infrastructure/Cache/RedisCacheContext.cs +++ b/Infrastructure/Cache/RedisCacheContext.cs @@ -16,7 +16,7 @@ namespace Infrastructure.Cache { _conn = ConnectionMultiplexer.Connect(options.Value.RedisConf.Conn); iDatabase = _conn.GetDatabase(options.Value.RedisConf.Database); - server = _conn.GetServer("175.27.168.120:6050"); + server = _conn.GetServer("123.132.248.154:9253"); } public override T Get(string key) diff --git a/OpenAuth.WebApi/appsettings.json b/OpenAuth.WebApi/appsettings.json index 38f542e..e8f371d 100644 --- a/OpenAuth.WebApi/appsettings.json +++ b/OpenAuth.WebApi/appsettings.json @@ -22,7 +22,7 @@ "UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录 "RedisConf": { - "Conn": "175.27.168.120:6050,password=HopetryRedis1406", + "Conn": "123.132.248.154:9253,password=HopetryRedis1406", //"Conn": "127.0.0.1:6379,password=123456", "Database": 7 }, From 5e5602ddf34c8d32a0bd4e6a4be02013dc7f6152 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 17 Jul 2025 10:29:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.WebApi/appsettings.Production.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAuth.WebApi/appsettings.Production.json b/OpenAuth.WebApi/appsettings.Production.json index 0fca663..6367e51 100644 --- a/OpenAuth.WebApi/appsettings.Production.json +++ b/OpenAuth.WebApi/appsettings.Production.json @@ -18,7 +18,7 @@ }, "UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录 "RedisConf": { - "Conn": "175.27.168.120:6050,password=HopetryRedis1406", + "Conn": "123.132.248.154:9253,password=HopetryRedis1406", "Database": 1 }, //redis配置 "HttpHost": "http://*:10010 ", //启动绑定地址及端口