Fix bugs

1) Cannot connect to mysql database.
2) Lost port config when udpate password of workspace.
3) Change package name in pom.

.gitignore

@@ -7,3 +7,4 @@ target
 *.lock.db
 *.log
 .DS_Store
+*.trace.db

server/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.sdp</groupId>
+    <groupId>cn.mysdp</groupId>
     <artifactId>sdp-root</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>

server/sdp/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>cn.sdp</groupId>
+        <groupId>cn.mysdp</groupId>
         <artifactId>sdp-root</artifactId>
         <version>1.0.0</version>
     </parent>

server/sdp/src/main/java/cn/mysdp/biz/facade/ProcessSQLFacadeImpl.java

@@ -3,7 +3,6 @@
 import cn.mysdp.biz.domain.*;
 import cn.mysdp.biz.dto.request.BaseNameRequest;
 import cn.mysdp.biz.dto.request.SdpWorkspaceAddRequest;
-import cn.mysdp.biz.dto.request.SdpWorkspaceQueryRequest;
 import cn.mysdp.biz.dto.request.SdpWorkspaceUpdateRequest;
 import cn.mysdp.biz.dto.response.SdpProjectQueryResponse;
 import cn.mysdp.biz.dto.response.SdpTemplateQueryResponse;
@@ -51,7 +50,6 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-import static cn.mysdp.utils.ByteWithPos.appendDestBytes;
 import static org.mybatis.generator.internal.util.StringUtility.escapeStringForJava;
 
 /**
@@ -83,9 +81,6 @@ public class ProcessSQLFacadeImpl extends BaseFacadeImpl implements ProcessSQLFa
     @Autowired
     SdpWorkspaceMapper sdpWorkspaceMapper;
 
-    @Autowired
-    SdpWorkspaceFacade sdpWorkspaceFacade;
-
     @Autowired
     SdpSqlMapper sdpSqlMapper;
 
@@ -111,6 +106,9 @@ public String decryptDbPassword(SdpWorkspaceQueryResponse record) throws Excepti
         String dbHost = record.getDbHost();
         String dbUsername = record.getDbUsername();
         String dbPassword = record.getDbPassword();
+        if (StringUtils.isEmpty(dbPassword)) {
+            return dbPassword;
+        }
 
         String data = dbPassword;
 
@@ -277,13 +275,16 @@ public Integer execute(BaseNameRequest request, Object _processInstance, Method
 
         Map<String, SdpWorkspaceQueryResponse> sdpWorkspaceMap = new HashMap<>();
         {
-            SdpWorkspaceQueryRequest example = new SdpWorkspaceQueryRequest();
-            if (jsonObject.containsKey("workspace_name")) {
-                example.setName(jsonObject.getString("workspace_name"));
-            }
-            List<SdpWorkspaceQueryResponse> list = sdpWorkspaceFacade.listSdpWorkspaceByExampleWithBLOBs(example);
-            for(SdpWorkspaceQueryResponse item: list) {
-                sdpWorkspaceMap.put(item.getName(), item);
+            SdpWorkspaceExample example = new SdpWorkspaceExample();
+            if (jsonObject.containsKey("workspace_name") && !StringUtils.isEmpty(jsonObject.getString("workspace_name"))) {
+                example.createCriteria().andNameEqualTo(jsonObject.getString("workspace_name"));
+            }
+            //这里不能调用facade的list方法，因为facade中的list已经将密码隐藏了
+            List<SdpWorkspaceWithBLOBs> list = sdpWorkspaceMapper.selectByExampleWithBLOBs(example);
+            for(SdpWorkspaceWithBLOBs item: list) {
+                SdpWorkspaceQueryResponse newItem = new SdpWorkspaceQueryResponse();
+                BeanUtils.copyProperties(item, newItem);
+                sdpWorkspaceMap.put(item.getName(), newItem);
 
                 if ("org.h2.Driver".equals(item.getDbClassname()) && getH2Workspace() != null) {
                     if (StringUtils.isEmpty(item.getDbDatabase())) {
@@ -456,11 +457,14 @@ public Integer execute(BaseNameRequest request, Object _processInstance, Method
                 ex.printStackTrace();
                 if (ex instanceof SQLNonTransientConnectionException) {
                     Throwable ex1 = ((SQLNonTransientConnectionException)ex).getCause();
+                    if (ex1 == null) {
+                        throw new Exception("无法连接到数据库："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+"("+ex.getMessage()+")");
+                    }
                     if (ex1.getMessage().indexOf("Access denied for user") >= 0) {
-                        throw new Exception("数据库无权限或密码错误："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+"("+ex1.getMessage()+")");
+                        throw new Exception("数据库无权限或密码错误："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+"("+ex1.getMessage()+")"+","+ex.getMessage());
                     }
 
-                    throw new Exception("无法连接到数据库："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+":"+workspace.getDbPassword()+"("+ex1.getMessage()+")");
+                    throw new Exception("无法连接到数据库："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+"("+ex1.getMessage()+")"+","+ex.getMessage());
 
                 }
                 throw new Exception("无法连接到数据库："+workspaceName+",数据库："+workspace.getDbHost()+":"+workspace.getDbPort()+"@"+workspace.getDbUsername()+":"+workspace.getDbPassword()+"("+ex.getMessage()+")");

server/sdp/src/main/resources/application-dev.yml

@@ -4,13 +4,16 @@ server:
 spring:
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:~/test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
+    url: jdbc:h2:~/sdp;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
     username: sa
     password:
+    initialize: true
   h2:
     console:
       enabled: true
       path: /db
+      web-allow-others: true
+      trace: true
 
 mybatis:
   mapper-locations: classpath:mapper/*.xml