Merge branch '增加附件阿里云存储OSS支持' into 'develop'

增加附件阿里云存储OSS支持

See merge request o2oa/o2oa!482

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java

@@ -16,11 +16,7 @@ import javax.persistence.Transient;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.vfs2.CacheStrategy;
-import org.apache.commons.vfs2.FileObject;
-import org.apache.commons.vfs2.FileSystemException;
-import org.apache.commons.vfs2.FileSystemManager;
-import org.apache.commons.vfs2.FileSystemOptions;
+import org.apache.commons.vfs2.*;
 import org.apache.commons.vfs2.cache.NullFilesCache;
 import org.apache.commons.vfs2.impl.StandardFileSystemManager;
 import org.apache.commons.vfs2.provider.ftp.FtpFileSystemConfigBuilder;
@@ -252,6 +248,11 @@ public abstract class StorageObject extends SliceJpaObject {
 					+ URLEncoder.encode(mapping.getPassword(), DefaultCharset.name) + "@" + mapping.getHost() + ":"
 					+ mapping.getPort();
 			break;
+		case ali:
+			prefix = "ali://" + URLEncoder.encode(mapping.getUsername(), DefaultCharset.name) + ":"
+					+ URLEncoder.encode(mapping.getPassword(), DefaultCharset.name) + "@" + mapping.getHost() + "/"
+					+ mapping.getName();
+			break;
 		case file:
 			prefix = "file://";
 			break;
@@ -261,7 +262,18 @@ public abstract class StorageObject extends SliceJpaObject {
 		default:
 			break;
 		}
-		return prefix + (StringUtils.isEmpty(mapping.getPrefix()) ? "" : ("/" + mapping.getPrefix()));
+		String mappingPrefix = "";
+		if(StringUtils.isNotBlank(mapping.getPrefix())){
+			if(mapping.getPrefix().startsWith("/")){
+				mappingPrefix = mapping.getPrefix();
+			}else{
+				mappingPrefix = "/" + mapping.getPrefix();
+			}
+			if(mappingPrefix.endsWith("/")) {
+				mappingPrefix = mappingPrefix.substring(0, mappingPrefix.length()-1);
+			}
+		}
+		return prefix + mappingPrefix;
 	}
 
 	private FileSystemOptions getOptions(StorageMapping mapping) throws Exception {
@@ -356,7 +368,8 @@ public abstract class StorageObject extends SliceJpaObject {
 				length = IOUtils.copyLarge(inputStream, output);
 				this.setLength(length);
 				if ((!Objects.equals(StorageProtocol.webdav, mapping.getProtocol()))
-						&& (!Objects.equals(StorageProtocol.sftp, mapping.getProtocol()))) {
+						&& (!Objects.equals(StorageProtocol.sftp, mapping.getProtocol()))
+						&& (!Objects.equals(StorageProtocol.ali, mapping.getProtocol()))) {
 					/* webdav关闭会试图去关闭commons.httpClient */
 					manager.closeFileSystem(fo.getFileSystem());
 				}
@@ -395,7 +408,8 @@ public abstract class StorageObject extends SliceJpaObject {
 				throw new FileNotFoundException(
 						fo.getPublicURIString() + " not existed, object:" + this.toString() + ".");
 			}
-			if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())) {
+			if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())
+					&& (!Objects.equals(StorageProtocol.ali, mapping.getProtocol()))) {
 				/* webdav关闭会试图去关闭commons.httpClient */
 				manager.closeFileSystem(fo.getFileSystem());
 			}
@@ -434,7 +448,8 @@ public abstract class StorageObject extends SliceJpaObject {
 					}
 				}
 			}
-			if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())) {
+			if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())
+					&& (!Objects.equals(StorageProtocol.ali, mapping.getProtocol()))) {
 				// webdav关闭会试图去关闭commons.httpClient
 				manager.closeFileSystem(fo.getFileSystem());
 			}

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java

 package com.x.base.core.entity;
 
 public enum StorageProtocol {
-	ftp, ftps, webdav, cifs, file, sftp, hdfs;
+	ftp, ftps, webdav, cifs, file, sftp, hdfs, ali;
 
 	public static final int length = JpaObject.length_16B;
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalStorageSource.java

@@ -7,10 +7,14 @@ import com.x.base.core.entity.StorageProtocol;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.tools.Crypto;
 
+/**
+ * 第三方附件存储配置
+ * @author sword
+ */
 public class ExternalStorageSource extends ConfigObject {
 
 	private static final long serialVersionUID = 5926439816241094368L;
-	
+
 	// 无需保存
 	private transient String _password;
 
@@ -43,13 +47,13 @@ public class ExternalStorageSource extends ConfigObject {
 	public static final String DEFAULT_NAME = "251";
 	public static final Boolean DEFAULT_DEEPPATH = false;
 
-	@FieldDescribe("协议,可选值ftp,webdav...")
+	@FieldDescribe("协议,可选值ftp、sftp、webdav、file、hdfs、ali")
 	private StorageProtocol protocol;
 	@FieldDescribe("登录用户名.")
 	private String username;
 	@FieldDescribe("登录密码.")
 	private String password;
-	@FieldDescribe("主机地址.")
+	@FieldDescribe("主机地址或阿里云endpoint.")
 	private String host;
 	@FieldDescribe("端口.")
 	private Integer port;
@@ -59,7 +63,7 @@ public class ExternalStorageSource extends ConfigObject {
 	private Boolean enable;
 	@FieldDescribe("设置权重.")
 	private Integer weight;
-	@FieldDescribe("存储节点名,对应存储名称,谨慎修改.")
+	@FieldDescribe("存储节点名,对应存储名称,阿里云为bucket(桶)名称.")
 	private String name;
 	@FieldDescribe("是否使用更深的路径.")
 	private Boolean deepPath;
@@ -107,4 +111,4 @@ public class ExternalStorageSource extends ConfigObject {
 		return BooleanUtils.isTrue(this.deepPath);
 	}
 
-}
\ No newline at end of file
+}