diff --git a/Infrastructure/Cache/RedisCacheContext.cs b/Infrastructure/Cache/RedisCacheContext.cs
index 5c2033e..5939a43 100644
--- a/Infrastructure/Cache/RedisCacheContext.cs
+++ b/Infrastructure/Cache/RedisCacheContext.cs
@@ -177,7 +177,6 @@ namespace Infrastructure.Cache
{
return server.Keys(pattern: new RedisValue(pattern));
}
-
///
/// HSET - 异步设置哈希表中的多个字段。
///
@@ -188,7 +187,6 @@ namespace Infrastructure.Cache
{
iDatabase.HashSetAsync(key, hashFields, CommandFlags.None);
}
-
///
/// HGETALL - 异步获取哈希表中的所有字段和值。
///
@@ -197,9 +195,8 @@ namespace Infrastructure.Cache
///
public Task HashGetAllAsync(RedisKey key, CommandFlags flags = CommandFlags.None)
{
- return iDatabase.HashGetAllAsync(key, CommandFlags.None);
+ return iDatabase.HashGetAllAsync(key, CommandFlags.None);
}
-
///
/// Returns all the members of the set value stored at key
///
@@ -210,12 +207,10 @@ namespace Infrastructure.Cache
{
return iDatabase.SetMembersAsync(key, CommandFlags.None);
}
-
public Task SetAddAsync(RedisKey key, RedisValue value, CommandFlags flags = CommandFlags.None)
{
return iDatabase.SetAddAsync(key, value, CommandFlags.None);
}
-
public Task SetRemoveAsync(RedisKey key, RedisValue value, CommandFlags flags = CommandFlags.None)
{
return iDatabase.SetRemoveAsync(key, value, CommandFlags.None);
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;
+ }
+ }
}
}
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 ", //启动绑定地址及端口
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
},