请求URL
+
+ /res/getSignatureByMd5
+ GET
+ POST
+
请求参数 application/x-www-form-urlencoded
+| 参数名 | +类型 | +必须 | +描述 | +
|---|---|---|---|
| extension | +string | +否 | +上传的扩展名 | +
| file_md5 | +string | +否 | +文件md5值 | +
返回结果
+{}
+ 请求URL
@@ -376,6 +412,7 @@
var search_source_data = [
{name: 'ResourceController.获取Minio的上传签名', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getSignature'},
+ {name: 'ResourceController.获取Minio的上传签名', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getSignatureByMd5'},
{name: 'ResourceController.增加', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#addResourceBase'},
{name: 'ResourceController.删除', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#delResourceBaseById'},
{name: 'ResourceController.按ID修改', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById'},
diff --git a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
index 44108a0d..6541aabf 100644
--- a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
+++ b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
@@ -16,6 +16,27 @@
},
"name": "获取Minio的上传签名"
},
+ {
+ "request": {
+ "method": "GET",
+ "url": {
+ "query": [
+ {
+ "description": "上传的扩展名",
+ "value": "",
+ "key": "extension"
+ },
+ {
+ "description": "文件md5值",
+ "value": "",
+ "key": "file_md5"
+ }
+ ],
+ "raw": "{{domain}}/res/getSignatureByMd5"
+ }
+ },
+ "name": "获取Minio的上传签名"
+ },
{
"request": {
"method": "POST",
diff --git a/dsRes/Doc/v1.0/index.html b/dsRes/Doc/v1.0/index.html
index 328c1674..7c422df8 100644
--- a/dsRes/Doc/v1.0/index.html
+++ b/dsRes/Doc/v1.0/index.html
@@ -45,6 +45,9 @@
获取Minio的上传签名
+
+ 获取Minio的上传签名
+
增加
@@ -93,6 +96,7 @@
var search_source_data = [
{name: 'ResourceController.获取Minio的上传签名', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getSignature'},
+ {name: 'ResourceController.获取Minio的上传签名', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getSignatureByMd5'},
{name: 'ResourceController.增加', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#addResourceBase'},
{name: 'ResourceController.删除', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#delResourceBaseById'},
{name: 'ResourceController.按ID修改', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById'},
diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
index 5b415c57..6b064f28 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
@@ -51,6 +51,33 @@ public class ResourceController extends Controller {
renderJson(RetKit.renderSuccess(record));
}
+ /**
+ * 获取Minio的上传签名
+ *
+ * @param extension 上传的扩展名
+ * @param file_md5 文件md5值
+ */
+ @Before(GET.class)
+ @JwtCheckInterface({})
+ @EmptyInterface({"extension"})
+ public void getSignatureByMd5(String extension, String file_md5) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+ if (!extension.equals(extension.toLowerCase())) {
+ renderJson(RetKit.renderFail("扩展名必须为小写"));
+ return;
+ }
+ Record rResource = rm.getResourceByFileMd5(file_md5);
+ if (rResource == null) {
+ //生成一个guid+扩展名的key
+ String objectName = java.util.UUID.randomUUID() + "." + extension;
+ String signature = MinioUtils.getSignature("resources/" + objectName);
+ Record record = new Record();
+ record.set("object_name", objectName);
+ record.set("signature", signature);
+ renderJson(RetKit.renderSuccess(record));
+ } else {
+ renderJson(RetKit.renderSuccess(rResource));
+ }
+ }
/**
* 增加
@@ -136,19 +163,20 @@ public class ResourceController extends Controller {
/**
* 查询列表
- * @param stage_id 学段
- * @param scheme_id 版本
- * @param subject_id 学科
+ *
+ * @param stage_id 学段
+ * @param scheme_id 版本
+ * @param subject_id 学科
* @param structure_id 结构ID
- * @param keyword 搜索关键词
- * @param pageNum 页码
- * @param pageSize 每页数量
+ * @param keyword 搜索关键词
+ * @param pageNum 页码
+ * @param pageSize 每页数量
*/
@Before({GET.class})
//@JwtCheckInterface({})
- @IsNumericInterface({"pageNum", "pageSize","structure_id"})
+ @IsNumericInterface({"pageNum", "pageSize", "structure_id"})
public void getResourceBaseList(int stage_id, int scheme_id, int subject_id, int structure_id, String keyword, int pageNum, int pageSize) {
- Page