ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !142 from 风立/master

This commit is contained in:
风立 2019-10-29 13:06:04 +08:00 committed by Gitee
parent 7e749c25c6 bdc9d698c5
commit 37c1a209df
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
View File

@ -23,6 +23,12 @@
<option th:each="table : ${genTables}" th:text="${table.tableComment}" th:value="${table.tableComment}"></option> <option th:each="table : ${genTables}" th:text="${table.tableComment}" th:value="${table.tableComment}"></option>
</select> </select>
</li> </li>
<li>
表名称：<input name="tableName" />
</li>
<li>
表描述：<input name="tableComment" />
</li>
<li class="select-time"> <li class="select-time">
<label>表时间： </label> <label>表时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
@ -39,13 +45,13 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code"> <a class="btn btn-primary multiple disabled" onclick="batchGenCode()" shiro:hasPermission="tool:gen:code">
<i class="fa fa-download"></i> 生成 <i class="fa fa-bug"></i> 生成
</a> </a>
<a class="btn btn-info" onclick="importTable()"> <a class="btn btn-info" onclick="importTable()">
<i class="fa fa-upload"></i> 导入 <i class="fa fa-upload"></i> 导入
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="tool:gen:edit"> <a class="btn btn-success single disabled" onclick="$.operate.editTab()" shiro:hasPermission="tool:gen:edit">
<i class="fa fa-edit"></i> 修改 <i class="fa fa-edit"></i> 修改
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="tool:gen:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="tool:gen:remove">

6
ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
View File

@ -23,6 +23,12 @@
<option th:each="table : ${dbTables}" th:text="${table.tableComment}" th:value="${table.tableComment}"></option> <option th:each="table : ${dbTables}" th:text="${table.tableComment}" th:value="${table.tableComment}"></option>
</select> </select>
</li> </li>
<li>
表名称：<input name="tableName" />
</li>
<li>
表描述：<input name="tableComment" />
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

4
sql/ry_20191008.sql
View File

@ -417,8 +417,8 @@ create table sys_oper_log (
oper_url varchar(255) default '' comment '请求URL', oper_url varchar(255) default '' comment '请求URL',
oper_ip varchar(50) default '' comment '主机地址', oper_ip varchar(50) default '' comment '主机地址',
oper_location varchar(255) default '' comment '操作地点', oper_location varchar(255) default '' comment '操作地点',
oper_param varchar(2000) default '' comment '请求参数', oper_param varchar(4000) default '' comment '请求参数',
json_result varchar(2000) default '' comment '返回参数', json_result varchar(4000) default '' comment '返回参数',
status int(1) default 0 comment '操作状态（0正常 1异常）', status int(1) default 0 comment '操作状态（0正常 1异常）',
error_msg varchar(2000) default '' comment '错误消息', error_msg varchar(2000) default '' comment '错误消息',
oper_time datetime comment '操作时间', oper_time datetime comment '操作时间',