'commit'

dsRes/Doc/v1.0/com_dsideal_resource_Res_Controller_ResourceController.html

@@ -63,6 +63,9 @@
                     <a class="catalog-item" href="com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList">
                         查询列表
                     </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Res_Controller_ResourceController.html#getThumbs">
+                        获取所有的扩展名与缩略图的关系
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -395,6 +398,18 @@
                     </tr>
         </table>
     <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="getThumbs"><a href="#">获取所有的扩展名与缩略图的关系 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/res/getThumbs</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+    <p><strong>返回结果</strong></p>
     <pre class="prettyprint lang-json">{}</pre>
                         </div>
                         <hr>
@@ -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'},
     ];
 
 

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"

dsRes/Doc/v1.0/index.html

@@ -63,6 +63,9 @@
                     <a class="catalog-item" href="com_dsideal_resource_Res_Controller_ResourceController.html#getResourceBaseList">
                         查询列表
                     </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Res_Controller_ResourceController.html#getThumbs">
+                        获取所有的扩展名与缩略图的关系
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -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'},
     ];
 
 

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<Record> getThumbs() {
-        return Db.findAll("t_resource_thumb");
+        //http://10.10.14.210:9000/dsideal/Thumbs/493A0236-E4E0-20DD-45EF-D1B8D997D510.png
+        List<Record> 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;
     }
 }

dsRes/src/main/resources/application_ali.yaml

@@ -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/
-

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:

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: