From 31a271301275ca59e4821b988f482f753ae0b885 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 四月 2020 10:16:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java | 1
ruoyi-ui/src/views/tool/gen/index.vue | 4
ruoyi-ui/src/utils/ruoyi.js | 3
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 7 +
ruoyi-ui/src/assets/styles/ruoyi.scss | 12 +++
ruoyi-ui/src/layout/components/Navbar.vue | 6 +-
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java | 2
ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java | 69 +++++++++++++++++++++++
ruoyi-ui/package.json | 1
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java | 2
ruoyi-ui/src/views/tool/gen/editTable.vue | 18 +++++
ruoyi-ui/src/api/login.js | 4
ruoyi-ui/src/views/tool/build/index.vue | 5 -
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml | 4
14 files changed, 118 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 40f48ea..344ee37 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -54,6 +54,7 @@
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
"screenfull": "4.2.0",
+ "sortablejs": "1.8.4",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
"vue-quill-editor": "3.0.6",
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 1e84761..9ddd1c1 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -11,7 +11,7 @@
return request({
url: '/login',
method: 'post',
- params: data
+ data: data
})
}
@@ -37,4 +37,4 @@
url: '/captchaImage',
method: 'get'
})
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 3b2df35..ccddfff 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
-
+
/* text color */
.text-navy {
color: #1ab394;
@@ -187,4 +187,12 @@
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
-}
\ No newline at end of file
+}
+
+
+/* 鎷栨嫿鍒楁牱寮� */
+.sortable-ghost{
+ opacity: .8;
+ color: #fff!important;
+ background: #42b983!important;
+}
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 9edccc9..77f5dbd 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
-
+
<el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
@@ -33,8 +33,8 @@
<router-link to="/user/profile">
<el-dropdown-item>涓汉涓績</el-dropdown-item>
</router-link>
- <el-dropdown-item>
- <span @click="setting = true">甯冨眬璁剧疆</span>
+ <el-dropdown-item @click.native="setting = true">
+ <span>甯冨眬璁剧疆</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>閫�鍑虹櫥褰�</span>
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 601b4ae..9fe7904 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -17,6 +17,8 @@
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
@@ -101,7 +103,6 @@
}
return str;
}
-
/**
* 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
index 2c24fc1..92291e9 100644
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -135,7 +135,6 @@
</div>
</template>
-
<script>
import draggable from 'vuedraggable'
import { saveAs } from 'file-saver'
@@ -429,7 +428,7 @@
padding: 12px 18px 15px 15px;
}
}
-.el-scrollbar__wrap {
+.left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box;
overflow-x: hidden !important;
margin-bottom: 0 !important;
@@ -503,7 +502,7 @@
}
}
-.el-scrollbar__view{
+.left-scrollbar .el-scrollbar__view{
overflow-x: hidden;
}
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index 988416a..425ffdd 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -5,8 +5,8 @@
<basic-info-form ref="basicInfo" :info="info" />
</el-tab-pane>
<el-tab-pane label="瀛楁淇℃伅" name="cloum">
- <el-table :data="cloumns" :max-height="tableHeight">
- <el-table-column label="搴忓彿" type="index" min-width="5%" />
+ <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
+ <el-table-column label="搴忓彿" type="index" min-width="5%" class-name="allowDrag" />
<el-table-column
label="瀛楁鍒楀悕"
prop="columnName"
@@ -126,6 +126,7 @@
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
import basicInfoForm from "./basicInfoForm";
import genInfoForm from "./genInfoForm";
+import Sortable from 'sortablejs'
export default {
name: "GenEdit",
components: {
@@ -198,6 +199,19 @@
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
}
+ },
+ mounted() {
+ const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+ const sortable = Sortable.create(el, {
+ handle: ".allowDrag",
+ onEnd: evt => {
+ const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
+ this.cloumns.splice(evt.newIndex, 0, targetRow);
+ for (let index in this.cloumns) {
+ this.cloumns[index].sort = parseInt(index) + 1;
+ }
+ }
+ });
}
};
</script>
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 28fb5bc..1076820 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -80,7 +80,7 @@
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column label="搴忓彿" align="center" prop="tableId" width="50px" />
+ <el-table-column label="搴忓彿" align="center" prop="tableId" width="60px" />
<el-table-column
label="琛ㄥ悕绉�"
align="center"
@@ -284,4 +284,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java
new file mode 100644
index 0000000..5986053
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java
@@ -0,0 +1,69 @@
+package com.ruoyi.framework.security;
+
+/**
+ * 鐢ㄦ埛鐧诲綍瀵硅薄
+ *
+ * @author ruoyi
+ */
+public class LoginBody
+{
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String username;
+
+ /**
+ * 鐢ㄦ埛瀵嗙爜
+ */
+ private String password;
+
+ /**
+ * 楠岃瘉鐮�
+ */
+ private String code;
+
+ /**
+ * 鍞竴鏍囪瘑
+ */
+ private String uuid = "";
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername(String username)
+ {
+ this.username = username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ public String getCode()
+ {
+ return code;
+ }
+
+ public void setCode(String code)
+ {
+ this.code = code;
+ }
+
+ public String getUuid()
+ {
+ return uuid;
+ }
+
+ public void setUuid(String uuid)
+ {
+ this.uuid = uuid;
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
index ff5ddc7..147a0a5 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.monitor.domain;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -47,6 +48,7 @@
private String msg;
/** 璁块棶鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date loginTime;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
index c3027c1..f17723d 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.monitor.domain;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -78,6 +79,7 @@
private String errorMsg;
/** 鎿嶄綔鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operTime;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 09a5d13..35d374d 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -5,9 +5,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.security.LoginBody;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.SysLoginService;
import com.ruoyi.framework.security.service.SysPermissionService;
@@ -47,11 +49,12 @@
* @return 缁撴灉
*/
@PostMapping("/login")
- public AjaxResult login(String username, String password, String code, String uuid)
+ public AjaxResult login(@RequestBody LoginBody loginBody)
{
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
- String token = loginService.login(username, password, code, uuid);
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
return ajax;
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 7d4e2d6..d719e42 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -119,7 +119,6 @@
@PutMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
{
- System.out.println(genTable.getParams().size());
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
return AjaxResult.success();
diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
index 50af4d3..16d9e75 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -110,7 +110,7 @@
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_id = #{tableId}
+ where t.table_id = #{tableId} order by c.sort
</select>
<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
@@ -118,7 +118,7 @@
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_name = #{tableName}
+ where t.table_name = #{tableName} order by c.sort
</select>
<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
--
Gitblit v1.9.3