From 8c8404c55a863844cc674a8bedb2cfdb92c1c288 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期六, 08 二月 2025 09:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into cyronghe
---
cylsg/cylsg.Application/CyOS/CyOSSettingController.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
index 8db3b42..5442385 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
@@ -1,5 +1,6 @@
锘縰sing cylsg.Model.ECTEModel;
using ECTESTOA;
+using EzCoreNet.Redis;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,10 +17,13 @@
private readonly ISqlSugarClient _client;
private readonly IOAServices _oAServices;
- public CYOSSettingController( ISqlSugarClient client,IOAServices oAServices )
+ private readonly IEzCoreNetRedisService _eZCoreNetRedisService;
+
+ public CYOSSettingController( ISqlSugarClient client,IOAServices oAServices,IEzCoreNetRedisService netRedisService )
{
_client = client.AsTenant().GetConnection("ECTESTOADB");
_oAServices = oAServices;
+ _eZCoreNetRedisService = netRedisService;
}
/// <summary>
@@ -50,6 +54,14 @@
Remark = x.Remark,
}).WithCache(3600).ToListAsync();
}
-
+ /// <summary>
+ /// 鑾峰彇娴佹按鍙�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public string GetShowID()
+ {
+ return _eZCoreNetRedisService.GetYYYMMddAnd4sn();
+ }
}
}
--
Gitblit v1.9.1