Skip to content

Commit 88b120a

Browse files
committed
更新1.1.2版本
1 parent 74398bf commit 88b120a

File tree

16 files changed

+202
-107
lines changed

16 files changed

+202
-107
lines changed

Admin.Core.Common/Admin.Core.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
1919
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.3" />
20-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.0" />
20+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
2121
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
22-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
22+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.1" />
2323
<PackageReference Include="UAParser" Version="3.1.44" />
2424
</ItemGroup>
2525

Admin.Core.Common/Files/FileInfo.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ public FileInfo(string fileName, long size = 0L)
2424
/// </summary>
2525
public string UploadPath { get; set; }
2626

27+
/// <summary>
28+
/// 请求路径
29+
/// </summary>
30+
public string RequestPath { get; set; }
31+
2732
/// <summary>
2833
/// 相对路径
2934
/// </summary>
@@ -50,9 +55,9 @@ public FileInfo(string fileName, long size = 0L)
5055
public string Extension { get; set; }
5156

5257
/// <summary>
53-
/// 请求路径
58+
/// 文件目录
5459
/// </summary>
55-
public string RequestPath { get; set; }
60+
public string FileDirectory => System.IO.Path.Combine(UploadPath, RelativePath).ToPath();
5661

5762
/// <summary>
5863
/// 文件请求路径
@@ -64,11 +69,6 @@ public FileInfo(string fileName, long size = 0L)
6469
/// </summary>
6570
public string FileRelativePath => System.IO.Path.Combine(RelativePath, SaveName).ToPath();
6671

67-
/// <summary>
68-
/// 文件目录
69-
/// </summary>
70-
public string FileDirectory => System.IO.Path.Combine(UploadPath, RelativePath).ToPath();
71-
7272
/// <summary>
7373
/// 文件路径
7474
/// </summary>

Admin.Core.Common/Helpers/Snowfake.cs

Lines changed: 0 additions & 85 deletions
This file was deleted.
Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
using System;
2+
3+
namespace Admin.Core.Common.Helpers
4+
{
5+
public class Snowflake
6+
{
7+
//基准时间
8+
private static long StartStmp = 1288834974657L;
9+
//private const long START_STMP = 1480166465631L;
10+
/*每一部分占用的位数*/
11+
//机器标识位数
12+
const int MachineIdBits = 5;
13+
//数据标志位数
14+
const int DatacenterIdBits = 5;
15+
//序列号识位数
16+
const int SequenceBits = 12;
17+
18+
/* 每一部分的最大值*/
19+
//机器ID最大值
20+
const long MaxMachineNum = -1L ^ (-1L << MachineIdBits);
21+
//数据标志ID最大值
22+
const long MaxDatacenterNum = -1L ^ (-1L << DatacenterIdBits);
23+
//序列号ID最大值
24+
private const long MaxSequenceNum = -1L ^ (-1L << SequenceBits);
25+
26+
/*每一部分向左的位移*/
27+
//机器ID偏左移12位
28+
private const int MachineShift = SequenceBits;
29+
//数据ID偏左移17位
30+
private const int DatacenterIdShift = SequenceBits + MachineIdBits;
31+
//时间毫秒左移22位
32+
public const int TimestampLeftShift = SequenceBits + MachineIdBits + DatacenterIdBits;
33+
34+
35+
private long _sequence = 0L;//序列号
36+
private long _lastTimestamp = -1L;//上一次时间戳
37+
public long MachineId { get; protected set; }//机器标识
38+
public long DatacenterId { get; protected set; }//数据中心
39+
//public long Sequence = 0L;//序列号
40+
//{
41+
// get { return _sequence; }
42+
// internal set { _sequence = value; }
43+
//}
44+
45+
private readonly DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
46+
private readonly object _lock = new Object();
47+
public Snowflake(long machineId, long datacenterId)
48+
{
49+
// 如果超出范围就抛出异常
50+
if (machineId > MaxMachineNum || machineId < 0)
51+
{
52+
throw new ArgumentException(string.Format("machineId 必须大于0,MaxMachineNum: {0}", MaxMachineNum));
53+
}
54+
55+
if (datacenterId > MaxDatacenterNum || datacenterId < 0)
56+
{
57+
throw new ArgumentException(string.Format("datacenterId必须大于0,且不能大于MaxDatacenterNum: {0}", MaxDatacenterNum));
58+
}
59+
60+
//先检验再赋值
61+
MachineId = machineId;
62+
DatacenterId = datacenterId;
63+
//_sequence = sequence;
64+
}
65+
66+
//public static Init(long machineId, long datacenterId)
67+
//{
68+
69+
//}
70+
public long NextId()
71+
{
72+
lock (_lock)
73+
{
74+
var timestamp = TimeGen();
75+
if (timestamp < _lastTimestamp)
76+
{
77+
throw new Exception(string.Format("时间戳必须大于上一次生成ID的时间戳. 拒绝为{0}毫秒生成id", _lastTimestamp - timestamp));
78+
}
79+
80+
//如果上次生成时间和当前时间相同,在同一毫秒内
81+
if (_lastTimestamp == timestamp)
82+
{
83+
//sequence自增,和sequenceMask相与一下,去掉高位
84+
_sequence = (_sequence + 1) & MaxSequenceNum;
85+
//判断是否溢出,也就是每毫秒内超过1024,当为1024时,与sequenceMask相与,sequence就等于0
86+
if (_sequence == 0L)
87+
{
88+
//等待到下一毫秒
89+
timestamp = TilNextMillis(_lastTimestamp);
90+
}
91+
}
92+
else
93+
{
94+
//如果和上次生成时间不同,重置sequence,就是下一毫秒开始,sequence计数重新从0开始累加,
95+
//为了保证尾数随机性更大一些,最后一位可以设置一个随机数
96+
_sequence = 0L;//new Random().Next(10);
97+
}
98+
99+
_lastTimestamp = timestamp;
100+
return ((timestamp - StartStmp) << TimestampLeftShift) | (DatacenterId << DatacenterIdShift) | (MachineId << MachineShift) | _sequence;
101+
}
102+
}
103+
104+
// 防止产生的时间比之前的时间还要小(由于NTP回拨等问题),保持增量的趋势.
105+
protected virtual long TilNextMillis(long lastTimestamp)
106+
{
107+
var timestamp = TimeGen();
108+
while (timestamp <= lastTimestamp)
109+
{
110+
timestamp = TimeGen();
111+
}
112+
return timestamp;
113+
}
114+
115+
// 获取当前的时间戳
116+
protected virtual long TimeGen()
117+
{
118+
//return TimeExtensions.CurrentTimeMillis();
119+
return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
120+
}
121+
}
122+
123+
public class IdWorkerHelper
124+
{
125+
private static Snowflake _idWorker= null;
126+
private IdWorkerHelper()
127+
{
128+
129+
}
130+
131+
static IdWorkerHelper()
132+
{
133+
_idWorker = new Snowflake(1, 1);
134+
}
135+
136+
public static long GenId64()
137+
{
138+
return _idWorker.NextId();
139+
140+
}
141+
}
142+
143+
}

Admin.Core.Common/Helpers/UploadHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public async Task<IResponseOutput<FileInfo>> UploadAsync(IFormFile file, FileUpl
6161
Directory.CreateDirectory(fileInfo.FileDirectory);
6262
}
6363

64-
fileInfo.SaveName = $"{new Snowfake(0).nextId()}.{fileInfo.Extension}";
64+
fileInfo.SaveName = $"{IdWorkerHelper.GenId64()}.{fileInfo.Extension}";
6565

6666
await SaveAsync(file, fileInfo.FilePath, cancellationToken);
6767

Admin.Core.Services/Admin/Document/DocumentService.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,17 @@ public async Task<IResponseOutput> DeleteAsync(long id)
155155
return ResponseOutput.Result(result);
156156
}
157157

158+
public async Task<IResponseOutput> DeleteImageAsync(long documentId, string url)
159+
{
160+
var result = false;
161+
if (documentId > 0 && url.NotNull())
162+
{
163+
result = (await _documentImageRepository.DeleteAsync(m => m.DocumentId == documentId && m.Url == url)) > 0;
164+
}
165+
166+
return ResponseOutput.Result(result);
167+
}
168+
158169
public async Task<IResponseOutput> SoftDeleteAsync(long id)
159170
{
160171
var result = await _documentRepository.SoftDeleteAsync(id);

Admin.Core.Services/Admin/Document/IDocumentService.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public partial interface IDocumentService
3636

3737
Task<IResponseOutput> DeleteAsync(long id);
3838

39+
Task<IResponseOutput> DeleteImageAsync(long documentId, string url);
40+
3941
Task<IResponseOutput> SoftDeleteAsync(long id);
4042

4143
}

Admin.Core/Admin.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
3535
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
3636
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
37-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.3" />
37+
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
3838

3939
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
4040
<PackageReference Include="NLog" Version="4.7.0" />

Admin.Core/Admin.Core.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Admin.Core/Controllers/Admin/DocumentController.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,18 @@ public async Task<IResponseOutput> SoftDelete(long id)
163163
return await _documentServices.SoftDeleteAsync(id);
164164
}
165165

166+
/// <summary>
167+
/// 删除图片
168+
/// </summary>
169+
/// <param name="documentId"></param>
170+
/// <param name="url"></param>
171+
/// <returns></returns>
172+
[HttpDelete]
173+
public async Task<IResponseOutput> DeleteImage(long documentId, string url)
174+
{
175+
return await _documentServices.DeleteImageAsync(documentId, url);
176+
}
177+
166178
/// <summary>
167179
/// 上传文档图片
168180
/// </summary>
@@ -176,13 +188,16 @@ public async Task<IResponseOutput> UploadImage([FromForm]DocumentUploadImageInpu
176188
if (res.Success)
177189
{
178190
//保存文档图片
179-
var r = await _documentServices.AddImageAsync(new DocumentAddImageInput
191+
var r = await _documentServices.AddImageAsync(
192+
new DocumentAddImageInput
180193
{
181194
DocumentId = input.Id,
182195
Url = res.Data.FileRequestPath
183196
});
184-
if(r.Success)
185-
return ResponseOutput.Ok(res.Data.FileRequestPath);
197+
if (r.Success)
198+
{
199+
return ResponseOutput.Ok(res.Data.FileRequestPath);
200+
}
186201
}
187202

188203
return ResponseOutput.NotOk("上传失败!");

0 commit comments

Comments
 (0)