From 2d8aa7bebc0570b5946c4470be8e94eb7e0c108d Mon Sep 17 00:00:00 2001
From: rszn <645583145@qq.com>
Date: Tue, 18 Jun 2024 17:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/TBox/Codec/Encoder.cs            |  2 +-
 Service/TBox/MyTask/VinTask.cs           |  2 +-
 WebStarter/Controllers/CarController.cs  | 14 +++++++-------
 WebStarter/Controllers/TBoxController.cs | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Service/TBox/Codec/Encoder.cs b/Service/TBox/Codec/Encoder.cs
index 81ab7f7..f0ab00c 100644
--- a/Service/TBox/Codec/Encoder.cs
+++ b/Service/TBox/Codec/Encoder.cs
@@ -21,7 +21,7 @@ public class Encoder : MessageToByteEncoder<BaseMsg>
     {
         byte[] bytes = obj.ToBytes();
         byte[] result =
-            { 88, bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], 0, 0, 0, 0 };
+            { 0x88, bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], 0, 0, 0, 0 };
 
         Log.Info($"send={BitUtls.BytesToHexStr(result)}");
         output.WriteBytes(result);
diff --git a/Service/TBox/MyTask/VinTask.cs b/Service/TBox/MyTask/VinTask.cs
index 085902c..cd41984 100644
--- a/Service/TBox/MyTask/VinTask.cs
+++ b/Service/TBox/MyTask/VinTask.cs
@@ -8,7 +8,7 @@ namespace Service.TBox.MyTask;
 public class VinTask : ITask
 {
     public static readonly string TaskName = "VinTask";
-    private volatile bool _stop = true;
+    private volatile bool _stop = false;
 
     public string Name()
     {
diff --git a/WebStarter/Controllers/CarController.cs b/WebStarter/Controllers/CarController.cs
index 3e72a15..f21993b 100644
--- a/WebStarter/Controllers/CarController.cs
+++ b/WebStarter/Controllers/CarController.cs
@@ -25,7 +25,7 @@ public class CarController : ControllerBase{
     /// 获取车辆数据
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/getCarInfo/{carNo}")]
+    [HttpGet("getCarInfo/{carNo}")]
     public CarInfoResp? GetCarInfo(string carNo)
     {
         IoSession? ioSession = CarServerMgr.CarServer?.SessionMgr.GetSession(carNo);
@@ -59,7 +59,7 @@ public class CarController : ControllerBase{
     /// 获取车辆数据
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/getCarInfoList")]
+    [HttpGet("getCarInfoList")]
     public List<CarInfoResp> GetCarInfoList()
     {
         List<CarInfoResp> result = new List<CarInfoResp>();
@@ -96,7 +96,7 @@ public class CarController : ControllerBase{
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns></returns>
-    [HttpGet("/lock/{carNo}")]
+    [HttpGet("lock/{carNo}")]
     public bool Lock(string carNo)
     {
         Log.Info($"Lock {carNo}");
@@ -123,7 +123,7 @@ public class CarController : ControllerBase{
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns></returns>
-    [HttpGet("/unLock/{carNo}")]
+    [HttpGet("unLock/{carNo}")]
     public bool UnLock(string carNo)
     {
         Log.Info($"UnLock {carNo} ");
@@ -150,7 +150,7 @@ public class CarController : ControllerBase{
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns></returns>
-    [HttpGet("/SettleConfirm/{carNo}")]
+    [HttpGet("SettleConfirm/{carNo}")]
     public bool SettleConfirm(string carNo)
     {
         Log.Info($"SettleConfirm {carNo}");
@@ -172,7 +172,7 @@ public class CarController : ControllerBase{
     /// 设置参数
     /// </summary>
     /// <returns></returns>
-    [HttpPost("/setParam")]
+    [HttpPost("setParam")]
     public bool SetParam(SetParam setParam)
     {
         Log.Info($"SetParam  {JsonConvert.SerializeObject(setParam)}");
@@ -209,7 +209,7 @@ public class CarController : ControllerBase{
     /// 清空数据
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/clear/{carNo}")]
+    [HttpGet("clear/{carNo}")]
     public bool Clear(string carNo)
     {
         if (CarServerMgr.CarServer == null)
diff --git a/WebStarter/Controllers/TBoxController.cs b/WebStarter/Controllers/TBoxController.cs
index eb7dcd2..c76197c 100644
--- a/WebStarter/Controllers/TBoxController.cs
+++ b/WebStarter/Controllers/TBoxController.cs
@@ -19,7 +19,7 @@ public class TBoxController : ControllerBase
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns></returns>
-    [HttpGet("/TBoxConnect/{carNo}")]
+    [HttpGet("connect/{carNo}")]
     public bool Connect(string carNo)
     {
         Log.Info($"Connect {carNo}");
@@ -32,7 +32,7 @@ public class TBoxController : ControllerBase
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns>"0：未解锁未上锁  1：解锁成功  2：上锁成功  3：无效数据 其他状态无效" </returns>
-    [HttpGet("/TBoxlock/{carNo}")]
+    [HttpGet("lock/{carNo}")]
     public int Lock(string carNo)
     {
         Log.Info($"Lock {carNo}");
@@ -45,7 +45,7 @@ public class TBoxController : ControllerBase
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns>发送状态</returns>
-    [HttpGet("/TBoxUnLock/{carNo}")]
+    [HttpGet("unLock/{carNo}")]
     public int UnLock(string carNo)
     {
         Log.Info($"UnLock {carNo}");
@@ -57,7 +57,7 @@ public class TBoxController : ControllerBase
     /// 获取车辆信息
     /// </summary>
     /// <returns></returns>
-    [HttpGet("/TBoxGetCarInfo/{carNo}")]
+    [HttpGet("getCarInfo/{carNo}")]
     public TBoxInfo GetCarInfo(string carNo)
     {
         Log.Info($"DisConnect {carNo}");
@@ -89,7 +89,7 @@ public class TBoxController : ControllerBase
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns>发送状态</returns>
-    [HttpGet("/disConnect/{carNo}")]
+    [HttpGet("disConnect/{carNo}")]
     public bool DisConnect(string carNo)
     {
         Log.Info($"DisConnect {carNo}");
@@ -102,7 +102,7 @@ public class TBoxController : ControllerBase
     /// </summary>
     /// <param name="carNo">vin码</param>
     /// <returns></returns>
-    [HttpGet("/TBoxReset")]
+    [HttpGet("reset")]
     public bool Reset()
     {
         Log.Info($"Reset ");