diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/ServerExceptionHandler.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/ServerExceptionHandler.ts index 25ef2344..0321709d 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/ServerExceptionHandler.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/ServerExceptionHandler.ts @@ -24,7 +24,12 @@ class ServerExceptionHandler { } public static handle(error: ResponseErrorType) { - NotifyManager.error(i18n.global.t(error?.errorMessageI18nKey)); + const message = i18n.global.t(error?.errorMessageI18nKey); + if (error?.errorMessageI18nKey === message) { + NotifyManager.error(i18n.global.t('java.lang.Exception')); + } else { + NotifyManager.error(message); + } } public static getError(error: any): ResponseErrorType { diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/ApplicationLauncher.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/ApplicationLauncher.java index 93da1746..94c9299d 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/ApplicationLauncher.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/ApplicationLauncher.java @@ -32,7 +32,6 @@ public class ApplicationLauncher { private static KeepApplicationNotCloseThread notCloseThread; private ApplicationLauncher(){ - } public static ConfigurableApplicationContext run(Class primarySource, String... args) throws IOException { diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml index 4df1a654..72deaf3c 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml @@ -27,7 +27,7 @@ ${homedir}/logs/log.log ${homedir}/logs/log.%d.%i.log - 30 + 180 100MB @@ -41,7 +41,7 @@ ${homedir}/logs/debug.log ${homedir}/logs/debug.%d.%i.log - 30 + 180 100MB @@ -57,7 +57,7 @@ ${homedir}/logs/info.log ${homedir}/logs/info.%d.%i.log - 30 + 180 100MB @@ -73,7 +73,7 @@ ${homedir}/logs/warn.log ${homedir}/logs/warn.%d.%i.log - 30 + 180 100MB @@ -89,7 +89,7 @@ ${homedir}/logs/error.log ${homedir}/logs/error.%d.%i.log - 30 + 180 100MB diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception.properties index 682d304a..aa452db2 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception.properties @@ -1,3 +1,4 @@ +java.lang.Exception=Server Error\uFF01 Please try again. io.sc.platform.core.response.ValidateException=Request Parameter Validate Error io.sc.platform.core.exception.PasswordStrengthException=Password must contain uppercase, lowercase, numbers, special characters, and must be greater than or equal to {0} in length. io.sc.platform.core.exception.LicenseInvalidatedException=License Invalidated! \ No newline at end of file diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_tw_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_tw_CN.properties index 3a20e6b4..0235b712 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_tw_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_tw_CN.properties @@ -1,3 +1,4 @@ +java.lang.Exception=\u670D\u52D9\u5668\u932F\u8AA4\uFF01\u8ACB\u91CD\u65B0\u5617\u8A66\u4E00\u6B21. io.sc.platform.core.response.ValidateException=\u8ACB\u6C42\u53C3\u6578\u9A57\u8B49\u932F\u8AA4 io.sc.platform.core.exception.PasswordStrengthException=\u5BC6\u78BC\u5FC5\u9808\u5305\u542B:\u5927\u5BEB\u5B57\u6BCD\u3001\u5C0F\u5BEB\u5B57\u6BCD\u3001\u6578\u5B57\u3001\u7279\u6B8A\u5B57\u7B26, \u4E14\u9577\u5EA6\u5FC5\u9808\u5927\u65BC\u7B49\u65BC {0} \u4E2A\u3002 io.sc.platform.core.exception.LicenseInvalidatedException=\u8A31\u53EF\u8B49\u5931\u6548! \ No newline at end of file diff --git a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_zh_CN.properties b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_zh_CN.properties index 0c8bec89..d3e0b124 100644 --- a/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_zh_CN.properties +++ b/io.sc.platform.core/src/main/resources/io/sc/platform/core/i18n/exception_zh_CN.properties @@ -1,3 +1,4 @@ +java.lang.Exception=\u670D\u52A1\u5668\u9519\u8BEF\uFF01\u8BF7\u91CD\u65B0\u5C1D\u8BD5\u4E00\u6B21. io.sc.platform.core.response.ValidateException=\u8BF7\u6C42\u53C2\u6570\u9A8C\u8BC1\u9519\u8BEF io.sc.platform.core.exception.PasswordStrengthException=\u5BC6\u7801\u5FC5\u987B\u5305\u542B:\u5927\u5199\u5B57\u6BCD\u3001\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u7279\u6B8A\u5B57\u7B26, \u4E14\u957F\u5EA6\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E {0} \u4E2A\u3002 io.sc.platform.core.exception.LicenseInvalidatedException=\u8BB8\u53EF\u8BC1\u5931\u6548! \ No newline at end of file diff --git a/io.sc.platform.developer.doc/asciidoc/9999-appendix/appendix.adoc b/io.sc.platform.developer.doc/asciidoc/9999-appendix/appendix.adoc index b516d0be..bce3d86f 100644 --- a/io.sc.platform.developer.doc/asciidoc/9999-appendix/appendix.adoc +++ b/io.sc.platform.developer.doc/asciidoc/9999-appendix/appendix.adoc @@ -7,6 +7,7 @@ include::docker-compose/docker-compose.adoc[] include::docker/docker.adoc[] include::idea/idea.adoc[] include::tools/tools.adoc[] +include::sql/sql.adoc[] include::javascript/javascript.adoc[] include::frontend/frontend.adoc[] include::mac/mac.adoc[] diff --git a/io.sc.platform.developer.doc/asciidoc/9999-appendix/sql/sql.adoc b/io.sc.platform.developer.doc/asciidoc/9999-appendix/sql/sql.adoc new file mode 100644 index 00000000..38ff4678 --- /dev/null +++ b/io.sc.platform.developer.doc/asciidoc/9999-appendix/sql/sql.adoc @@ -0,0 +1,4 @@ +[appendix] += SQL +== join +image::9999-appendix/sql/sql-join.png[] diff --git a/io.sc.platform.developer.doc/asciidoc/resources/images/9999-appendix/sql/sql-join.png b/io.sc.platform.developer.doc/asciidoc/resources/images/9999-appendix/sql/sql-join.png new file mode 100644 index 00000000..e077a7cf Binary files /dev/null and b/io.sc.platform.developer.doc/asciidoc/resources/images/9999-appendix/sql/sql-join.png differ diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/CsvExporter.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/CsvExporter.java index 43555a6f..f76a79b2 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/CsvExporter.java +++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/CsvExporter.java @@ -9,6 +9,7 @@ import io.sc.platform.jdbc.meta.support.Column; import io.sc.platform.jdbc.meta.support.Table; import io.sc.platform.jdbc.util.SqlTypeUtil; import io.sc.platform.util.FileUtil; +import io.sc.platform.util.OsUtil; import io.sc.platform.util.WriterUtil; import liquibase.repackaged.com.opencsv.CSVWriterBuilder; import liquibase.repackaged.com.opencsv.ICSVWriter; @@ -18,9 +19,8 @@ import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.util.StringUtils; import javax.sql.DataSource; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; +import java.io.*; +import java.nio.charset.StandardCharsets; import java.sql.*; import java.util.ArrayList; import java.util.Base64; @@ -32,7 +32,9 @@ public class CsvExporter { public void export(String outputBasePath,DataSource dataSource, DataExportConfigure configure, ProgressInfo progressInfo, Locale locale) throws Exception{ String outputDir =outputBasePath + "/src/main/resources/liquibase/data"; - FileUtil.deldirs(outputDir); + if(!OsUtil.isWindows()){ + FileUtil.deldirs(outputDir); + } new File(outputDir).mkdirs(); if(!configure.getIsExportDataCsvFile()) { @@ -60,6 +62,7 @@ public class CsvExporter { private void writeTable(String outputDir,DataSource dataSource,Table table,DataExportConfigure configure,ProgressInfo progressInfo, Locale locale) throws Exception{ BufferedWriter writer = WriterUtil.bufferedWriter(outputDir + "/" + table.getName() + ".csv"); + //Writer writer =new OutputStreamWriter(new FileOutputStream(outputDir + "/" + table.getName() + ".csv"), StandardCharsets.UTF_8); ICSVWriter csvWriter = new CSVWriterBuilder(writer).build(); //写入字段定义信息=============================================================================== diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/PluginExporter.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/PluginExporter.java index a31b7484..0c305513 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/PluginExporter.java +++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/PluginExporter.java @@ -3,6 +3,7 @@ package io.sc.platform.jdbc.liquibase.exporter; import io.sc.platform.core.support.ProgressInfo; import io.sc.platform.jdbc.exporter.support.DataExportConfigure; import io.sc.platform.util.FileUtil; +import io.sc.platform.util.OsUtil; import javax.sql.DataSource; import java.io.File; @@ -11,7 +12,9 @@ import java.util.Locale; public class PluginExporter { public void export(String outputBasePath, DataSource dataSource, DataExportConfigure configure, ProgressInfo progressInfo, Locale locale) throws Exception { String outputDir =outputBasePath + "/src/main/resources/META-INF/platform/plugins"; - FileUtil.deldirs(outputDir); + if(!OsUtil.isWindows()){ + FileUtil.deldirs(outputDir); + } new File(outputDir).mkdirs(); if(!configure.getIsExportPlatformLiquibasePluginFile()){ diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/SchemaExporter.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/SchemaExporter.java index 95dc631c..38ff7ffa 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/SchemaExporter.java +++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/exporter/SchemaExporter.java @@ -9,6 +9,8 @@ import io.sc.platform.jdbc.meta.support.Column; import io.sc.platform.jdbc.meta.support.Index; import io.sc.platform.jdbc.meta.support.Table; import io.sc.platform.util.FileUtil; +import io.sc.platform.util.OsUtil; +import io.sc.platform.util.StringUtil; import io.sc.platform.util.WriterUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +27,9 @@ public class SchemaExporter { public void export(String outputBasePath, DataSource dataSource, DataExportConfigure configure, ProgressInfo progressInfo, Locale locale) throws Exception{ String outputDir =outputBasePath + "/src/main/resources/liquibase/schema"; - FileUtil.deldirs(outputDir); + if(!OsUtil.isWindows()){ + FileUtil.deldirs(outputDir); + } new File(outputDir).mkdirs(); if(!configure.getIsExportTableSchemaLiquibaseFile()) { diff --git a/io.sc.platform.mvc/src/main/resources/templates/configure.js b/io.sc.platform.mvc/src/main/resources/templates/configure.js index fb5063e9..125c5381 100644 --- a/io.sc.platform.mvc/src/main/resources/templates/configure.js +++ b/io.sc.platform.mvc/src/main/resources/templates/configure.js @@ -34,7 +34,7 @@ window.APP.configure = { // axios 配置 axios : { baseURL: '', - timeout: 1000 * 60, + timeout: 1000 * 60 * 5, crossdomain: true } }; \ No newline at end of file