From 8c98a81f79bc3ee303282314a8abe5a0b906bd7f Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Thu, 14 Aug 2025 13:00:27 +0800
Subject: [PATCH] 333

---
 .../Controllers/Business/OdfPortsController.cs         |  5 ++---
 ZR.Admin.WebApi/appsettings.json                       | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
index ac75146..f1bf293 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
@@ -199,10 +199,9 @@ namespace ZR.Admin.WebApi.Controllers.Business
             {
                 it.RoomName,
                 it.RoomAddress,
-                it.Remarks,
+                Remarks = string.IsNullOrEmpty(it.Remarks) ? "" : it.Remarks,
                 it.DeptName
             }).ToListAsync();
-
             var predicate = Expressionable.Create<OdfPorts>();
             var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(dto);
             var roomId = list.Result.Select(it => it.RoomId).Distinct();
@@ -216,7 +215,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                 }
                 //roomList
             });
-            return SUCCESS(new { Rooms = list, Ports = list });
+            return SUCCESS(new { Rooms = room, Ports = list });
         }
 
 
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 63a6353..4ec8895 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -25,11 +25,11 @@
   "urls": "http://*:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
   "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
   "JwtSettings": {
-    "Issuer": "OpticalCableAdmin", //即token的签发者。
-    "Audience": "OpticalCableAdmin", //指该token是服务于哪个群体的（群体范围）
-    "SecretKey": "SecretKey-ZRADMIN.NET-202311281883831",
-    "Expire": 144000, //jwt登录过期时间（分）
-    "RefreshTokenTime": 7200, //分钟
+    "Issuer": "giftclaim.NET", //即token的签发者。
+    "Audience": "giftclaim.NET", //指该token是服务于哪个群体的（群体范围）
+    "SecretKey": "SecretKey-giftclaim.NET-202508011883838",
+    "Expire": 1440, //jwt登录过期时间（分）
+    "RefreshTokenTime": 30, //分钟
     "TokenType": "Bearer"
   },
   "MainDb": "0", // 多租户主库配置ID