From 6e26d53a3728e8f5245d8b700f7baf8ad61bafae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 31 Oct 2024 08:56:08 +0800 Subject: [PATCH] 'commit' --- dsRes/Doc/v1.0/.cache.json | 2 +- dsRes/Doc/v1.0/apidoc.log.lck | 0 ...rce_Res_Controller_ResourceController.html | 16 ++++++++++ dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json | 10 ++++++ dsRes/Doc/v1.0/index.html | 4 +++ .../resource/Res/Model/ResourceModel.java | 9 +++++- dsRes/src/main/resources/application_ali.yaml | 31 ------------------- dsRes/src/main/resources/application_dev.yaml | 1 + dsRes/src/main/resources/application_pro.yaml | 1 + 9 files changed, 41 insertions(+), 33 deletions(-) delete mode 100644 dsRes/Doc/v1.0/apidoc.log.lck delete mode 100644 dsRes/src/main/resources/application_ali.yaml diff --git a/dsRes/Doc/v1.0/.cache.json b/dsRes/Doc/v1.0/.cache.json index cb2876fb..6d7c7836 100644 --- a/dsRes/Doc/v1.0/.cache.json +++ b/dsRes/Doc/v1.0/.cache.json @@ -1 +1 @@ -[{"baseUrl":"","className":"ResourceController","description":"ResourceController","docFileName":"com_dsideal_resource_Res_Controller_ResourceController.html","generateDocs":true,"packageName":"com.dsideal.resource.Res.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getSignature","deprecated":false,"description":"获取Minio的上传签名","header":[],"method":["GET","POST"],"methodName":"getSignature","paramNodes":[{"description":"上传的扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getSignature"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getSignatureByMd5","deprecated":false,"description":"获取Minio的上传签名","header":[],"method":["GET","POST"],"methodName":"getSignatureByMd5","paramNodes":[{"description":"上传的扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"},{"description":"文件md5值","jsonBody":false,"name":"file_md5","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getSignatureByMd5"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#addResourceBase","deprecated":false,"description":"增加","header":[],"method":["GET","POST"],"methodName":"addResourceBase","paramNodes":[{"description":"资源名称","jsonBody":false,"name":"resource_title","required":false,"type":"string"},{"description":"资源大小","jsonBody":false,"name":"resource_size_int","required":false,"type":"long"},{"description":"扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"},{"description":"对应文件的id号，是一个guid","jsonBody":false,"name":"file_id","required":false,"type":"string"},{"description":"文件的md5值","jsonBody":false,"name":"file_md5","required":false,"type":"string"},{"description":"结构id","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"结构id","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目id","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/addResourceBase"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#delResourceBaseById","deprecated":false,"description":"删除","header":[],"method":["GET","POST"],"methodName":"delResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/delResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById","deprecated":false,"description":"按ID修改","header":[],"method":["GET","POST"],"methodName":"updateResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"},{"description":"资源名称","jsonBody":false,"name":"resource_title","required":false,"type":"string"},{"description":"资源大小","jsonBody":false,"name":"resource_size_int","required":false,"type":"long"},{"description":"上传人员id","jsonBody":false,"name":"person_id","required":false,"type":"string"},{"description":"结构id","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"结构id","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目id","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/updateResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseById","deprecated":false,"description":"按ID查询","header":[],"method":["GET","POST"],"methodName":"getResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList","deprecated":false,"description":"查询列表","header":[],"method":["GET","POST"],"methodName":"getResourceBaseList","paramNodes":[{"description":"学段","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"版本","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"学科","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"结构ID","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"搜索关键词","jsonBody":false,"name":"keyword","required":false,"type":"string"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页数量","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getResourceBaseList"}],"srcFileName":"D:\\dsWork\\dsProject\\dsRes\\src\\main\\java\\com\\dsideal\\resource\\Res\\Controller\\ResourceController.java"}] \ No newline at end of file +[{"baseUrl":"","className":"ResourceController","description":"ResourceController","docFileName":"com_dsideal_resource_Res_Controller_ResourceController.html","generateDocs":true,"packageName":"com.dsideal.resource.Res.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getSignature","deprecated":false,"description":"获取Minio的上传签名","header":[],"method":["GET","POST"],"methodName":"getSignature","paramNodes":[{"description":"上传的扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getSignature"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getSignatureByMd5","deprecated":false,"description":"获取Minio的上传签名","header":[],"method":["GET","POST"],"methodName":"getSignatureByMd5","paramNodes":[{"description":"上传的扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"},{"description":"文件md5值","jsonBody":false,"name":"file_md5","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getSignatureByMd5"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#addResourceBase","deprecated":false,"description":"增加","header":[],"method":["GET","POST"],"methodName":"addResourceBase","paramNodes":[{"description":"资源名称","jsonBody":false,"name":"resource_title","required":false,"type":"string"},{"description":"资源大小","jsonBody":false,"name":"resource_size_int","required":false,"type":"long"},{"description":"扩展名","jsonBody":false,"name":"extension","required":false,"type":"string"},{"description":"对应文件的id号，是一个guid","jsonBody":false,"name":"file_id","required":false,"type":"string"},{"description":"文件的md5值","jsonBody":false,"name":"file_md5","required":false,"type":"string"},{"description":"结构id","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"结构id","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目id","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/addResourceBase"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#delResourceBaseById","deprecated":false,"description":"删除","header":[],"method":["GET","POST"],"methodName":"delResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/delResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById","deprecated":false,"description":"按ID修改","header":[],"method":["GET","POST"],"methodName":"updateResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"},{"description":"资源名称","jsonBody":false,"name":"resource_title","required":false,"type":"string"},{"description":"资源大小","jsonBody":false,"name":"resource_size_int","required":false,"type":"long"},{"description":"上传人员id","jsonBody":false,"name":"person_id","required":false,"type":"string"},{"description":"结构id","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"结构id","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目id","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/updateResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseById","deprecated":false,"description":"按ID查询","header":[],"method":["GET","POST"],"methodName":"getResourceBaseById","paramNodes":[{"description":"主键","jsonBody":false,"name":"resource_id_int","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getResourceBaseById"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList","deprecated":false,"description":"查询列表","header":[],"method":["GET","POST"],"methodName":"getResourceBaseList","paramNodes":[{"description":"学段","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"版本","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"学科","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"结构ID","jsonBody":false,"name":"structure_id","required":false,"type":"int"},{"description":"搜索关键词","jsonBody":false,"name":"keyword","required":false,"type":"string"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页数量","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getResourceBaseList"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Res_Controller_ResourceController.html#getThumbs","deprecated":false,"description":"获取所有的扩展名与缩略图的关系","header":[],"method":["GET","POST"],"methodName":"getThumbs","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getThumbs"}],"srcFileName":"D:\\dsWork\\dsProject\\dsRes\\src\\main\\java\\com\\dsideal\\resource\\Res\\Controller\\ResourceController.java"}] \ No newline at end of file diff --git a/dsRes/Doc/v1.0/apidoc.log.lck b/dsRes/Doc/v1.0/apidoc.log.lck deleted file mode 100644 index e69de29b..00000000 diff --git a/dsRes/Doc/v1.0/com_dsideal_resource_Res_Controller_ResourceController.html b/dsRes/Doc/v1.0/com_dsideal_resource_Res_Controller_ResourceController.html index cbe06486..c5310df9 100644 --- a/dsRes/Doc/v1.0/com_dsideal_resource_Res_Controller_ResourceController.html +++ b/dsRes/Doc/v1.0/com_dsideal_resource_Res_Controller_ResourceController.html @@ -63,6 +63,9 @@ 查询列表 + + 获取所有的扩展名与缩略图的关系 + @@ -395,6 +398,18 @@

返回结果

+ 
{}
+ +
+
+

获取所有的扩展名与缩略图的关系

+

请求URL

+

+ /res/getThumbs + GET + POST +

+

返回结果

{}
@@ -418,6 +433,7 @@ {name: 'ResourceController.按ID修改', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById'}, {name: 'ResourceController.按ID查询', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseById'}, {name: 'ResourceController.查询列表', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList'}, + {name: 'ResourceController.获取所有的扩展名与缩略图的关系', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getThumbs'}, ]; 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 6541aabf..fa4b2ef5 100644 --- a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json +++ b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json @@ -221,6 +221,16 @@ } }, "name": "查询列表" + }, + { + "request": { + "method": "GET", + "url": { + "query": [], + "raw": "{{domain}}/res/getThumbs" + } + }, + "name": "获取所有的扩展名与缩略图的关系" } ], "name": "ResourceController" diff --git a/dsRes/Doc/v1.0/index.html b/dsRes/Doc/v1.0/index.html index 7c422df8..f7b381b9 100644 --- a/dsRes/Doc/v1.0/index.html +++ b/dsRes/Doc/v1.0/index.html @@ -63,6 +63,9 @@ 查询列表 + + 获取所有的扩展名与缩略图的关系 + @@ -102,6 +105,7 @@ {name: 'ResourceController.按ID修改', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#updateResourceBaseById'}, {name: 'ResourceController.按ID查询', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseById'}, {name: 'ResourceController.查询列表', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList'}, + {name: 'ResourceController.获取所有的扩展名与缩略图的关系', url: 'com_dsideal_resource_Res_Controller_ResourceController.html#getThumbs'}, ]; diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java index fc9c98bc..4d9bf714 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java @@ -1,6 +1,7 @@ package com.dsideal.resource.Res.Model; import cn.hutool.core.date.DateTime; +import com.dsideal.resource.ResApplication; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; @@ -160,6 +161,12 @@ public class ResourceModel { * @return */ public List getThumbs() { - return Db.findAll("t_resource_thumb"); + //http://10.10.14.210:9000/dsideal/Thumbs/493A0236-E4E0-20DD-45EF-D1B8D997D510.png + List list = Db.findAll("t_resource_thumb"); + String prefix = ResApplication.PropKit.get("minio.url") + "/Thumbs/"; + for (Record record : list) { + record.set("thumb_name", prefix + record.getStr("thumb_name")); + } + return list; } } diff --git a/dsRes/src/main/resources/application_ali.yaml b/dsRes/src/main/resources/application_ali.yaml deleted file mode 100644 index 0af87d49..00000000 --- a/dsRes/src/main/resources/application_ali.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: ylt - password: Ycharge666 - jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 - - -redis: - ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com - port: 6379 - password: Ycharge666 - -# ============================================================== -jwt: - # 生成Token的密码 - CookieMd5SingPwd: DsideaL4r5t6y7u - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsRes/src/main/resources/application_dev.yaml b/dsRes/src/main/resources/application_dev.yaml index 378c57c7..b75bfd76 100644 --- a/dsRes/src/main/resources/application_dev.yaml +++ b/dsRes/src/main/resources/application_dev.yaml @@ -23,6 +23,7 @@ minio: accessKey: AOxWewe7pywwEc1NQeP6 secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO bucketName: dsideal + url: http://10.10.14.210:9000/dsideal # ============================================================== excel: diff --git a/dsRes/src/main/resources/application_pro.yaml b/dsRes/src/main/resources/application_pro.yaml index bdd205a9..4f6b452b 100644 --- a/dsRes/src/main/resources/application_pro.yaml +++ b/dsRes/src/main/resources/application_pro.yaml @@ -23,6 +23,7 @@ minio: accessKey: AOxWewe7pywwEc1NQeP6 secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO bucketName: dsideal + url: http://10.10.14.210:9000/dsideal # ============================================================== excel: