新增清空（登录、操作、调度）日志

sql/ry_20181001.sql → sql/ry_20181008.sql

@@ -479,15 +479,16 @@ insert into sys_dict_data values(13, 2,  '公告',     '2',  'sys_notice_type',
 insert into sys_dict_data values(14, 1,  '正常',     '0',  'sys_notice_status',   '',   'primary', 'Y', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态');
 insert into sys_dict_data values(15, 2,  '关闭',     '1',  'sys_notice_status',   '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '关闭状态');
 insert into sys_dict_data values(16, 1,  '新增',     '1',  'sys_oper_type',       '',   'info',    'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(17, 2,  '修改',     '2',  'sys_oper_type',       '',   'info',    'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(18, 3,  '删除',     '3',  'sys_oper_type',       '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(19, 4,  '授权',     '4',  'sys_oper_type',       '',   'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(20, 5,  '导出',     '5',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(21, 6,  '导入',     '6',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(22, 7,  '强退',     '7',  'sys_oper_type',       '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(23, 8,  '生成代码', '8',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作');
-insert into sys_dict_data values(24, 1,  '成功',     '0',  'sys_common_status',   '',   'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态');
-insert into sys_dict_data values(25, 2,  '失败',     '1',  'sys_common_status',   '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态');
+insert into sys_dict_data values(17, 2,  '修改',     '2',  'sys_oper_type',       '',   'info',    'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '修改操作');
+insert into sys_dict_data values(18, 3,  '删除',     '3',  'sys_oper_type',       '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '删除操作');
+insert into sys_dict_data values(19, 4,  '授权',     '4',  'sys_oper_type',       '',   'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '授权操作');
+insert into sys_dict_data values(20, 5,  '导出',     '5',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '导出操作');
+insert into sys_dict_data values(21, 6,  '导入',     '6',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '导入操作');
+insert into sys_dict_data values(22, 7,  '强退',     '7',  'sys_oper_type',       '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '强退操作');
+insert into sys_dict_data values(23, 8,  '生成代码', '8',  'sys_oper_type',       '',   'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '生成操作');
+insert into sys_dict_data values(24, 8,  '清空数据', '9',  'sys_oper_type',       '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作');
+insert into sys_dict_data values(25, 1,  '成功',     '0',  'sys_common_status',   '',   'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态');
+insert into sys_dict_data values(26, 2,  '失败',     '1',  'sys_common_status',   '',   'danger',  'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态');
 
 
 -- ----------------------------

src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java

@@ -52,4 +52,9 @@ public enum BusinessType
      * 生成代码
      */
     GENCODE,
+    
+    /**
+     * 清空数据
+     */
+    CLEAN,
 }

src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java

@@ -67,4 +67,14 @@ public class JobLogController extends BaseController
     {
         return toAjax(jobLogService.deleteJobLogByIds(ids));
     }
+    
+    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
+    @RequiresPermissions("monitor:job:remove")
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        jobLogService.cleanJobLog();
+        return success();
+    }
 }

src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java

@@ -50,5 +50,10 @@ public interface JobLogMapper
      * @return 结果
      */
     public int deleteJobLogById(Long jobId);
+    
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
 
 }

src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java

@@ -49,5 +49,10 @@ public interface IJobLogService
      * @return 结果
      */
     public int deleteJobLogById(Long jobId);
-
+    
+    /**
+     * 清空任务日志
+     */
+    public void cleanJobLog();
+    
 }

src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java

@@ -76,5 +76,14 @@ public class JobLogServiceImpl implements IJobLogService
     {
         return jobLogMapper.deleteJobLogById(jobId);
     }
+    
+    /**
+     * 清空任务日志
+     */
+    @Override
+    public void cleanJobLog()
+    {
+        jobLogMapper.cleanJobLog();
+    }
 
 }

src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java

@@ -67,4 +67,14 @@ public class LogininforController extends BaseController
     {
         return toAjax(logininforService.deleteLogininforByIds(ids));
     }
+    
+    @RequiresPermissions("monitor:logininfor:remove")
+    @Log(title = "登陆日志", businessType = BusinessType.CLEAN)
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return success();
+    }
 }

src/main/java/com/ruoyi/project/monitor/logininfor/mapper/LogininforMapper.java

@@ -32,4 +32,9 @@ public interface LogininforMapper
      * @return
      */
     public int deleteLogininforByIds(String[] ids);
+    
+    /**
+     * 清空系统登录日志
+     */
+    public int cleanLogininfor();
 }

src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java

@@ -33,4 +33,9 @@ public interface ILogininforService
      * @return
      */
     public int deleteLogininforByIds(String ids);
+    
+    /**
+     * 清空系统登录日志
+     */
+    public void cleanLogininfor();
 }

src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java

@@ -53,4 +53,13 @@ public class LogininforServiceImpl implements ILogininforService
     {
         return logininforMapper.deleteLogininforByIds(Convert.toStrArray(ids));
     }
+    
+    /**
+     * 清空系统登录日志
+     */
+    @Override
+    public void cleanLogininfor()
+    {
+        logininforMapper.cleanLogininfor();
+    }
 }

src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java

@@ -76,4 +76,14 @@ public class OperlogController extends BaseController
         mmap.put("operLog", operLogService.selectOperLogById(deptId));
         return prefix + "/detail";
     }
+    
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @RequiresPermissions("monitor:operlog:remove")
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return success();
+    }
 }

src/main/java/com/ruoyi/project/monitor/operlog/mapper/OperLogMapper.java

@@ -40,4 +40,9 @@ public interface OperLogMapper
      * @return 操作日志对象
      */
     public OperLog selectOperLogById(Long operId);
+    
+    /**
+     * 清空操作日志
+     */
+    public void cleanOperLog();
 }

src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java

@@ -40,4 +40,9 @@ public interface IOperLogService
      * @return 操作日志对象
      */
     public OperLog selectOperLogById(Long operId);
+    
+    /**
+     * 清空操作日志
+     */
+    public void cleanOperLog();
 }

src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java

@@ -64,4 +64,13 @@ public class OperLogServiceImpl implements IOperLogService
     {
         return operLogMapper.selectOperLogById(operId);
     }
+    
+    /**
+     * 清空操作日志
+     */
+    @Override
+    public void cleanOperLog()
+    {
+        operLogMapper.cleanOperLog();
+    }
 }

src/main/resources/mybatis/monitor/JobLogMapper.xml

@@ -62,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
  	
+ 	<update id="cleanJobLog">
+        truncate table sys_job_log
+    </update>
+ 	
  	<insert id="insertJobLog" parameterType="JobLog">
  		insert into sys_job_log(
  			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>

src/main/resources/mybatis/monitor/LogininforMapper.xml

@@ -48,5 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			#{infoId}
         </foreach> 
  	</delete>
+ 	
+ 	<update id="cleanLogininfor">
+        truncate table sys_logininfor
+    </update>
 
 </mapper> 

src/main/resources/mybatis/monitor/OperLogMapper.xml

@@ -63,5 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectOperLogVo"/>
 		where oper_id = #{operId}
 	</select>
+	
+	<update id="cleanOperLog">
+        truncate table sys_oper_log
+    </update>
 
 </mapper> 

src/main/resources/static/ruoyi/js/common.js

@@ -81,6 +81,11 @@ $(function() {
 		    $.tree.searchNode(e);
 		}).bind("input propertychange", $.tree.searchNode);
 	}
+	// 复选框后按钮样式状态变更
+	$("#bootstrap-table").on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", function () {
+		var ids = $("#bootstrap-table").bootstrapTable("getSelections");
+		$('#toolbar .btn-del').toggleClass('disabled', !ids.length);
+    });
 });
 
 /** 创建选项卡 */

src/main/resources/static/ruoyi/js/ry-ui.js

@@ -425,6 +425,13 @@
         			$.operate.submit(url, "post", "json", data);
         		});
             },
+            // 清空信息
+            clean: function() {
+            	$.modal.confirm("确定清空所有" + $.table._option.modalName + "吗？", function() {
+	            	var url = $.table._option.cleanUrl;
+	            	$.operate.submit(url, "post", "json", "");
+            	});
+            },
             // 添加信息
             add: function(id) {
             	var url = $.common.isEmpty(id) ? $.table._option.createUrl : $.table._option.createUrl.replace("{id}", id);

src/main/resources/templates/include.html

@@ -38,8 +38,8 @@
 	<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
 	<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 	<script th:src="@{/ajax/libs/layui/layui.js}"></script>
-	<script th:src="@{/ruoyi/js/common.js?v=2.4.0}"></script>
-	<script th:src="@{/ruoyi/js/ry-ui.js?v=2.4.0}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=3.0.0}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=3.0.0}"></script>
 	<script src="http://tajs.qq.com/stats?sId=62048022"></script>
 	<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 </div>

src/main/resources/templates/index.html

@@ -15,7 +15,7 @@
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/animate.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.css}" rel="stylesheet"/>
-    <link th:href="@{/ruoyi/css/ry-ui.css?v=2.4.0}" rel="stylesheet"/>
+    <link th:href="@{/ruoyi/css/ry-ui.css?v=3.0.0}" rel="stylesheet"/>
     <style type="text/css">
         .nav > li:hover .dropdown-menu {display: block;}
     </style>
@@ -136,7 +136,7 @@
 <script th:src="@{/js/plugins/slimscroll/jquery.slimscroll.min.js}"></script>
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script src="http://tajs.qq.com/stats?sId=62048022"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=2.4.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=3.0.0}"></script>
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 </body>

src/main/resources/templates/login.html

@@ -12,7 +12,7 @@
     <link href="../static/css/style.css" th:href="@{css/style.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
-    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=2.4.0}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=3.0.0}" rel="stylesheet"/>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -83,7 +83,7 @@
 <script src="../static/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script src="http://tajs.qq.com/stats?sId=62048022"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=2.4.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=3.0.0}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
 </body>
 </html>

src/main/resources/templates/main.html

@@ -15,10 +15,12 @@
 <body class="gray-bg">
     <div class="row  border-bottom white-bg dashboard-header">
         <div class="col-sm-12">
-            <blockquote class="text-warning" style="font-size:14px">您是否需要自己做一款后台、会员中心等等的，但是又缺乏html等前端知识…。
-                <br>您是否一直在苦苦寻找一款适合自己的后台主题…
-                <br>…………
-                <h4 class="text-danger">那么，现在若依来了。</h4>
+            <blockquote class="text-warning" style="font-size:14px">
+                                          阿里云优惠活动（2CPU 4GRAM 1M带宽 40G高效云盘）
+                <br><a target="_blank" href="https://promotion.aliyun.com/ntms/act/vm/aliyun-group/buy.html?group=BphATfDhsQ">https://promotion.aliyun.com/ntms/act/vm/aliyun-group/buy.html?group=BphATfDhsQ</a>…
+                <br>云产品通用代金券，可叠加官网常规优惠使用
+                <br><a target="_blank" href="https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof">https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof</a>…
+                <h4 class="text-danger">限时活动推广。</h4>
             </blockquote>
 
             <hr>
@@ -94,13 +96,38 @@
                     <div class="ibox-content no-padding">
                         <div class="panel-body">
                             <div class="panel-group" id="version">
+							<div class="panel panel-default">
+								<div class="panel-heading">
+								   <h5 class="panel-title">
+									   <a data-toggle="collapse" data-parent="#version" href="#v30">v3.0.0</a><code class="pull-right">2018.10.08</code>
+								   </h5>
+								</div>
+								<div id="v30" class="panel-collapse collapse in">
+									<div class="panel-body">
+									   <ol>
+											<li>升级poi到最新版3.17</li>
+											<li>导出修改临时目录绝对路径</li>
+											<li>升级laydate升级到最新版5.0.9</li>
+											<li>升级SpringBoot到最新版本2.0.5</li>
+											<li>优化开始/结束时间校验限制</li>
+											<li>重置密码参数表中获取默认值</li>
+											<li>修复头像修改显示问题</li>
+											<li>新增数据权限过滤注解</li>
+											<li>新增表格检索折叠按钮</li>
+											<li>新增清空（登录、操作、调度）日志</li>
+											<li>部分细节调整优化</li>
+											<li>项目采用分模块</li>
+										</ol>
+									</div>
+								</div>
+							</div>
 							<div class="panel panel-default">
 								<div class="panel-heading">
 								   <h5 class="panel-title">
 									   <a data-toggle="collapse" data-parent="#version" href="#v24">v2.4.0</a><code class="pull-right">2018.09.03</code>
 								   </h5>
 								</div>
-								<div id="v24" class="panel-collapse collapse in">
+								<div id="v24" class="panel-collapse collapse">
 									<div class="panel-body">
 									   <ol>
 											<li>支持部门多级查询</li>

src/main/resources/templates/monitor/job/job.html

@@ -32,14 +32,14 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="monitor:job:add">
-	                <i class="fa fa-plus"></i> 新增
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="monitor:job:add">
+	                <i class="fa fa-plus"></i> 添加
 	            </a>
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
-		        <a class="btn btn-outline btn-info btn-rounded" onclick="javascript:jobLog()" shiro:hasPermission="monitor:job:list">
+		        <a class="btn btn-success" onclick="javascript:jobLog()" shiro:hasPermission="monitor:job:list">
 		            <i class="fa fa-list"></i> 日志
 		        </a>
 	        </div>

src/main/resources/templates/monitor/job/jobLog.html

@@ -38,9 +38,12 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				 <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
-	                <i class="fa fa-trash-o"></i> 删除
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				 <a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
+	                <i class="fa fa-remove"></i> 删除
+	            </a>
+	            <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:job:remove">
+	                <i class="fa fa-trash"></i> 清空
 	            </a>
 	        </div>
 	        
@@ -58,11 +61,12 @@
 		$(function() {
 		    var options = {
 		        url: prefix + "/list",
+		        cleanUrl: prefix + "/clean",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
 		        sortName: "createTime",
 		        sortOrder: "desc",
-		        modalName: "日志",
+		        modalName: "调度日志",
 		        search: false,
 		        showExport: false,
 		        columns: [{
@@ -70,7 +74,7 @@
 		        },
 		        {
 		            field: 'jobLogId',
-		            title: '任务日志编号'
+		            title: '日志编号'
 		        },
 		        {
 		            field: 'jobName',

src/main/resources/templates/monitor/logininfor/logininfor.html

@@ -38,10 +38,13 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
+		        <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:logininfor:remove">
+	                <i class="fa fa-trash"></i> 清空
+	            </a>
 	        </div>
         
 	        <div class="col-sm-12 select-table table-striped">
@@ -58,10 +61,12 @@
 		$(function() {
 		    var options = {
 		        url: prefix + "/list",
+		        cleanUrl: prefix + "/clean",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
 		        sortName: "loginTime",
 		        sortOrder: "desc",
+		        modalName: "登录日志",
 		        search: false,
 		        showExport: false,
 		        columns: [{

src/main/resources/templates/monitor/online/online.html

@@ -26,9 +26,9 @@
 				</form>
 			</div>
 			
-	        <div class="btn-group hidden-xs" id="toolbar" role="group">
-	            <a class="btn btn-outline btn-danger btn-rounded" onclick="javascript:batchForceLogout()" shiro:hasPermission="monitor:online:batchForceLogout">
-	                <i class="fa fa-trash-o"></i> 删除
+	        <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+	            <a class="btn btn-danger btn-del disabled" onclick="javascript:batchForceLogout()" shiro:hasPermission="monitor:online:batchForceLogout">
+	                <i class="fa fa-remove"></i> 删除
 	            </a>
 	        </div>
 	        

src/main/resources/templates/monitor/operlog/operlog.html

@@ -38,10 +38,13 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
+		        <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:logininfor:remove">
+	                <i class="fa fa-trash"></i> 清空
+	            </a>
 	        </div>
 	        
 			<div class="col-sm-12 select-table table-striped">
@@ -59,12 +62,13 @@
 		$(function() {
 		    var options = {
 		        url: prefix + "/list",
+		        cleanUrl: prefix + "/clean",
 		        detailUrl: prefix + "/detail/{id}",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
 		        sortName: "operTime",
 		        sortOrder: "desc",
-		        modalName: "日志",
+		        modalName: "操作日志",
 		        search: false,
 		        showExport: false,
 		        columns: [{

src/main/resources/templates/system/config/config.html

@@ -37,12 +37,12 @@
 				</form>
 			</div>
 			
-	        <div class="btn-group hidden-xs" id="toolbar" role="group">
-		        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:config:add">
-		            <i class="fa fa-plus"></i> 新增
+	        <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+		        <a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="system:config:add">
+		            <i class="fa fa-plus"></i> 添加
 		        </a>
-		        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:config:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+		        <a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:config:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        <div class="col-sm-12 select-table table-striped">

src/main/resources/templates/system/dept/dept.html

@@ -28,9 +28,9 @@
 				</form>
 			</div>
                 
-            <div class="btn-group hidden-xs" id="toolbar" role="group">
-		        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
-                    <i class="fa fa-plus"></i> 新增
+            <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+		        <a class="btn btn-primary" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
+                    <i class="fa fa-plus"></i> 添加
                 </a>
 	        </div>
        		 <div class="col-sm-12 select-table table-striped">

src/main/resources/templates/system/dict/data/data.html

@@ -34,12 +34,12 @@
 				</form>
 			</div>
 			
-	       <div class="btn-group hidden-xs" id="toolbar" role="group">
-	            <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add">
-	                <i class="fa fa-plus"></i> 新增
+	       <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+	            <a class="btn btn-primary" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add">
+	                <i class="fa fa-plus"></i> 添加
 	            </a>
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        

src/main/resources/templates/system/dict/type/type.html

@@ -38,12 +38,12 @@
 				</form>
 			</div>
 			
-	       <div class="btn-group hidden-xs" id="toolbar" role="group">
-	            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
-	                <i class="fa fa-plus"></i> 新增
+	       <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+	            <a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
+	                <i class="fa fa-plus"></i> 添加
 	            </a>
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        

src/main/resources/templates/system/menu/menu.html

@@ -28,9 +28,9 @@
 				</form>
 			</div>
                 
-            <div class="btn-group hidden-xs" id="toolbar" role="group">
-		        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add(0)" shiro:hasPermission="system:menu:add">
-                    <i class="fa fa-plus"></i> 新增
+            <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+		        <a class="btn btn-primary" onclick="$.operate.add(0)" shiro:hasPermission="system:menu:add">
+                    <i class="fa fa-plus"></i> 添加
                 </a>
 	        </div>
        		 <div class="col-sm-12 select-table table-striped">

src/main/resources/templates/system/notice/notice.html

@@ -31,12 +31,12 @@
 				</form>
 			</div>
 			
-	        <div class="btn-group hidden-xs" id="toolbar" role="group">
-		        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
+	        <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+		        <a class="btn btn-primary" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
 		            <i class="fa fa-plus"></i> 新增
 		        </a>
-		        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:notice:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+		        <a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:notice:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        

src/main/resources/templates/system/post/post.html

@@ -32,12 +32,12 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:post:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:post:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        

src/main/resources/templates/system/role/role.html

@@ -38,12 +38,12 @@
 				</form>
 			</div>
 		
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
-	                <i class="fa fa-plus"></i> 新增
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
+	                <i class="fa fa-plus"></i> 添加
 	            </a>
-				<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
-		            <i class="fa fa-trash-o"></i> 删除
+				<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
+		            <i class="fa fa-remove"></i> 删除
 		        </a>
 	        </div>
 	        

src/main/resources/templates/system/user/user.html

@@ -63,12 +63,12 @@
 				</form>
 			</div>
 			
-	        <div class="btn-group hidden-xs" id="toolbar" role="group">
-	        	<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-	                <i class="fa fa-plus"></i> 新增
+	        <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+	        	<a class="btn btn-primary" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
+	                <i class="fa fa-plus"></i> 添加
 	            </a>
-	            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-	                <i class="fa fa-trash-o"></i> 删除
+	            <a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
+	                <i class="fa fa-remove"></i> 删除
 	            </a>
 	        </div>
 	        

src/main/resources/templates/tool/gen/gen.html

@@ -31,8 +31,8 @@
 				</form>
 			</div>
 			
-			<div class="btn-group hidden-xs" id="toolbar" role="group">
-				<a class="btn btn-outline btn-success btn-rounded" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
+			<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+				<a class="btn btn-success" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
 			        <i class="fa fa-download"></i> 批量生成
 			    </a>
 		    </div>