From 5b220e323e595970b9313efe26783977602e2970 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Thu, 20 Dec 2018 21:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AF=BE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  2 +-
 ruoyi-admin/pom.xml                              | 14 +++++++-------
 .../ruoyi/web/controller/tool/AliyunOSSRest.java |  9 +++++----
 .../framework/web/service/AliyunOSSClient.java   | 16 ++++++++--------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33a14fae5..cc2e992a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 		<module>ruoyi-exam</module>
 		<module>ruoyi-vip</module>
 		<module>ruoyi-train</module>
-        <module>tuoyi-test</module>
+        <!--<module>tuoyi-test</module>-->
     </modules>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index b17df55dc..0de13b578 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -58,17 +58,17 @@
             <version>${ruoyi.version}</version>
         </dependency>
         <!-- 培训系统-->
-        <!--<dependency>-->
-            <!--<groupId>com.ruoyi</groupId>-->
-            <!--<artifactId>ruoyi-train</artifactId>-->
-            <!--<version>${ruoyi.version}</version>-->
-        <!--</dependency>-->
-        <!-- 测试生成的代码-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>tuoyi-test</artifactId>
+            <artifactId>ruoyi-train</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
+        <!-- 测试生成的代码-->
+        <!--<dependency>-->
+            <!--<groupId>com.ruoyi</groupId>-->
+            <!--<artifactId>tuoyi-test</artifactId>-->
+            <!--<version>${ruoyi.version}</version>-->
+        <!--</dependency>-->
         <!-- 定时任务
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/AliyunOSSRest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/AliyunOSSRest.java
index ce3d25c63..2d581f5b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/AliyunOSSRest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/AliyunOSSRest.java
@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.tool;
 
+import cn.hutool.json.JSONObject;
 import com.ruoyi.framework.web.service.AliyunOSSClient;
-import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,11 +12,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("aliyun/oss")
 public class AliyunOSSRest {
 
-    @Autowired
-    private AliyunOSSClient aliyunOSSClient ;
+//    @Autowired
+//    private AliyunOSSClient aliyunOSSClient ;
     @GetMapping("policy.json")
     public JSONObject getPolicy() {
          String dir = String.valueOf(System.currentTimeMillis());
-         return aliyunOSSClient .getPostObjectPolicy(dir);
+//         return aliyunOSSClient .getPostObjectPolicy(dir);
+        return  null;
     }
 }
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java
index c17ce1bb9..af677e31b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java
@@ -1,10 +1,10 @@
 package com.ruoyi.framework.web.service;
 
+import cn.hutool.json.JSONObject;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.MatchMode;
 import com.aliyun.oss.model.PolicyConditions;
-import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -26,17 +26,17 @@ public class AliyunOSSClient {
     private ConfigService configService;
 
     public AliyunOSSClient() {
-        this.endpoint = configService.getKey("ali.oss.endpoint");
-        this.accessKeyId = configService.getKey("ali.oss.accessKeyId");
-        this.accessKeySecret = configService.getKey("ali.oss.accessKeySecret");
-        this.bucket = configService.getKey("ali.oss.bucket");
+//        this.endpoint = configService.getKey("ali.oss.endpoint");
+//        this.accessKeyId = configService.getKey("ali.oss.accessKeyId");
+//        this.accessKeySecret = configService.getKey("ali.oss.accessKeySecret");
+//        this.bucket = configService.getKey("ali.oss.bucket");
     }
 
     @PostConstruct
     void init() {
-        if (this.ossClient == null) {
-            this.ossClient = new OSSClient(this.endpoint, this.accessKeyId, this.accessKeySecret);
-        }
+//        if (this.ossClient == null) {
+//            this.ossClient = new OSSClient(this.endpoint, this.accessKeyId, this.accessKeySecret);
+//        }
     }
 
     /**