Merge pull request lowcoder-org#235 from neon-balcony/develop

neon-balcony · web-flow · commit bbb8d5297133 · 2023-02-03T17:23:34.000+08:00
feat: support instance name for SQL server &amp; change LOGIN_CHANNEL_EMAIL_REGISTER to ENABLE_USER_SIGN_UP
diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlConnector.java b/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlConnector.java
@@ -16,7 +16,6 @@
 
 import javax.annotation.Nonnull;
 
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.pf4j.Extension;
 
@@ -129,11 +128,20 @@ private HikariDataSource createHikariDataSource(MssqlDatasourceConfig datasource
         String database = datasourceConfig.getDatabase();
 
         StringBuilder urlBuilder = new StringBuilder();
-        urlBuilder.append("jdbc:sqlserver://")
-                .append(host)
-                .append(":")
-                .append(ObjectUtils.defaultIfNull(port, 5432L))
-                .append(";");
+        urlBuilder.append("jdbc:sqlserver://");
+
+        // SQL Server supports instanceName like this: jdbc:sqlserver://INNOWAVE-99\SQLEXPRESS01;databaseName=EDS
+        // And when host contains instanceName, port should be ignored, see https://stackoverflow.com/a/40830281/2139436
+        if (host.contains("\\")) {
+            urlBuilder.append(host)
+                    .append(";");
+        } else {
+            urlBuilder.append(host)
+                    .append(":")
+                    .append(port)
+                    .append(";");
+        }
+
 
         if (isNotBlank(database)) {
             urlBuilder.append("database=")
diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml b/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml
@@ -10,7 +10,7 @@ common:
 auth:
   email:
     enable: ${LOGIN_CHANNEL_EMAIL:true}
-    enable-register: ${LOGIN_CHANNEL_EMAIL_REGISTER:true}
+    enable-register: ${ENABLE_USER_SIGN_UP:true}
 
 spring:
   data:
diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml
@@ -1,7 +1,7 @@
 auth:
   email:
     enable: true
-    enable-register: true
+    enable-register: ${ENABLE_USER_SIGN_UP:true}
 
 spring:
   data:
