From d5bda84d2c7fa2877b13805146fea23c270d608a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 29 Oct 2024 14:15:23 +0800
Subject: [PATCH] 'commit'

---
 .../Res/Controller/ResourceController.java    | 38 +++++++++++++++++++
 .../resource/Test/TestUploadToMinio.java      | 21 ++++++++++
 dsRes/src/main/resources/application_dev.yaml |  4 ++
 dsRes/src/main/resources/application_pro.yaml |  4 ++
 操作文档/4、Minio安装.md               | 10 +++--
 5 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java

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 3aaf2fce..f4868d88 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
@@ -3,4 +3,42 @@ package com.dsideal.resource.Res.Controller;
 import com.jfinal.core.Controller;
 
 public class ResourceController extends Controller {
+
+    /**
+     * 新增资源
+     */
+    public void addResource(){
+
+    }
+
+    /**
+     * 删除资源
+     * @param resource_id_int 资源id
+     */
+    public void deleteResource(int resource_id_int){
+
+    }
+
+    /**
+     * 修改资源
+     * @param resource_id_int 资源id
+     */
+    public void updateResource(int resource_id_int){
+
+    }
+
+    /**
+     * 查询资源
+     * @param resource_id_int 资源id
+     */
+    public void queryResource(int resource_id_int){
+
+    }
+
+    /**
+     * 查询所有资源
+     */
+    public void queryAllResource(){
+
+    }
 }
diff --git a/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java b/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java
new file mode 100644
index 00000000..c644b9d7
--- /dev/null
+++ b/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java
@@ -0,0 +1,21 @@
+package com.dsideal.resource.Test;
+
+import com.dsideal.resource.Plugin.YamlProp;
+import com.jfinal.kit.Prop;
+
+import static com.dsideal.resource.ResApplication.getEnvPrefix;
+
+public class TestUploadToMinio {
+    public static Prop PropKit;
+
+    public static void main(String[] args) {
+        //加载配置文件
+        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
+        PropKit = new YamlProp(configFile);
+        String endPoint = PropKit.get("minio.endpoint");
+        String accessKey = PropKit.get("minio.accessKey");
+        String secretKey = PropKit.get("minio.secretKey");
+        
+
+    }
+}
diff --git a/dsRes/src/main/resources/application_dev.yaml b/dsRes/src/main/resources/application_dev.yaml
index 7673bd7f..4b981a2a 100644
--- a/dsRes/src/main/resources/application_dev.yaml
+++ b/dsRes/src/main/resources/application_dev.yaml
@@ -18,6 +18,10 @@ redis:
   port: 18890
   password:
 
+minio:
+  endpoint: http://10.10.14.210:9000
+  accessKey: AOxWewe7pywwEc1NQeP6
+  secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
 # ==============================================================
 
 excel:
diff --git a/dsRes/src/main/resources/application_pro.yaml b/dsRes/src/main/resources/application_pro.yaml
index c7378e3a..7ddb050d 100644
--- a/dsRes/src/main/resources/application_pro.yaml
+++ b/dsRes/src/main/resources/application_pro.yaml
@@ -18,6 +18,10 @@ redis:
   port: 18890
   password:
 
+minio:
+  endpoint: http://10.10.14.210:9000
+  accessKey: AOxWewe7pywwEc1NQeP6
+  secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
 # ==============================================================
 
 excel:
diff --git a/操作文档/4、Minio安装.md b/操作文档/4、Minio安装.md
index 294e177b..87c7b86f 100644
--- a/操作文档/4、Minio安装.md
+++ b/操作文档/4、Minio安装.md
@@ -1,7 +1,10 @@
 #### 摘取镜像
 
 ```shell
-docker pull minio/minio 
+yum install docker -y
+
+docker pull swr.cn-north-4.myhuaweicloud.com/ddn-k8s/quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z
+docker tag  swr.cn-north-4.myhuaweicloud.com/ddn-k8s/quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z  quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z
 ```
 
 
@@ -11,13 +14,12 @@ docker pull minio/minio
 ```shell
 mkdir -p /opt/minio/{data,.minio}
 
-docker run --name minio -d -p 9000:9000 -p 9090:9090 -v /opt/minio/data:/data -v /opt/minio/.minio:/root/.minio  minio/minio server /data --console-address ":9090" --address ":9000"
+docker run --name minio -d -p 9000:9000 -p 9090:9090 -v /opt/minio/data:/data -v /opt/minio/.minio:/root/.minio  quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z server /data --console-address ":9090" --address ":9000"
 ```
 
 
-
 #### 访问办法
-通过浏览器访问`http://10.10.14.212:9090/login`，即可访问MinIO的Web管理界面，
+通过浏览器访问`http://10.10.14.210:9090/login`，即可访问MinIO的Web管理界面，
 
 默认凭证