From b098007a13bc79d8baa6fde5469e0ea28635b6f8 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Thu, 20 Dec 2018 21:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/tool/AliyunOSSRest.java    |  3 ---
 .../service/AliyunOssClientService.java       | 20 +++++++++++++++++++
 .../service/impl}/AliyunOSSClient.java        | 17 +++++++++-------
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/system/service/AliyunOssClientService.java
 rename ruoyi-framework/src/main/java/com/ruoyi/{framework/web/service => system/service/impl}/AliyunOSSClient.java (82%)

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 2d581f5b2..6123c8ad0 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,9 +1,6 @@
 package com.ruoyi.web.controller.tool;
 
 import cn.hutool.json.JSONObject;
-import com.ruoyi.framework.web.service.AliyunOSSClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/service/AliyunOssClientService.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/AliyunOssClientService.java
new file mode 100644
index 000000000..b491ea2f2
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/AliyunOssClientService.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+
+import cn.hutool.json.JSONObject;
+
+/**
+ * 参数配置 服务层
+ * 
+ * @author ruoyi
+ */
+public interface AliyunOssClientService
+{
+    /**
+     * 获取Policy签名等信息
+     *
+     * @param dir 存储在bucket的目录
+     * @return
+     */
+    public JSONObject getPostObjectPolicy(String dir);
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/AliyunOSSClient.java
similarity index 82%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java
rename to ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/AliyunOSSClient.java
index af677e31b..1dee2b655 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AliyunOSSClient.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/service/impl/AliyunOSSClient.java
@@ -1,10 +1,13 @@
-package com.ruoyi.framework.web.service;
+package com.ruoyi.system.service.impl;
 
 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 com.ruoyi.framework.web.service.ConfigService;
+import com.ruoyi.system.service.AliyunOssClientService;
+import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -14,7 +17,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
 @Service
-public class AliyunOSSClient {
+public class AliyunOSSClient implements AliyunOssClientService {
 
     private String endpoint;
     private String accessKeyId;
@@ -23,13 +26,13 @@ public class AliyunOSSClient {
 
     private OSSClient ossClient;
     @Autowired
-    private ConfigService configService;
+    private ISysConfigService 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.selectConfigByKey( "ali.oss.endpoint");
+//        this.accessKeyId = configService.selectConfigByKey("ali.oss.accessKeyId");
+//        this.accessKeySecret = configService.selectConfigByKey("ali.oss.accessKeySecret");
+//        this.bucket = configService.selectConfigByKey("ali.oss.bucket");
     }
 
     @PostConstruct