Merge branch 'feature/index' into 'develop'

fix schema

See merge request o2oa/o2oa!1261

o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java

@@ -271,7 +271,8 @@ public class PersistenceXmlHelper {
         Properties properties = propertiesBaseSlice(className);
         properties.put("openjpa.jdbc.DBDictionary", Config.externalDataSources().dictionary());
         /* 如果是DB2 添加 Schema,mysql 不需要Schema 如果用了Schema H2数据库就会报错说没有Schema */
-        if (Config.externalDataSources().hasSchema()) {
+        if (Config.externalDataSources().hasSchema()
+                && (StringUtils.isNotBlank(Config.externalDataSources().schema()))) {
             properties.put("openjpa.jdbc.Schema", Config.externalDataSources().schema());
         }
         properties.put("openjpa.slice.Names",
@@ -315,7 +316,8 @@ public class PersistenceXmlHelper {
         Properties properties = propertiesBaseSingle(className);
         properties.put("openjpa.jdbc.DBDictionary", Config.externalDataSources().dictionary());
         /* 如果是DB2 添加 Schema,mysql 不需要Schema 如果用了Schema H2数据库就会报错说没有Schema */
-        if (Config.externalDataSources().hasSchema()) {
+        if (Config.externalDataSources().hasSchema()
+                && (StringUtils.isNotBlank(Config.externalDataSources().schema()))) {
             properties.put("openjpa.jdbc.Schema", Config.externalDataSources().schema());
         }
         if (StringUtils.isNotEmpty(Config.externalDataSources().getTransactionIsolation())) {

o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SlicePropertiesBuilder.java

@@ -129,7 +129,7 @@ public class SlicePropertiesBuilder {
         } else if (StringUtils.containsIgnoreCase(url, "jdbc:mysql:")) {
             return false;
         } else if (StringUtils.containsIgnoreCase(url, "jdbc:postgresql:")) {
-            return false;
+            return true;
         } else if (StringUtils.containsIgnoreCase(url, "jdbc:informix-sqli:")) {
             return true;
         } else if (StringUtils.containsIgnoreCase(url, "jdbc:gbasedbt-sqli:")) {