Skip to content

Commit e2d4a54

Browse files
fengyhackfengyhack
authored
Merge pull request #130 from fengyhack/master
版本更新v7.2.6 修复部分已知问题
2 parents 2182fee + f29c03c commit e2d4a54

18 files changed

+955
-323
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
**2017-01-20**
2+
3+
最新版本v7.2.6，适用于.NET Framework 2.0+ 和.NET Core
4+
5+
修复：从断点记录恢复时出现错误(Context保存错误)
6+
7+
新增：HTTP状态码，HTTP方法(postPlain等)
8+
9+
* * *
10+
111
**2017-01-17**
212

313
最新版本v7.2.5，适用于.NET Framework 2.0+ 和.NET Core

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
以下文档用于检索SDK接口、属性说明，它将有助于您理解SDK的结构。
1212

13-
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.5/index.html)
13+
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.6/index.html)
1414

15-
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.5.chm)
15+
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.6.chm)
1616

1717
以下文档/链接提供一些基本示例，参考这些示例可以帮助您更快熟悉如何使用这套SDK。
1818

1919
* [github | csharp-sdk-examples](https://github.com/fengyhack/csharp-sdk-examples)
2020

21-
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.5/index.html)
21+
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.6/index.html)
2222

2323
##如何安装
2424

‎bin/qiniu-csharp-sdk-v7.2.5.zip‎

-164 KB
Binary file not shown.

‎bin/qiniu-csharp-sdk-v7.2.6.zip‎

168 KB
Binary file not shown.

‎src/Qiniu/CDN/CdnManager.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ public RefreshResult refreshUrlsAndDirs(RefreshRequest request)
7474
}
7575
catch (Exception ex)
7676
{
77-
StringBuilder sb = new StringBuilder("[Refresh] Error: ");
77+
StringBuilder sb = new StringBuilder();
78+
sb.AppendFormat("[{0}] refresh Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
7879
Exception e = ex;
7980
while (e != null)
8081
{
8182
sb.Append(e.Message + " ");
8283
e = e.InnerException;
8384
}
84-
85-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
85+
sb.AppendLine();
8686

8787
result.RefCode = (int)HttpCode.USER_EXCEPTION;
8888
result.RefText += sb.ToString();
@@ -147,15 +147,15 @@ public PrefetchResult prefetchUrls(PrefetchRequest request)
147147
}
148148
catch (Exception ex)
149149
{
150-
StringBuilder sb = new StringBuilder("[Prefetch] Error: ");
150+
StringBuilder sb = new StringBuilder();
151+
sb.AppendFormat("[{0}] prefetch Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
151152
Exception e = ex;
152153
while (e != null)
153154
{
154155
sb.Append(e.Message + " ");
155156
e = e.InnerException;
156157
}
157-
158-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
158+
sb.AppendLine();
159159

160160
result.RefCode = (int)HttpCode.USER_EXCEPTION;
161161
result.RefText += sb.ToString();
@@ -196,15 +196,15 @@ public BandwidthResult getBandwidthData(BandwidthRequest request)
196196
}
197197
catch (Exception ex)
198198
{
199-
StringBuilder sb = new StringBuilder("[Bandwidth] Error: ");
199+
StringBuilder sb = new StringBuilder();
200+
sb.AppendFormat("[{0}] bandwidth Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
200201
Exception e = ex;
201202
while (e != null)
202203
{
203204
sb.Append(e.Message + " ");
204205
e = e.InnerException;
205206
}
206-
207-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
207+
sb.AppendLine();
208208

209209
result.RefCode = (int)HttpCode.USER_EXCEPTION;
210210
result.RefText += sb.ToString();
@@ -248,15 +248,15 @@ public FluxResult getFluxData(FluxRequest request)
248248
}
249249
catch (Exception ex)
250250
{
251-
StringBuilder sb = new StringBuilder("[Flux] Error: ");
251+
StringBuilder sb = new StringBuilder();
252+
sb.AppendFormat("[{0}] flux Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
252253
Exception e = ex;
253254
while (e != null)
254255
{
255256
sb.Append(e.Message + " ");
256257
e = e.InnerException;
257258
}
258-
259-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
259+
sb.AppendLine();
260260

261261
result.RefCode = (int)HttpCode.USER_EXCEPTION;
262262
result.RefText += sb.ToString();
@@ -301,15 +301,15 @@ public LogListResult getCdnLogList(LogListRequest request)
301301
}
302302
catch (Exception ex)
303303
{
304-
StringBuilder sb = new StringBuilder("[LogList] Error: ");
304+
StringBuilder sb = new StringBuilder();
305+
sb.AppendFormat("[{0}] loglist Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
305306
Exception e = ex;
306307
while (e != null)
307308
{
308309
sb.Append(e.Message + " ");
309310
e = e.InnerException;
310311
}
311-
312-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
312+
sb.AppendLine();
313313

314314
result.RefCode = (int)HttpCode.USER_EXCEPTION;
315315
result.RefText += sb.ToString();

‎src/Qiniu/Common/ZoneHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ public static ZoneID queryZone(string accessKey, string bucket)
5252
}
5353
catch (Exception ex)
5454
{
55-
StringBuilder sb = new StringBuilder("[ConfigZone] Error: ");
55+
StringBuilder sb = new StringBuilder();
56+
sb.AppendFormat("[{0}] queryZone Error: ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
5657
Exception e = ex;
5758
while (e != null)
5859
{
5960
sb.Append(e.Message + " ");
6061
e = e.InnerException;
6162
}
62-
63-
sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
63+
sb.AppendLine();
6464

6565
throw new Exception(sb.ToString());
6666
}

‎src/Qiniu/Http/HttpCode.cs‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
/// </summary>
66
public enum HttpCode
77
{
8+
#region _PRE_
9+
810
/// <summary>
911
/// 成功
1012
/// </summary>
@@ -21,14 +23,54 @@ public enum HttpCode
2123
BAD_REQUEST = 400,
2224

2325
/// <summary>
24-
/// 无效凭证
26+
/// 认证授权失败
27+
/// </summary>
28+
AUTHENTICATION_FAILED = 401,
29+
30+
/// <summary>
31+
/// 拒绝访问
32+
/// </summary>
33+
ACCESS_DENIED = 403,
34+
35+
/// <summary>
36+
/// 资源不存在
37+
/// </summary>
38+
OBJECT_NOT_FOUND = 404,
39+
40+
/// <summary>
41+
/// CRC32校验失败
2542
/// </summary>
26-
BAD_TOKEN = 401,
43+
CRC32_CHECK_FAILEd = 406,
2744

2845
/// <summary>
2946
/// 上传文件大小超限
3047
/// </summary>
31-
SIZE_EXCEEDS = 413,
48+
FILE_SIZE_EXCEED = 413,
49+
50+
/// <summary>
51+
/// 镜像回源失败
52+
/// </summary>
53+
PREFETCH_FAILED = 478,
54+
55+
/// <summary>
56+
/// 错误网关
57+
/// </summary>
58+
BAD_GATEWAY = 502,
59+
60+
/// <summary>
61+
/// 服务端不可用
62+
/// </summary>
63+
SERVER_UNAVAILABLE = 503,
64+
65+
/// <summary>
66+
/// 服务端操作超时
67+
/// </summary>
68+
SERVER_TIME_EXCEED = 504,
69+
70+
/// <summary>
71+
/// 单个资源访问频率过高
72+
/// </summary>
73+
TOO_FREQUENT_ACCESS = 573,
3274

3375
/// <summary>
3476
/// 回调失败
@@ -38,7 +80,12 @@ public enum HttpCode
3880
/// <summary>
3981
/// 服务端操作失败
4082
/// </summary>
41-
SERVER_FAILED = 599,
83+
SERVER_OPERATION_FAILED = 599,
84+
85+
/// <summary>
86+
/// 资源内容被修改
87+
/// </summary>
88+
CONTENT_MODIFIED = 608,
4289

4390
/// <summary>
4491
/// 文件不存在
@@ -50,16 +97,28 @@ public enum HttpCode
5097
/// </summary>
5198
FILE_EXISTS = 614,
5299

100+
/// <summary>
101+
/// 空间数量已达上限
102+
/// </summary>
103+
BUCKET_COUNT_LIMIT = 630,
104+
53105
/// <summary>
54106
/// 空间或者文件不存在
55107
/// </summary>
56108
BUCKET_NOT_EXIST = 631,
57109

58110
/// <summary>
59-
/// 资源Context已过期
111+
/// 列举资源(list)使用了非法的marker
112+
/// </summary>
113+
INVALID_MARKER = 640,
114+
115+
/// <summary>
116+
/// 在断点续上传过程中，后续上传接收地址不正确或ctx信息已过期。
60117
/// </summary>
61118
CONTEXT_EXPIRED = 701,
62119

120+
#endregion _PRE_
121+
63122
#region _USR_
64123

65124
/// <summary>

0 commit comments

Comments
 (0)