manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微不足道的一些优化。

Browse Source
This commit is contained in:
thinkgem
2018-07-15 16:05:36 +08:00
parent 638c57b9c0
commit ddcf75b856
19 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/db/core.erm
View File

@@ -11,8 +11,8 @@
</page_setting> </page_setting>
<category_index>0</category_index> <category_index>0</category_index>
<zoom>1.0</zoom> <zoom>1.0</zoom>
<x>2660</x> <x>54</x>
<y>94</y> <y>1963</y>
<default_color> <default_color>
<r>128</r> <r>128</r>
<g>128</g> <g>128</g>
@@ -12354,6 +12354,10 @@
<type></type> <type></type>
<description></description> <description></description>
<columns> <columns>
<column>
<id>abd5fc5f0bb213daae3de2abc362c5aea5276f4d</id>
<desc>false</desc>
</column>
</columns> </columns>
</inidex> </inidex>
</indexes> </indexes>
@@ -13783,6 +13787,10 @@
<type></type> <type></type>
<description></description> <description></description>
<columns> <columns>
<column>
<id>bc518c6e08246711da4ef4bbfd902690ebf6797d</id>
<desc>false</desc>
</column>
</columns> </columns>
</inidex> </inidex>
</indexes> </indexes>

4
modules/core/db/mssql/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE [js_sys_user_role]
/* Create Indexes */ /* Create Indexes */
CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] (); 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] (); 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_pc] ON [js_sys_area] ([parent_code]);
CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]); CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]);
CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]); CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]);

4
modules/core/db/mysql/core.sql
View File

@@ -790,8 +790,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_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_ts ON js_sys_area (tree_sort ASC);
CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC); CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC);

4
modules/core/db/oracle/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_pc ON js_sys_area (parent_code);
CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort);
CREATE INDEX idx_sys_area_status ON js_sys_area (status); CREATE INDEX idx_sys_area_status ON js_sys_area (status);

4
modules/core/db/postgresql/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_pc ON js_sys_area (parent_code);
CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort);
CREATE INDEX idx_sys_area_status ON js_sys_area (status); CREATE INDEX idx_sys_area_status ON js_sys_area (status);

1
modules/core/src/main/resources/db/upgrade/core/versions
View File

@@ -3,3 +3,4 @@
4.0.2 4.0.2
4.0.3 4.0.3
4.0.4 4.0.4
4.0.5

4
modules/core/src/main/resources/views/error/400.html
View File

@@ -49,8 +49,8 @@ else {
class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button> class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
</div> </div>
<div class="copyright"> <div class="copyright">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% } %> <% } %>

4
modules/core/src/main/resources/views/error/403.html
View File

@@ -38,8 +38,8 @@ else {
class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button> class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
</div> </div>
<div class="copyright"> <div class="copyright">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% } %> <% } %>

4
modules/core/src/main/resources/views/error/404.html
View File

@@ -37,8 +37,8 @@ else {
class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button> class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
</div> </div>
<div class="copyright"> <div class="copyright">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% } %> <% } %>

4
modules/core/src/main/resources/views/error/500.html
View File

@@ -43,8 +43,8 @@ else {
class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button> class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
</div> </div>
<div class="copyright"> <div class="copyright">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% if (@ObjectUtils.toBoolean(@Global.getConfig('error.page.printErrorInfo', 'true'))){ %> <% if (@ObjectUtils.toBoolean(@Global.getConfig('error.page.printErrorInfo', 'true'))){ %>

22
modules/core/src/main/resources/views/include/head.html
View File

@@ -1,18 +1,10 @@
<%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved. */ <%/* Copyright (c) 2013-Now http://jeesite.com All rights reserved. */%>
var productName = @Global.getConfig('productName') + ' ' + @Global.getConfig('productVersion'); <meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
var pageTitle = (isNotBlank(title!) ? title! + ' - ' : '') + productName; content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
var globalFields = @Global.getConst('Global.Fields'); content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
%> content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
<meta charset="utf-8"> content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<meta content="webkit" name="renderer"/> <title>${(isNotBlank(title!) ? title! + ' - ' : '') + @Global.getConfig('productName')}</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"/>
<meta http-equiv="Pragma" content="no-cache"/><meta http-equiv="Expires" content="0"/>
<meta content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<meta content="${productName} - Powered By JeeSite V4.0" name="description"/>
<meta content="ThinkGem, http://jeesite.com" name="author"/>
<meta content="Powered By JeeSite V4.0" name="keywords"/>
<title>${pageTitle}</title>
<script src="${ctxPath}/global.min.js?ctx=${ctx}"></script> <script src="${ctxPath}/global.min.js?ctx=${ctx}"></script>
<script src="${ctxStatic}/jquery/jquery-1.12.4.min.js"></script> <script src="${ctxStatic}/jquery/jquery-1.12.4.min.js"></script>
<script src="${ctxStatic}/jquery/jquery-migrate-1.4.1.min.js"></script> <script src="${ctxStatic}/jquery/jquery-migrate-1.4.1.min.js"></script>

9
modules/core/src/main/resources/views/modules/sys/account/forgetPwd.html
View File

@@ -3,10 +3,10 @@
<link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/modules/sys/sysLogin.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/modules/sys/sysLogin.css?${_version}">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
<div class="login-box" style="margin-top:4%"> <div class="login-box" style="margin-top:4%">
<div class="login-logo" title="${productName}"> <div class="login-logo">
<a href="${ctxPath}/account/forgetPwd"><b>${productName}</b> <small>${productVersion}</small></a> <a href="${ctxPath}/account/forgetPwd"><b>${@Global.getConfig('productName')}</b>
<small>${@Global.getConfig('productVersion')}</small></a>
</div> </div>
<div class="login-box-body"> <div class="login-box-body">
<form id="forgetForm" action="${ctxPath}/account/forgetPwd" method="post"> <form id="forgetForm" action="${ctxPath}/account/forgetPwd" method="post">
@@ -159,7 +159,8 @@
</form> </form>
</div> </div>
<div class="login-copyright"> <div class="login-copyright">
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% } %> <% } %>

5
modules/core/src/main/resources/views/modules/sys/sysDesktop.html
View File

@@ -251,9 +251,8 @@
<!-- /.row --> <!-- /.row -->
</div> </div>
<footer class="main-footer m0"> <footer class="main-footer m0">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %> <div class="pull-right hidden-xs">当前版本： ${@Global.getConfig('productVersion')}</div>
<div class="pull-right hidden-xs">当前版本： ${productVersion}</div> &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a href="http://jeesite.com">JeeSite</a>
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
</footer> </footer>
<% } %> <% } %>
<script> <script>

5
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
View File

@@ -1,7 +1,6 @@
<% var productName = @Global.getConfig('productName'); %>
<nav class="navbar navbar-static-top"> <nav class="navbar navbar-static-top">
<div class="logo" data-toggle="push-menu" title="${productName}"> <div class="logo" data-toggle="push-menu">
<b>${productName}</b> <b>${@Global.getConfig('productName')}</b>
<small>&nbsp; &nbsp;<i class="fa fa-bars"></i></small> <small>&nbsp; &nbsp;<i class="fa fa-bars"></i></small>
</div> </div>
<%/*<!--%><a href="javascript:" class="sidebar-toggle" data-toggle="push-menu" role="button"> <%/*<!--%><a href="javascript:" class="sidebar-toggle" data-toggle="push-menu" role="button">

9
modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
View File

@@ -3,10 +3,10 @@
<link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/modules/sys/sysLogin.css?${_version}"> <link rel="stylesheet" href="${ctxStatic}/modules/sys/sysLogin.css?${_version}">
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
<div class="login-box"> <div class="login-box">
<div class="login-logo" title="${productName}"> <div class="login-logo">
<a href="${ctx}/login"><b>${productName}</b> <small>${productVersion}</small></a> <a href="${ctx}/login"><b>${@Global.getConfig('productName')}</b>
<small>${@Global.getConfig('productVersion')}</small></a>
</div> </div>
<div class="login-box-body"> <div class="login-box-body">
<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post"> <#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
@@ -79,7 +79,8 @@
</div> </div>
</div> </div>
<div class="login-copyright"> <div class="login-copyright">
&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>. &copy; ${@DateUtils.getYear()} ${@Global.getConfig('productName')} - Powered By <a
href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div> </div>
</div> </div>
<% } %> <% } %>

4
web/db/mssql/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE [js_sys_user_role]
/* Create Indexes */ /* Create Indexes */
CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] (); 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] (); 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_pc] ON [js_sys_area] ([parent_code]);
CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]); CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]);
CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]); CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]);

4
web/db/mysql/core.sql
View File

@@ -790,8 +790,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_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_ts ON js_sys_area (tree_sort ASC);
CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC); CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC);

4
web/db/oracle/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_pc ON js_sys_area (parent_code);
CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort);
CREATE INDEX idx_sys_area_status ON js_sys_area (status); CREATE INDEX idx_sys_area_status ON js_sys_area (status);

4
web/db/postgresql/core.sql
View File

@@ -788,8 +788,8 @@ CREATE TABLE js_sys_user_role
/* Create Indexes */ /* Create Indexes */
CREATE INDEX idx_gen_table_ptn ON js_gen_table (); 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 (); 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_pc ON js_sys_area (parent_code);
CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort);
CREATE INDEX idx_sys_area_status ON js_sys_area (status); CREATE INDEX idx_sys_area_status ON js_sys_area (status);