From ddcf75b85683105e50fb1f691afcbfb8ef56a8ce Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 15 Jul 2018 16:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=B8=8D=E8=B6=B3=E9=81=93=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 12 ++++++++-- modules/core/db/mssql/core.sql | 4 ++-- modules/core/db/mysql/core.sql | 4 ++-- modules/core/db/oracle/core.sql | 4 ++-- modules/core/db/postgresql/core.sql | 4 ++-- .../main/resources/db/upgrade/core/versions | 3 ++- .../src/main/resources/views/error/400.html | 4 ++-- .../src/main/resources/views/error/403.html | 4 ++-- .../src/main/resources/views/error/404.html | 4 ++-- .../src/main/resources/views/error/500.html | 4 ++-- .../main/resources/views/include/head.html | 22 ++++++------------- .../views/modules/sys/account/forgetPwd.html | 9 ++++---- .../views/modules/sys/sysDesktop.html | 5 ++--- .../default/modules/sys/sysIndex/topMenu.html | 5 ++--- .../themes/default/modules/sys/sysLogin.html | 9 ++++---- web/db/mssql/core.sql | 4 ++-- web/db/mysql/core.sql | 4 ++-- web/db/oracle/core.sql | 4 ++-- web/db/postgresql/core.sql | 4 ++-- 19 files changed, 57 insertions(+), 56 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 34bffb6b..eb43d3c1 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 2660 - 94 + 54 + 1963 128 128 @@ -12354,6 +12354,10 @@ + + abd5fc5f0bb213daae3de2abc362c5aea5276f4d + false + @@ -13783,6 +13787,10 @@ + + bc518c6e08246711da4ef4bbfd902690ebf6797d + false + diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index f3eb5d5e..b1cf4b24 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -788,8 +788,8 @@ CREATE TABLE [js_sys_user_role] /* Create Indexes */ -CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] (); -CREATE INDEX [idx_gen_table_column_tn] ON [js_gen_table_column] (); +CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] ([parent_table_name]); +CREATE INDEX [idx_gen_table_column_tn] ON [js_gen_table_column] ([table_name]); CREATE INDEX [idx_sys_area_pc] ON [js_sys_area] ([parent_code]); CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]); CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 91635d3c..4b70684d 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -790,8 +790,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ -CREATE INDEX idx_gen_table_ptn ON js_gen_table (); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); +CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name ASC); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name ASC); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code ASC); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort ASC); CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC); diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 7d0f4dc4..d3c89d9f 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ -CREATE INDEX idx_gen_table_ptn ON js_gen_table (); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); +CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index ecdbb182..c3736a63 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ -CREATE INDEX idx_gen_table_ptn ON js_gen_table (); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); +CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index 0988d3b9..a7d20b7a 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -2,4 +2,5 @@ 4.0.1 4.0.2 4.0.3 -4.0.4 \ No newline at end of file +4.0.4 +4.0.5 \ No newline at end of file diff --git a/modules/core/src/main/resources/views/error/400.html b/modules/core/src/main/resources/views/error/400.html index 7fb74596..aecc5d60 100644 --- a/modules/core/src/main/resources/views/error/400.html +++ b/modules/core/src/main/resources/views/error/400.html @@ -49,8 +49,8 @@ else { class="fa fa-reply-all"> ${text('sys.error.returnButton')}
- <% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> - © ${@DateUtils.getYear()} ${productName} - Powered By JeeSite. + © ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By JeeSite ${@Global.getProperty('jeesiteVersion')}
<% } %> diff --git a/modules/core/src/main/resources/views/error/403.html b/modules/core/src/main/resources/views/error/403.html index 040001ba..0d1f3ef0 100644 --- a/modules/core/src/main/resources/views/error/403.html +++ b/modules/core/src/main/resources/views/error/403.html @@ -38,8 +38,8 @@ else { class="fa fa-reply-all"> ${text('sys.error.returnButton')}
- <% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> - © ${@DateUtils.getYear()} ${productName} - Powered By JeeSite. + © ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By JeeSite ${@Global.getProperty('jeesiteVersion')}
<% } %> diff --git a/modules/core/src/main/resources/views/error/404.html b/modules/core/src/main/resources/views/error/404.html index cb3dcee6..0f0f4bb1 100644 --- a/modules/core/src/main/resources/views/error/404.html +++ b/modules/core/src/main/resources/views/error/404.html @@ -37,8 +37,8 @@ else { class="fa fa-reply-all"> ${text('sys.error.returnButton')}
- <% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> - © ${@DateUtils.getYear()} ${productName} - Powered By JeeSite. + © ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By JeeSite ${@Global.getProperty('jeesiteVersion')}
<% } %> diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html index f3b381bd..6c71e129 100644 --- a/modules/core/src/main/resources/views/error/500.html +++ b/modules/core/src/main/resources/views/error/500.html @@ -43,8 +43,8 @@ else { class="fa fa-reply-all"> ${text('sys.error.returnButton')}
- <% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> - © ${@DateUtils.getYear()} ${productName} - Powered By JeeSite. + © ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By JeeSite ${@Global.getProperty('jeesiteVersion')}
<% if (@ObjectUtils.toBoolean(@Global.getConfig('error.page.printErrorInfo', 'true'))){ %> diff --git a/modules/core/src/main/resources/views/include/head.html b/modules/core/src/main/resources/views/include/head.html index 629e0384..d2d3231a 100644 --- a/modules/core/src/main/resources/views/include/head.html +++ b/modules/core/src/main/resources/views/include/head.html @@ -1,18 +1,10 @@ -<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved. */ -var productName = @Global.getConfig('productName') + ' ' + @Global.getConfig('productVersion'); -var pageTitle = (isNotBlank(title!) ? title! + ' - ' : '') + productName; -var globalFields = @Global.getConst('Global.Fields'); -%> - - - - - - - - - -${pageTitle} +<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved. */%> + +${(isNotBlank(title!) ? title! + ' - ' : '') + @Global.getConfig('productName')} diff --git a/modules/core/src/main/resources/views/modules/sys/account/forgetPwd.html b/modules/core/src/main/resources/views/modules/sys/account/forgetPwd.html index e789b9bb..7c4591eb 100644 --- a/modules/core/src/main/resources/views/modules/sys/account/forgetPwd.html +++ b/modules/core/src/main/resources/views/modules/sys/account/forgetPwd.html @@ -3,10 +3,10 @@ -<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
- <% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> - - © ${@DateUtils.getYear()} ${productName} - Powered By JeeSite. + + © ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By JeeSite
<% } %>