Pull request #6: DEC-16411 feat: S3插件作为官方插件维护

Merge in PG/plugin-repository-s3 from ~FENG/plugin-repository-s3:release/10.0 to release/10.0

* commit 'ad2da13ab2d7fa5da3202c3cca996ecf419e1026':
  DEC-16411 S3仓库打包脚本
  DEC-16411 S3插件维护

build.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="jar" name="plugin-repository-s3">
+    <!-- JDK路径，根据自己机器上实际位置修改-->
+    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home"/>
+
+    <property name="libs" value="${basedir}/lib"/>
+    <property name="publicLibs" value=""/>
+    <property name="destLoc" value="."/>
+    <property name="classes" value="classes"/>
+    <xmlproperty file="${basedir}/plugin.xml"/>
+    <property name="current-version" value="${plugin.version}"/>
+
+    <!-- 插件版本-->
+    <property name="plugin-version" value="${current-version}"/>
+    <!-- 插件名字-->
+    <property name="plugin-name" value="s3-repository"/>
+    <property name="plugin-jar" value="fr-plugin-${plugin-name}-${plugin-version}.jar"/>
+
+    <target name="prepare">
+        <delete dir="${classes}"/>
+        <delete dir="fr-plugin-${plugin-name}-${plugin-version}"/>
+        <xmlproperty file="${basedir}/plugin.xml"/>
+        <delete dir="${destLoc}/${plugin.name}"/>
+    </target>
+    <path id="compile.classpath">
+        <fileset dir="${libs}">
+            <include name="**/*.jar"/>
+        </fileset>
+        <fileset dir="${publicLibs}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+    <patternset id="resources4Jar">
+        <exclude name="**/.settings/**"/>
+        <exclude name=".classpath"/>
+        <exclude name=".project"/>
+
+        <exclude name="**/*.java"/>
+        <exclude name="**/*.db"/>
+        <exclude name="**/*.g"/>
+        <exclude name="**/package.html"/>
+    </patternset>
+    <target name="copy_resources">
+        <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
+        <delete dir="tmp"/>
+        <copy todir="tmp">
+            <fileset dir="${resources_from}/src/main/resources">
+                <patternset refid="resources4Jar"/>
+            </fileset>
+        </copy>
+        <copy todir="${classes}">
+            <fileset dir="tmp"/>
+        </copy>
+        <delete dir="tmp"/>
+    </target>
+    <target name="compile_javas">
+        <echo message="编译${compile_files}下的Java文件"/>
+        <javac destdir="${classes}" debug="false" optimize="on" source="${source_jdk_version}"
+               target="${target_jdk_version}"
+               fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
+               executable="${compile_jdk_version}/bin/javac">
+            <src path="${basedir}/src/main/java"/>
+            <exclude name="**/.svn/**"/>
+            <compilerarg line="-encoding UTF8 "/>
+            <classpath refid="compile.classpath"/>
+        </javac>
+    </target>
+
+    <target name="jar_classes">
+        <echo message="打Jar包:${jar_name}"/>
+        <delete file="${basedir}/${jar_name}"/>
+        <jar jarfile="${basedir}/${jar_name}">
+            <fileset dir="${classes}">
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="super_jar" depends="prepare">
+        <antcall target="copy_resources">
+            <param name="resources_from" value="${basedir}"/>
+        </antcall>
+        <antcall target="compile_javas">
+            <param name="source_jdk_version" value="1.8"/>
+            <param name="target_jdk_version" value="1.8"/>
+            <param name="compile_jdk_version" value="${jdk.home}"/>
+            <param name="compile_files" value="${basedir}/src"/>
+        </antcall>
+        <echo message="compile plugin success!"/>
+
+        <antcall target="jar_classes">
+            <param name="jar_name" value="${plugin-jar}"/>
+        </antcall>
+        <delete dir="${classes}"/>
+    </target>
+
+    <target name="jar" depends="super_jar">
+        <antcall target="zip"/>
+    </target>
+
+    <target name="zip">
+        <property name="plugin-folder" value="fr-plugin-${plugin-name}-${plugin-version}"/>
+        <echo message="----------zip files----------"/>
+        <mkdir dir="${plugin-folder}"/>
+        <copy todir="${plugin-folder}">
+            <fileset dir=".">
+                <include name="${plugin-jar}"/>
+                <include name="plugin.xml"/>
+            </fileset>
+            <fileset dir="${libs}">
+                <include name="*.jar"/>
+                <include name="*.dll"/>
+            </fileset>
+        </copy>
+        <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
+            <include name="${plugin-folder}/*.jar"/>
+            <include name="${plugin-folder}/*.dll"/>
+            <include name="${plugin-folder}/plugin.xml"/>
+        </zip>
+        <xmlproperty file="${basedir}/plugin.xml"/>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
+        <delete dir="${plugin-folder}"/>
+    </target>
+</project>

src/main/java/com/fanruan/fs/s3/repository/core/S3Config.java

@@ -1,8 +1,8 @@
 package com.fanruan.fs.s3.repository.core;
 
+import com.fanruan.api.conf.HolderKit;
 import com.fr.config.Identifier;
 import com.fr.config.holder.Conf;
-import com.fr.config.holder.factory.Holders;
 import com.fr.io.config.CommonRepoConfig;
 import com.fr.io.context.ResourceModuleContext;
 import com.fr.io.context.info.GetConfig;
@@ -21,19 +21,16 @@ public class S3Config extends CommonRepoConfig {
     }
 
     @Identifier("endPoint")
-    private Conf<String> endPoint = Holders.simple(StringUtils.EMPTY);
+    private Conf<String> endPoint = HolderKit.simple(StringUtils.EMPTY);
 
     @Identifier("region")
-    private Conf<String> region = Holders.simple(StringUtils.EMPTY);
+    private Conf<String> region = HolderKit.simple(StringUtils.EMPTY);
 
     @Identifier("accessKeyId")
-    private Conf<String> accessKeyId = Holders.simple(StringUtils.EMPTY);
+    private Conf<String> accessKeyId = HolderKit.simple(StringUtils.EMPTY);
-
-    @Identifier("accessKeySecret")
-    private Conf<String> accessKeySecret = Holders.simple(StringUtils.EMPTY);
 
     @Identifier("bucket")
-    private Conf<String> bucket = Holders.simple(StringUtils.EMPTY);
+    private Conf<String> bucket = HolderKit.simple(StringUtils.EMPTY);
 
     @GetConfig("endPoint")
     public String getEndPoint() {
@@ -65,16 +62,6 @@ public class S3Config extends CommonRepoConfig {
         this.accessKeyId.set(accessKeyId);
     }
 
-    @GetConfig("accessKeySecret")
-    public String getAccessKeySecret() {
-        return accessKeySecret.get();
-    }
-
-    @SetConfig("accessKeySecret")
-    public void setAccessKeySecret(String accessKeySecret) {
-        this.accessKeySecret.set(accessKeySecret);
-    }
-
     @GetConfig("bucket")
     public String getBucket() {
         return bucket.get();
@@ -93,7 +80,6 @@ public class S3Config extends CommonRepoConfig {
             this.setEndPoint(newConfig.getEndPoint());
             this.setRegion(newConfig.getRegion());
             this.setAccessKeyId(newConfig.getAccessKeyId());
-            this.setAccessKeySecret(newConfig.getAccessKeySecret());
             this.setBucket(newConfig.getBucket());
         }
     }
@@ -104,7 +90,6 @@ public class S3Config extends CommonRepoConfig {
         cloned.endPoint = (Conf<String>) endPoint.clone();
         cloned.region = (Conf<String>) region.clone();
         cloned.accessKeyId = (Conf<String>) accessKeyId.clone();
-        cloned.accessKeySecret = (Conf<String>) accessKeySecret.clone();
         cloned.bucket = (Conf<String>) bucket.clone();
         return cloned;
     }

src/main/java/com/fanruan/fs/s3/repository/core/S3RepositoryFactory.java

@@ -36,7 +36,7 @@ public class S3RepositoryFactory extends ConfigRepositoryFactory<S3Config> {
     @Override
     public boolean verifyConfig(S3Config config) {
         try {
-            BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getAccessKeySecret());
+            BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getPassword());
             AmazonS3 s3 = AmazonS3ClientBuilder.standard()
                     .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.getEndPoint(), config.getRegion()))
                     .withCredentials(new AWSStaticCredentialsProvider(credentials)).build();

src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

@@ -43,7 +43,7 @@ public class S3ResourceRepository extends BaseResourceRepository {
 
     public S3ResourceRepository(String repoName, String workRoot, S3Config config) {
         super(repoName, workRoot);
-        BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getAccessKeySecret());
+        BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getPassword());
         this.s3 = AmazonS3ClientBuilder.standard()
                 .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(config.getEndPoint(), config.getRegion()))
                 .withCredentials(new AWSStaticCredentialsProvider(credentials)).build();

src/main/resources/com/fanruan/fs/s3/repository/web/js/bundle.js

@@ -91,21 +91,18 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
                         }]
                     },
                     {
-                        type: "dec.label.editor.item",
+                        type: "dec.common.cipher.editor",
                         textWidth: LABEL_WIDTH,
                         editorWidth: EDITOR_WIDTH,
                         watermark: BI.i18nText("Plugin-S3_Access_Key_Secret"),
                         text: BI.i18nText("Plugin-S3_Access_Key_Secret"),
-                        value: "******",
+                        value: this.model.password,
                         el: {
                             disabled: !o.editable,
                         },
-                        listeners: [{
+                        ref: function (_ref) {
-                            eventName: BI.Editor.EVENT_CHANGE,
+                            self.passwordRow = _ref;
-                            action: function () {
-                                self.store.setAccessKeySecret(this.getValue());
                         }
-                        }]
                     },
                     {
                         type: "dec.label.editor.item",
@@ -132,7 +129,7 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
                 endPoint: this.model.endPoint,
                 region: this.model.region,
                 accessKeyId: this.model.accessKeyId,
-                accessKeySecret: this.model.accessKeySecret,
+                password: this.passwordRow.getCipher(),
                 bucket: this.model.bucket
             };
         },
@@ -151,7 +148,7 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
                 endPoint: val.endPoint,
                 region: val.region,
                 accessKeyId: val.accessKeyId,
-                accessKeySecret: val.accessKeySecret,
+                password: val.password,
                 bucket: val.bucket
             };
         },
@@ -179,9 +176,6 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
                 this.model.accessKeyId = v;
             },
 
-            setAccessKeySecret: function (v) {
-                this.model.accessKeySecret = v;
-            },
             setBucket: function (v) {
                 this.model.bucket = v;
             }