Skip to content

Commit 70dd446

Browse files
committed
refactor(Time): 替换 DateTime.Now/UtcNow 为 GetNow/GetUtcNow 方法调用
统一通过 GetNow 和 GetUtcNow 方法获取当前时间,以提高代码的可维护性和未来扩展性,便于统一管理时间源和可能的时区或测试需求。
1 parent 7f08903 commit 70dd446

8 files changed

Lines changed: 26 additions & 25 deletions

File tree

GameFrameX.Foundation.Utility/Time/TimerHelper.Current.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public partial class TimerHelper
4646
/// </remarks>
4747
public static string CurrentTimeWithUtcFullString()
4848
{
49-
return DateTime.UtcNow.ToString("HHmmss");
49+
return GetUtcNow().ToString("HHmmss");
5050
}
5151

5252
/// <summary>
@@ -62,7 +62,7 @@ public static string CurrentTimeWithUtcFullString()
6262
/// </remarks>
6363
public static string CurrentTimeWithLocalFullString()
6464
{
65-
return DateTime.Now.ToString("HHmmss");
65+
return GetNow().ToString("HHmmss");
6666
}
6767

6868
/// <summary>
@@ -111,7 +111,7 @@ public static int CurrentTimeWithLocalTime()
111111
/// </remarks>
112112
public static string CurrentDateTimeWithFormat(string format = "yyyy-MM-dd HH:mm:ss.fff K")
113113
{
114-
return DateTime.Now.ToString(format);
114+
return GetNow().ToString(format);
115115
}
116116

117117
/// <summary>
@@ -128,7 +128,7 @@ public static string CurrentDateTimeWithFormat(string format = "yyyy-MM-dd HH:mm
128128
/// </remarks>
129129
public static string CurrentDateTimeWithUtcFormat(string format = "yyyy-MM-dd HH:mm:ss.fff K")
130130
{
131-
return DateTime.UtcNow.ToString(format);
131+
return GetUtcNow().ToString(format);
132132
}
133133

134134
/// <summary>

GameFrameX.Foundation.Utility/Time/TimerHelper.Day.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public static bool IsSameDay(DateTime time1, DateTime time2)
328328
/// </remarks>
329329
public static int CurrentDateWithUtcDay()
330330
{
331-
return Convert.ToInt32(DateTime.UtcNow.ToString("yyyyMMdd"));
331+
return Convert.ToInt32(GetUtcNow().ToString("yyyyMMdd"));
332332
}
333333

334334
/// <summary>
@@ -357,7 +357,7 @@ public static double GetDaysDifference(DateTime startTime, DateTime endTime)
357357
/// <returns>跨越的天数。</returns>
358358
public static int GetCrossDays(DateTime startTime, int hour = 0)
359359
{
360-
return GetCrossDays(startTime, DateTime.UtcNow, hour);
360+
return GetCrossDays(startTime, GetUtcNow(), hour);
361361
}
362362

363363
/// <summary>
@@ -368,7 +368,7 @@ public static int GetCrossDays(DateTime startTime, int hour = 0)
368368
/// <returns>跨越的天数。</returns>
369369
public static int GetCrossLocalDays(DateTime startTime, int hour = 0)
370370
{
371-
return GetCrossDays(startTime, DateTime.Now, hour);
371+
return GetCrossDays(startTime, GetNow(), hour);
372372
}
373373

374374
/// <summary>
@@ -451,6 +451,6 @@ public static int GetCrossLocalDays(long startTimestamp, long endTimestamp)
451451
/// </remarks>
452452
public static int CurrentDateWithDay()
453453
{
454-
return Convert.ToInt32(DateTime.Now.ToString("yyyyMMdd"));
454+
return Convert.ToInt32(GetNow().ToString("yyyyMMdd"));
455455
}
456456
}

GameFrameX.Foundation.Utility/Time/TimerHelper.Difference.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static TimeSpan GetTimeDifferenceMs(long startTimestampMs, long endTimest
104104
/// </remarks>
105105
public static TimeSpan GetTimeDifferenceFromNow(DateTime time, bool useUtc = false)
106106
{
107-
var now = useUtc ? DateTime.UtcNow : DateTime.Now;
107+
var now = useUtc ? GetUtcNow() : GetNow();
108108
return now - time;
109109
}
110110

@@ -260,7 +260,7 @@ public static long GetMillisecondsDifference(long startTimestampMs, long endTime
260260
/// </remarks>
261261
public static long GetElapsedSeconds(DateTime time, bool useUtc = false)
262262
{
263-
var now = useUtc ? DateTime.UtcNow : DateTime.Now;
263+
var now = useUtc ? GetUtcNow() : GetNow();
264264
return (long)(now - time).TotalSeconds;
265265
}
266266

GameFrameX.Foundation.Utility/Time/TimerHelper.Month.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ public static DateTime GetNextMonthStartTime()
171171
/// </remarks>
172172
public static DateTime GetMonthStartTime()
173173
{
174-
return new DateTime(DateTime.UtcNow.Year, DateTime.UtcNow.Month, 1);
174+
var utcNow = GetUtcNow();
175+
return new DateTime(utcNow.Year, utcNow.Month, 1);
175176
}
176177

177178
/// <summary>

GameFrameX.Foundation.Utility/Time/TimerHelper.TimeOffset.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static void ResetTimeOffset()
8787
/// </remarks>
8888
public static long UnixTimeSecondsWithOffset()
8989
{
90-
return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds() + TimeOffsetSeconds;
90+
return new DateTimeOffset(GetUtcNow()).ToUnixTimeSeconds() + TimeOffsetSeconds;
9191
}
9292

9393
/// <summary>
@@ -103,7 +103,7 @@ public static long UnixTimeSecondsWithOffset()
103103
/// </remarks>
104104
public static long UnixTimeMillisecondsWithOffset()
105105
{
106-
return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds() + TimeOffsetMilliseconds;
106+
return new DateTimeOffset(GetUtcNow()).ToUnixTimeMilliseconds() + TimeOffsetMilliseconds;
107107
}
108108

109109
/// <summary>
@@ -119,7 +119,7 @@ public static long UnixTimeMillisecondsWithOffset()
119119
/// </remarks>
120120
public static long TimeSecondsWithOffset()
121121
{
122-
return new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds() + TimeOffsetSeconds;
122+
return new DateTimeOffset(GetNow()).ToUnixTimeSeconds() + TimeOffsetSeconds;
123123
}
124124

125125
/// <summary>
@@ -135,6 +135,6 @@ public static long TimeSecondsWithOffset()
135135
/// </remarks>
136136
public static long TimeMillisecondsWithOffset()
137137
{
138-
return new DateTimeOffset(DateTime.Now).ToUnixTimeMilliseconds() + TimeOffsetMilliseconds;
138+
return new DateTimeOffset(GetNow()).ToUnixTimeMilliseconds() + TimeOffsetMilliseconds;
139139
}
140140
}

GameFrameX.Foundation.Utility/Time/TimerHelper.Week.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static bool IsNowSameWeek(long ticks)
6060
/// </remarks>
6161
public static bool IsNowSameWeek(DateTime start)
6262
{
63-
return IsSameWeek(start, DateTime.Now);
63+
return IsSameWeek(start, GetNow());
6464
}
6565

6666
/// <summary>
@@ -107,7 +107,7 @@ public static bool IsSameWeek(DateTime start, DateTime end)
107107
/// </remarks>
108108
public static bool IsNowSameWeekUtc(DateTime start)
109109
{
110-
return IsSameWeek(start, DateTime.UtcNow);
110+
return IsSameWeek(start, GetUtcNow());
111111
}
112112

113113
/// <summary>
@@ -195,7 +195,7 @@ public static DateTime GetDayOfWeekTime(DateTime dateTime, DayOfWeek day)
195195
/// </remarks>
196196
public static DateTime GetDayOfWeekTime(DayOfWeek day)
197197
{
198-
return GetDayOfWeekTime(DateTime.UtcNow, day);
198+
return GetDayOfWeekTime(GetUtcNow(), day);
199199
}
200200

201201
/// <summary>
@@ -232,7 +232,7 @@ public static int GetChinaDayOfWeek(DayOfWeek day)
232232
/// </remarks>
233233
public static int GetChinaDayOfWeek()
234234
{
235-
return GetChinaDayOfWeek(DateTime.Now.DayOfWeek);
235+
return GetChinaDayOfWeek(GetNow().DayOfWeek);
236236
}
237237

238238
/// <summary>
@@ -248,7 +248,7 @@ public static int GetChinaDayOfWeek()
248248
/// </remarks>
249249
public static DateTime GetWeekStartTime()
250250
{
251-
var now = DateTime.Now;
251+
var now = GetNow();
252252
var dayOfWeek = (int)now.DayOfWeek;
253253
dayOfWeek = dayOfWeek == 0 ? 7 : dayOfWeek;
254254
return now.AddDays(1 - dayOfWeek).Date;

GameFrameX.Foundation.Utility/Time/TimerHelper.Year.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public partial class TimerHelper
5353
/// </remarks>
5454
public static DateTime GetYearStartTime()
5555
{
56-
return new DateTime(DateTime.UtcNow.Year, 1, 1);
56+
return new DateTime(GetUtcNow().Year, 1, 1);
5757
}
5858

5959
/// <summary>

GameFrameX.Foundation.Utility/Time/TimerHelper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public partial class TimerHelper
8181
/// <seealso cref="UnixTimeMilliseconds"/>
8282
public static long UnixTimeSeconds()
8383
{
84-
return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
84+
return new DateTimeOffset(GetUtcNow()).ToUnixTimeSeconds();
8585
}
8686

8787
/// <summary>
@@ -103,7 +103,7 @@ public static long UnixTimeSeconds()
103103
/// <seealso cref="UnixTimeSeconds"/>
104104
public static long UnixTimeMilliseconds()
105105
{
106-
return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
106+
return new DateTimeOffset(GetUtcNow()).ToUnixTimeMilliseconds();
107107
}
108108

109109
/// <summary>
@@ -141,7 +141,7 @@ public static long UnixTimeMilliseconds()
141141
/// <seealso cref="EpochLocal"/>
142142
public static long NowTimeSeconds()
143143
{
144-
return new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds();
144+
return new DateTimeOffset(GetNow()).ToUnixTimeSeconds();
145145
}
146146

147147
/// <summary>
@@ -183,7 +183,7 @@ public static long NowTimeSeconds()
183183
/// <seealso cref="EpochLocal"/>
184184
public static long NowTimeMilliseconds()
185185
{
186-
return new DateTimeOffset(DateTime.Now).ToUnixTimeMilliseconds();
186+
return new DateTimeOffset(GetNow()).ToUnixTimeMilliseconds();
187187
}
188188

189189
/// <summary>

0 commit comments

Comments
 (0)