Index: forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java =================================================================== diff -u -r38722 -r38739 --- forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java (.../UpdateDataBetween2VersionByExecSqls.java) (revision 38722) +++ forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java (.../UpdateDataBetween2VersionByExecSqls.java) (revision 38739) @@ -104,9 +104,7 @@ msg = String.format("%s升级语句为空!", fileName); dataUpdater.logWorning(msg); } - if (dbConnection.isSqlServer()) { - - } else if (dbConnection.isOracle()) { + if (dbConnection.isOracle()) { updateSqls = "begin "+updateSqls+" end;"; } // 开始执行升级语句 Index: ssts-web/src/main/resources/jdbc.properties =================================================================== diff -u -r35945 -r38739 --- ssts-web/src/main/resources/jdbc.properties (.../jdbc.properties) (revision 35945) +++ ssts-web/src/main/resources/jdbc.properties (.../jdbc.properties) (revision 38739) @@ -102,6 +102,14 @@ #jdbc.username=dHR0 #jdbc.password=dHR0 +#MySQL(root/p2ssword) +#database=tidb +#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#jdbc.driverClassName=com.mysql.jdbc.Driver +#jdbc.url=jdbc:mysql://192.168.20.128:4000/gzszyySterile?useUnicode=true&characterEncoding=UTF-8 +#jdbc.username=cm9vdA== +#jdbc.password=cDJzc3dvcmQ= + #MySQL #database=mysql #hibernate.dialect=org.hibernate.dialect.MySQL5Dialect Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java =================================================================== diff -u -r38737 -r38739 --- forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java (.../ObjectDaoImpl.java) (revision 38737) +++ forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java (.../ObjectDaoImpl.java) (revision 38739) @@ -1147,7 +1147,7 @@ updateSql = updateSql + ";"; } if(dbConnection.isMySQLOrTiDB()){ - List sqls = splitSQLStatements(sqlsText); + List sqls = splitSQLStatements(updateSql); for (String sql : sqls){ statement.addBatch(sql); } @@ -1177,6 +1177,11 @@ } + /** + * 将多行的sql语句转换为List集合 + * @param sqls + * @return + */ private List splitSQLStatements(String sqls){ List sqlStatements = new ArrayList(); if(StringUtils.isBlank(sqls)){ @@ -1185,8 +1190,10 @@ try { Statements statements = CCJSqlParserUtil.parseStatements(sqls); List list = statements.getStatements(); - for (net.sf.jsqlparser.statement.Statement statement : list) { - sqlStatements.add(statement.toString()); + if(CollectionUtils.isNotEmpty(list)){ + for (net.sf.jsqlparser.statement.Statement statement : list) { + sqlStatements.add(statement.toString()); + } } } catch (JSQLParserException e) { e.printStackTrace();