syh преди 5 години
родител
ревизия
1455935a7e

+ 2 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -18,7 +18,6 @@ import org.jeecg.modules.wps.util.upload.ResFileDTO;
 import org.jeecg.modules.wps.util.upload.oss.WpsOSSUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -54,7 +53,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
 
         Map<String,String> values = new HashMap<String,String>(){
             {
-                put("_w_appid", appid);
+                put("_w_appid", WpsUtil.appid);
                 if (checkToken){
                     put("_w_tokentype","1");
                 }
@@ -72,16 +71,6 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
 
         return t;
     }
-    @Value("wps.domain")
-    private String domain;
-    @Value("wps.appid")
-    private String appid;
-    @Value("wps.appsecret")
-    private String appsecret;
-    @Value("wps.download_host")
-    private String downloadHost;
-    @Value("wps.local_Dir")
-    private String localDir;
 
     @Override
     public Token getViewUrl(String fileId,String userId,boolean checkToken){
@@ -95,7 +84,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
             String uuid = randomUuid.toString().replace("-","");
 
             Map<String,String> values = new HashMap<>();
-            values.put("_w_appid", appid);
+            values.put("_w_appid", WpsUtil.appid);
             if (checkToken){
                 values.put("_w_tokentype","1");
             }

+ 6 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/util/WpsUtil.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.wps.util;
 
 import org.jeecg.modules.wps.util.file.FileUtil;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
@@ -11,16 +10,12 @@ import java.util.Map;
 @Component
 @Configuration
 public class WpsUtil {
-    @Value("${wps.domain}")
-    private String domain;
-    @Value("${wps.appid}")
-    private String appid;
-    @Value("${wps.appsecret}")
-    private String appsecret;
-    @Value("${wps.download_host}")
-    private String downloadHost;
-    @Value("${wps.local_dir}")
-    private String localDir;
+
+    public static final String domain = "https://trac.tjyourong.com.cn/";
+    public static final String appid = "aba9d3b0553f4eb4a69980b26927dc7a";
+    public static final String appsecret = "017d85f689d54d05a7a2ad2187f9e645";
+    public static final String downloadHost = "";
+    public static final String localDir = "";
     public String getWpsUrl(Map<String,String> values,String fileType,String fileId){
         String keyValueStr = SignatureUtil.getKeyValueStr(values);
         String signature = SignatureUtil.getSignature(values, appsecret);

+ 7 - 45
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/util/upload/oss/WpsOSSUtil.java

@@ -9,7 +9,6 @@ import org.jeecg.modules.wps.util.file.FileType;
 import org.jeecg.modules.wps.util.file.FileTypeJudge;
 import org.jeecg.modules.wps.util.file.FileUtil;
 import org.jeecg.modules.wps.util.upload.ResFileDTO;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,62 +21,26 @@ import java.util.*;
 
 @Component
 public class WpsOSSUtil {
-    private static String fileUrlPrefix;
+    public static final String fileUrlPrefix = "https://ctop-media.oss-cn-beijing.aliyuncs.com/";
     /**
      * 阿里云API的bucket名称
      */
-    private static String bucketName;
-    private static String diskName;
-    private static String regionId;
+    public static final String bucketName = "ctop-media";
+    public static final String diskName = "script-lib/wps/";
+    public static final String regionId = "cn-bejing";
 
     /**
      * 阿里云API的内或外网域名
      */
-    private static String endpoint;
+    public static final String endpoint = "http://oss-cn-beijing.aliyuncs.com";
     /**
      * 阿里云API的密钥Access Key ID
      */
-    private static String accessKey;
+    public static final String accessKey = "LTAIbNbqWzSOklQV";
     /**
      * 阿里云API的密钥Access Key Secret
      */
-    private static String accessSecret;
-
-    @Value("${wps.oss.file_url_prefix}")
-    public static void setFileUrlPrefix(String fileUrlPrefix) {
-        WpsOSSUtil.fileUrlPrefix = fileUrlPrefix;
-    }
-
-    @Value("${wps.oss.disk_name}")
-    public static void setDiskName(String diskName) {
-        WpsOSSUtil.diskName = diskName;
-    }
-
-    @Value("${wps.oss.region_Id}")
-    public static void setRegionId(String regionId) {
-        WpsOSSUtil.regionId = regionId;
-    }
-
-    @Value("${wps.oss.bucket_name}")
-    public void setBucketName(String bucketName) {
-        WpsOSSUtil.bucketName = bucketName;
-    }
-
-    @Value("${wps.oss.access_key}")
-    public void setAccessKey(String accessKey) {
-        WpsOSSUtil.accessKey = accessKey;
-    }
-
-    @Value("${wps.oss.access_secret}")
-    public void setAccessSecret(String accessSecret) {
-        WpsOSSUtil.accessSecret = accessSecret;
-    }
-
-    @Value("${wps.oss.endpoint}")
-    public void setEndpoint(String endpoint) {
-        WpsOSSUtil.endpoint = endpoint;
-    }
-
+    public static final String accessSecret = "1rkPz7JNoXk8sJevPaeYHWqfkQXBGh";
 
     private static OSSClient getOSSClient(){
         return new OSSClient(endpoint,accessKey, accessSecret);
@@ -284,7 +247,6 @@ public class WpsOSSUtil {
             OSSClient client =  getOSSClient();
             InputStream is = new FileInputStream(file);
             String fileName = file.getName();
-            long fileSize = file.length();
             //创建上传Object的Metadata
             ObjectMetadata metadata = new ObjectMetadata();
             metadata.setContentLength(is.available());

+ 0 - 15
jeecg-boot-module-system/src/main/resources/application.yml

@@ -14,18 +14,3 @@ swagger:
     enable: true
     username: jeecg
     password: jeecg1314
-
-wps:
-  domain: https://trac.tjyourong.com.cn/
-  appid: aba9d3b0553f4eb4a69980b26927dc7a
-  appsecret: 017d85f689d54d05a7a2ad2187f9e645
-  download_host:
-  local_dir:
-  oss:
-    file_url_prefix: https://ctop-media.oss-cn-beijing.aliyuncs.com/
-    bucket_name: ctop-media
-    disk_name:  script-lib/wps/
-    region_id: cn-bejing
-    endpoint: http://oss-cn-beijing.aliyuncs.com
-    access_key: LTAIbNbqWzSOklQV
-    access_secret: 1rkPz7JNoXk8sJevPaeYHWqfkQXBGh