处理未扫描到的mybatis包

Author: SunPengWan

conf/dss-server.properties

@@ -15,7 +15,7 @@ wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss
 
 wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.application.entity,com.webank.wedatasphere.dss.common.entity,com.webank.wedatasphere.dss.framework.workspace.bean,com.webank.wedatasphere.dss.framework.project.entity,com.webank.wedatasphere.dss.framework.appconn.entity,com.webank.wedatasphere.dss.framework.release.entity,com.webank.wedatasphere.dss.framework.admin.pojo.entity,com.webank.wedatasphere.dss.server.entity,com.webank.wedatasphere.dss.application.entity,com.webank.wedatasphere.dss.framework.appconn.entity,com.webank.wedatasphere.dss.workflow.entity,com.webank.wedatasphere.dss.framework.appconn.entity,com.webank.wedatasphere.dss.scriptis.pojo.entity,com.webank.wedatasphere.dss.common.entity,com.webank.wedatasphere.dss.guide.server.entity
 
-wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.framework.workspace.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.framework.project.dao,com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.framework.release.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.framework.admin.xml,com.webank.wedatasphere.dss.common.server.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.flow.execution.entrance.dao,org.apache.linkis.jobhistory.dao,com.webank.wedatasphere.dss.workflow.dao,com.webank.wedatasphere.dss.scriptis.dao,com.webank.wedatasphere.dss.common.dao,com.webank.wedatasphere.dss.guide.server.dao
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.publicservice.common.lock.dao,com.webank.wedatasphere.dss.framework.workspace.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.framework.project.dao,com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.framework.release.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.framework.admin.xml,com.webank.wedatasphere.dss.common.server.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.flow.execution.entrance.dao,org.apache.linkis.jobhistory.dao,com.webank.wedatasphere.dss.workflow.dao,com.webank.wedatasphere.dss.scriptis.dao,com.webank.wedatasphere.dss.common.dao,com.webank.wedatasphere.dss.guide.server.dao
 
 ####project
 wds.dss.appconn.checker.development.ignore.list=orchestrator-framework,workflow,sendemail,sparketl

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

@@ -201,17 +201,6 @@
             <version>${dss.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.linkis</groupId>
-            <artifactId>linkis-pes-publicservice</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>

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

@@ -38,11 +38,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.Fs;
 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.apache.linkis.storage.FSFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +58,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -69,8 +70,6 @@ public class OrchestratorIERestful {
     @Qualifier("orchestratorBmlService")
     private BMLService bmlService;
     @Autowired
-    private FsService fsService;
-    @Autowired
     OrchestratorService orchestratorService;
     @Autowired
     private DSSOrchestratorContext orchestratorContext;
@@ -93,22 +92,25 @@ public Message importOrcFile(HttpServletRequest req,
         Workspace workspace = SSOHelper.getWorkspace(req);
         InputStream inputStream;
         String fileName;
+        BmlResource resultMap=null;
         if (packageFile != null) {
             inputStream = packageFile.getInputStream();
             fileName = new String(packageFile.getOriginalFilename().getBytes("ISO8859-1"), "UTF-8");
             //3、打包新的zip包上传BML
             logger.info("User {} begin to import orchestrator file", userName);
+            resultMap = bmlService.upload(userName, inputStream, fileName, projectName);
         } else {
             FsPath fsPath = new FsPath(packageUri);
-            FileSystem fileSystem = fsService.getFileSystem(userName, fsPath);
-            if ( !fileSystem.exists(fsPath) ) {
-                throw new DSSRuntimeException("路径上不存在文件！");
+            try(Fs fileSystem = FSFactory.getFsByProxyUser(fsPath, userName)) {
+                fileSystem.init(new HashMap<String, String>());
+                if (!fileSystem.exists(fsPath)) {
+                    throw new DSSRuntimeException("路径上不存在文件！");
+                }
+                inputStream = fileSystem.read(fsPath);
+                fileName = packageUri.substring(packageUri.lastIndexOf('/') + 1);
+                resultMap = bmlService.upload(userName, inputStream, fileName, projectName);
             }
-            inputStream = fileSystem.read(fsPath);
-            fileName = packageUri.substring(packageUri.lastIndexOf('/') + 1);
         }
-
-        BmlResource resultMap = bmlService.upload(userName, inputStream, fileName, projectName);
         DSSOrchestratorVersion dssOrchestratorVersion;
         try {
             RequestImportOrchestrator importRequest = new RequestImportOrchestrator(userName, projectName,