Beetl 视图 include 支持相对路径，sysLogin、sysIndex 移到 themes 目录下

modules/core/db/core.erm

@@ -11,8 +11,8 @@
 	</page_setting>
 	<category_index>0</category_index>
 	<zoom>1.0</zoom>
-	<x>3295</x>
+	<x>2167</x>
-	<y>1262</y>
+	<y>478</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -7606,6 +7606,19 @@
 						</column>
 					</columns>
 				</inidex>
+				<inidex>
+					<full_text>false</full_text>
+					<non_unique>true</non_unique>
+					<name>idx_sys_menu_wt</name>
+					<type></type>
+					<description></description>
+					<columns>
+						<column>
+							<id>2f21e992c73004d22b4752787472c75e4ed6944e</id>
+							<desc>false</desc>
+						</column>
+					</columns>
+				</inidex>
 			</indexes>
 			<complex_unique_key_list>
 			</complex_unique_key_list>

modules/core/db/mssql/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE [js_sys_dict_type]
 (
 	[id] varchar(64) NOT NULL,
 	[dict_name] nvarchar(100) NOT NULL,
-	[dict_type] varchar(100) NOT NULL UNIQUE,
+	[dict_type] varchar(100) NOT NULL,
 	[is_sys] char(1) NOT NULL,
 	[status] char(1) DEFAULT '0' NOT NULL,
 	[create_by] varchar(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX [idx_sys_menu_tss] ON [js_sys_menu] ([tree_sorts]);
 CREATE INDEX [idx_sys_menu_sc] ON [js_sys_menu] ([sys_code]);
 CREATE INDEX [idx_sys_menu_is] ON [js_sys_menu] ([is_show]);
 CREATE INDEX [idx_sys_menu_mcs] ON [js_sys_menu] ([module_codes]);
+CREATE INDEX [idx_sys_menu_wt] ON [js_sys_menu] ([weight]);
 CREATE INDEX [idx_sys_module_status] ON [js_sys_module] ([status]);
 CREATE INDEX [idx_sys_msg_inner_cb] ON [js_sys_msg_inner] ([create_by]);
 CREATE INDEX [idx_sys_msg_inner_status] ON [js_sys_msg_inner] ([status]);

modules/core/db/mysql/core.sql

@@ -250,8 +250,7 @@ CREATE TABLE js_sys_dict_type
 	update_by varchar(64) NOT NULL COMMENT '更新者',
 	update_date datetime NOT NULL COMMENT '更新时间',
 	remarks varchar(500) COMMENT '备注信息',
-	PRIMARY KEY (id),
+	PRIMARY KEY (id)
-	UNIQUE (dict_type)
 ) COMMENT = '字典类型表';
 
 
@@ -854,6 +853,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts ASC);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code ASC);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show ASC);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes ASC);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight ASC);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status ASC);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by ASC);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status ASC);

modules/core/db/oracle/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE js_sys_dict_type
 (
 	id varchar2(64) NOT NULL,
 	dict_name nvarchar2(100) NOT NULL,
-	dict_type varchar2(100) NOT NULL UNIQUE,
+	dict_type varchar2(100) NOT NULL,
 	is_sys char(1) NOT NULL,
 	status char(1) DEFAULT '0' NOT NULL,
 	create_by varchar2(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);

modules/core/db/postgresql/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE js_sys_dict_type
 (
 	id varchar(64) NOT NULL,
 	dict_name varchar(100) NOT NULL,
-	dict_type varchar(100) NOT NULL UNIQUE,
+	dict_type varchar(100) NOT NULL,
 	is_sys char(1) NOT NULL,
 	status char(1) DEFAULT '0' NOT NULL,
 	create_by varchar(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);

modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java

@@ -13,7 +13,7 @@ import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.WebStatFilter;
 
 /**
- * Servlet 配置
+ * Druid 配置
  * @author ThinkGem
  * @version 2017年11月30日
  */

modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java

@@ -11,7 +11,7 @@ import com.jeesite.modules.sys.entity.EmpUser;
 /**
  * 员工管理DAO接口
  * @author ThinkGem
- * @version 2015-4-24
+ * @version 2017-03-25
  */
 @MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
 public interface EmpUserDao extends CrudDao<EmpUser> {

modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties

@@ -59,8 +59,8 @@
 文档=Document
 图片=Image
 音频或视频=Audio or video
-请上传=Please upload
+请上传=Please upload 
-开始上传=Start upload
+开始上传=Start upload 
 或将照片拖到这里，最多可选\ {0}\ 张=Drag the photo here, at most \ {0} \ sheet
 或将照片拖到这里，最多可选\ {0}\ 个=Drag the photo here, at most \ {0}
 

modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html

@@ -13,18 +13,19 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse;
 <link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/modules/sys/sysIndex.css?${_version}">
-<header class="main-header">
+<header class="main-header">    
-	<% include('/modules/sys/sysIndex/topMenu.html'){} %>
+	<% include('sysIndex/topMenu.html'){} %>
 </header>
 <aside class="main-sidebar">
-	<% include('/modules/sys/sysIndex/leftMenu.html'){} %>
+	<% include('sysIndex/leftMenu.html'){} %>
 </aside>
 <div class="content-wrapper">
 	<div id="tabpanel"></div>
 </div>
 <% } %>
-<div id="modifyPasswordTip" class="hide" data-message="${modifyPasswordTip!}"></div>
+<div class="hide" id="desktopTabPage" data-title="${text('仪表盘')}"
-<div id="desktopTabPage" class="hide" data-title="${text('仪表盘')}" data-url="${ctx}${@Global.getConfig('sys.index.desktopUrl', '/desktop')}"></div>
+	data-url="${ctx}${@Global.getConfig('sys.index.desktopUrl', '/desktop')}"></div>
+<div class="hide" id="modifyPasswordTip" data-message="${modifyPasswordTip!}"></div>
 <script src="${ctxStatic}/jquery-toastr/2.0/toastr.min.js?${_version}"></script>
 <script src="${ctxStatic}/jquery-plugins/jquery.slimscroll.js"></script>
 <script src="${ctxStatic}/modules/sys/sysIndex.js?${_version}"></script>

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

@@ -15,12 +15,12 @@
 			<% } %>
 			<li><a href="javascript:" id="fullScreen" title="${text('全屏')}"><i class="fa fa-arrows-alt"></i></a></li>
 			<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>
-			<% include('/modules/sys/sysIndex/topMenuLang.html'){} %>
+			<% include('topMenuLang.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuOnline.html'){} %>
+			<% include('topMenuOnline.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuMsg.html'){} %>
+			<% include('topMenuMsg.html'){} %>
-			<% //include('/modules/sys/sysIndex/topMenuNotify.html'){} %>
+			<% //include('topMenuNotify.html'){} %>
-			<% //include('/modules/sys/sysIndex/topMenuTask.html'){} %>
+			<% //include('topMenuTask.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuUser.html'){} %>
+			<% include('topMenuUser.html'){} %>
 		</ul>
 	</div>
 </nav>

web/db/mssql/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE [js_sys_dict_type]
 (
 	[id] varchar(64) NOT NULL,
 	[dict_name] nvarchar(100) NOT NULL,
-	[dict_type] varchar(100) NOT NULL UNIQUE,
+	[dict_type] varchar(100) NOT NULL,
 	[is_sys] char(1) NOT NULL,
 	[status] char(1) DEFAULT '0' NOT NULL,
 	[create_by] varchar(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX [idx_sys_menu_tss] ON [js_sys_menu] ([tree_sorts]);
 CREATE INDEX [idx_sys_menu_sc] ON [js_sys_menu] ([sys_code]);
 CREATE INDEX [idx_sys_menu_is] ON [js_sys_menu] ([is_show]);
 CREATE INDEX [idx_sys_menu_mcs] ON [js_sys_menu] ([module_codes]);
+CREATE INDEX [idx_sys_menu_wt] ON [js_sys_menu] ([weight]);
 CREATE INDEX [idx_sys_module_status] ON [js_sys_module] ([status]);
 CREATE INDEX [idx_sys_msg_inner_cb] ON [js_sys_msg_inner] ([create_by]);
 CREATE INDEX [idx_sys_msg_inner_status] ON [js_sys_msg_inner] ([status]);

web/db/mysql/core.sql

@@ -250,8 +250,7 @@ CREATE TABLE js_sys_dict_type
 	update_by varchar(64) NOT NULL COMMENT '更新者',
 	update_date datetime NOT NULL COMMENT '更新时间',
 	remarks varchar(500) COMMENT '备注信息',
-	PRIMARY KEY (id),
+	PRIMARY KEY (id)
-	UNIQUE (dict_type)
 ) COMMENT = '字典类型表';
 
 
@@ -854,6 +853,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts ASC);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code ASC);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show ASC);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes ASC);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight ASC);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status ASC);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by ASC);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status ASC);

web/db/oracle/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE js_sys_dict_type
 (
 	id varchar2(64) NOT NULL,
 	dict_name nvarchar2(100) NOT NULL,
-	dict_type varchar2(100) NOT NULL UNIQUE,
+	dict_type varchar2(100) NOT NULL,
 	is_sys char(1) NOT NULL,
 	status char(1) DEFAULT '0' NOT NULL,
 	create_by varchar2(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);

web/db/postgresql/core.sql

@@ -241,7 +241,7 @@ CREATE TABLE js_sys_dict_type
 (
 	id varchar(64) NOT NULL,
 	dict_name varchar(100) NOT NULL,
-	dict_type varchar(100) NOT NULL UNIQUE,
+	dict_type varchar(100) NOT NULL,
 	is_sys char(1) NOT NULL,
 	status char(1) DEFAULT '0' NOT NULL,
 	create_by varchar(64) NOT NULL,
@@ -851,6 +851,7 @@ CREATE INDEX idx_sys_menu_tss ON js_sys_menu (tree_sorts);
 CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
+CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);