From 3e6044d9022b9484b199f705ce9f5d48cb47ecd2 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 14 Aug 2018 20:46:55 +0800 Subject: [PATCH] v4.0.6 --- .../jeesite/modules/sys/db/InitCoreData.xlsx | Bin 167759 -> 167749 bytes .../db/upgrade/core/mssql/mssql_4.0.6.sql | 6 ++++++ .../db/upgrade/core/oracle/oracle_4.0.6.sql | 6 ++++++ .../core/postgresql/postgresql_4.0.6.sql | 6 ++++++ .../main/resources/db/upgrade/core/versions | 3 ++- .../org.eclipse.core.resources.prefs | 2 -- 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql create mode 100644 modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.6.sql create mode 100644 modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.6.sql delete mode 100644 root/.settings/org.eclipse.core.resources.prefs diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 3b2f9df4b0091d24f2dc01990712e8f66e007539..97dedd5aa5a09f08ecdb15b914fec106660a74ce 100644 GIT binary patch delta 7606 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 delta 7669 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 diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql new file mode 100644 index 00000000..4f0dd8be --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.6.sql @@ -0,0 +1,6 @@ + +UPDATE ${_prefix}sys_menu SET permission='sys:stste:cache' WHERE permission='sys:stste:ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/cache/index' WHERE menu_href='/state/ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/server/index' WHERE menu_href='/state/server'; + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.6.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.6.sql new file mode 100644 index 00000000..4f0dd8be --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.6.sql @@ -0,0 +1,6 @@ + +UPDATE ${_prefix}sys_menu SET permission='sys:stste:cache' WHERE permission='sys:stste:ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/cache/index' WHERE menu_href='/state/ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/server/index' WHERE menu_href='/state/server'; + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.6.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.6.sql new file mode 100644 index 00000000..4f0dd8be --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.6.sql @@ -0,0 +1,6 @@ + +UPDATE ${_prefix}sys_menu SET permission='sys:stste:cache' WHERE permission='sys:stste:ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/cache/index' WHERE menu_href='/state/ehcache'; +UPDATE ${_prefix}sys_menu SET menu_href='/state/server/index' WHERE menu_href='/state/server'; + +commit; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index a7d20b7a..c68f7f1d 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -3,4 +3,5 @@ 4.0.2 4.0.3 4.0.4 -4.0.5 \ No newline at end of file +4.0.5 +4.0.6 \ No newline at end of file diff --git a/root/.settings/org.eclipse.core.resources.prefs b/root/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 4824b802..00000000 --- a/root/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8