Merge remote-tracking branch 'origin/master'

Author: wushengyeyouya

dss-framework/dss-framework-orchestrator-server/pom.xml

@@ -149,6 +149,22 @@
             <version>${dss.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.linkis</groupId>
+            <artifactId>linkis-storage-script-dev-server</artifactId>
+            <version>${linkis.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-context-support</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.linkis</groupId>
+            <artifactId>linkis-storage</artifactId>
+            <version>${linkis.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java

@@ -17,6 +17,7 @@
 package com.webank.wedatasphere.dss.orchestrator.server.restful;
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.label.LabelKeyConvertor;
@@ -31,8 +32,11 @@
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
 import org.apache.commons.io.IOUtils;
+import org.apache.linkis.common.io.FsPath;
+import org.apache.linkis.filesystem.service.FsService;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.security.SecurityFilter;
+import org.apache.linkis.storage.fs.FileSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +61,8 @@ public class OrchestratorIERestful {
     @Autowired
     private BMLService bmlService;
     @Autowired
+    private FsService fsService;
+    @Autowired
     OrchestratorService orchestratorService;
     @Autowired
     private DSSOrchestratorContext orchestratorContext;
@@ -66,30 +72,43 @@ public Message importOrcFile(HttpServletRequest req,
                                   @RequestParam(required = false, name = "projectName") String projectName,
                                   @RequestParam(required = false, name = "projectID") Long projectID,
                                   @RequestParam(required = false, name = "labels") String labels,
-                                  @RequestParam(required = false, name = "file") List<MultipartFile> files) throws DSSErrorException, Exception {
-        if (null == files || files.size() == 0) {
+                                  @RequestParam(required = false, name = "packageFile") MultipartFile packageFile,
+                                  @RequestParam(required = false, name = "packageUri") String packageUri) throws Exception {
+
+        if (null == packageFile && packageUri == null) {
             throw new DSSErrorException(100788, "Import orchestrator failed for files is empty");
         }
-        Long importOrcId = 0L;
-        for (MultipartFile p : files) {
-            InputStream inputStream = p.getInputStream();
-            String fileName = new String(p.getOriginalFilename().getBytes("ISO8859-1"), "UTF-8");
-            String userName = SecurityFilter.getLoginUsername(req);
-            //调用工具类生产label
-            List<DSSLabel> dssLabelList = getDSSLabelList(labels);
-            Workspace workspace = SSOHelper.getWorkspace(req);
+        String userName = SecurityFilter.getLoginUsername(req);
+        //调用工具类生产label
+        List<DSSLabel> dssLabelList = getDSSLabelList(labels);
+        Workspace workspace = SSOHelper.getWorkspace(req);
+        InputStream inputStream;
+        String fileName;
+        if (packageFile != null) {
+            inputStream = packageFile.getInputStream();
+            fileName = new String(packageFile.getOriginalFilename().getBytes("ISO8859-1"), "UTF-8");
             //3、打包新的zip包上传BML
-            Map<String, Object> resultMap = bmlService.upload(userName, inputStream,
-                    fileName, projectName);
-            try {
-                RequestImportOrchestrator importRequest = new RequestImportOrchestrator(userName, projectName,
-                        projectID, resultMap.get("resourceId").toString(),
-                        resultMap.get("version").toString(), null, dssLabelList, workspace);
-                importOrcId = orchestratorContext.getDSSOrchestratorPlugin(ImportDSSOrchestratorPlugin.class).importOrchestrator(importRequest);
-            } catch (Exception e) {
-                logger.error("Import orchestrator failed for ", e);
-                throw new DSSErrorException(100789, "Import orchestrator failed for " + e.getMessage());
+            logger.info("User {} begin to import orchestrator file", userName);
+        } else {
+            FsPath fsPath = new FsPath(packageUri);
+            FileSystem fileSystem = fsService.getFileSystem(userName, fsPath);
+            if ( !fileSystem.exists(fsPath) ) {
+                throw new DSSRuntimeException("路径上不存在文件！");
             }
+            inputStream = fileSystem.read(fsPath);
+            fileName = packageUri.substring(packageUri.lastIndexOf('/') + 1);
+        }
+
+        Map<String, Object> resultMap = bmlService.upload(userName, inputStream, fileName, projectName);
+        Long importOrcId;
+        try {
+            RequestImportOrchestrator importRequest = new RequestImportOrchestrator(userName, projectName,
+                    projectID, resultMap.get("resourceId").toString(),
+                    resultMap.get("version").toString(), null, dssLabelList, workspace);
+            importOrcId = orchestratorContext.getDSSOrchestratorPlugin(ImportDSSOrchestratorPlugin.class).importOrchestrator(importRequest);
+        } catch (Exception e) {
+            logger.error("Import orchestrator failed for ", e);
+            throw new DSSErrorException(100789, "Import orchestrator failed for " + e.getMessage());
         }
         return Message.ok().data("importOrcId", importOrcId);
     }

plugins/dolphinscheduler/dolphinscheduler-prod-metrics/src/main/java/org/apache/dolphinscheduler/api/configuration/DssSSOConfiguration.java

@@ -1,7 +1,7 @@
 package org.apache.dolphinscheduler.api.configuration;
 
+import com.webank.wedatasphere.dss.standard.app.sso.origin.filter.spring.SpringOriginSSOPluginFilter;
 import com.webank.wedatasphere.dss.standard.app.sso.plugin.filter.SSOPluginFilter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,10 +15,10 @@
 public class DssSSOConfiguration {
 
     @Bean
-    public FilterRegistrationBean<SSOPluginFilter> dssSSOInterceptor(@Autowired SSOPluginFilter ssoPluginFilter) {
+    public FilterRegistrationBean<SSOPluginFilter> dssSSOInterceptor() {
         FilterRegistrationBean<SSOPluginFilter> filter = new FilterRegistrationBean<>();
         filter.setName("dssSSOFilter");
-        filter.setFilter(ssoPluginFilter);
+        filter.setFilter(new SpringOriginSSOPluginFilter());
         filter.setOrder(-1);
         return filter;
     }