Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Eladmin
Commits
83dc7f8a
Commit
83dc7f8a
authored
Jun 10, 2019
by
zhengjie
Browse files
优化user列表中的岗位DTO,修改@author信息,新增验证码登录
parent
c01435a0
Changes
172
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
83dc7f8a
...
@@ -35,7 +35,6 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
...
@@ -35,7 +35,6 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
-
操作日志:记录用户操作的日志
-
操作日志:记录用户操作的日志
-
异常日志:记录异常日志,方便开发人员定位错误
-
异常日志:记录异常日志,方便开发人员定位错误
-
系统缓存:使用jedis将缓存操作可视化,并提供对redis的基本操作,可根据需求自行扩展
-
系统缓存:使用jedis将缓存操作可视化,并提供对redis的基本操作,可根据需求自行扩展
-
实时控制台:实时打印logback日志
-
SQL监控:采用druid 监控数据库访问性能,默认用户名admin,密码123456
-
SQL监控:采用druid 监控数据库访问性能,默认用户名admin,密码123456
-
定时任务:整合Quartz做定时任务,加入任务日志,任务运行情况一目了然
-
定时任务:整合Quartz做定时任务,加入任务日志,任务运行情况一目了然
-
代码生成:高灵活度一键生成前后端代码,减少百分之80左右的工作任务
-
代码生成:高灵活度一键生成前后端代码,减少百分之80左右的工作任务
...
@@ -71,10 +70,9 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
...
@@ -71,10 +70,9 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
</tr>
</tr>
<tr>
<tr>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf77632b4b090165.png"
/></td>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf77632b4b090165.png"
/></td>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf77639b1be47210.png"
/></td>
</tr>
<tr>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf77639929277783.png"
/></td>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf77639929277783.png"
/></td>
</tr>
<tr>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf78969adc389599.png"
/></td>
<td><img
src=
"https://i.loli.net/2019/05/18/5cdf78969adc389599.png"
/></td>
</tr>
</tr>
</table>
</table>
...
...
eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
...
@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
import
java.lang.annotation.Target
;
import
java.lang.annotation.Target
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-6-4 13:52:30
* @date 2019-6-4 13:52:30
*/
*/
@Target
(
ElementType
.
FIELD
)
@Target
(
ElementType
.
FIELD
)
...
@@ -49,7 +49,7 @@ public @interface Query {
...
@@ -49,7 +49,7 @@ public @interface Query {
}
}
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* 适用于简单连接查询,复杂的请自定义该注解,或者使用sql查询
* 适用于简单连接查询,复杂的请自定义该注解,或者使用sql查询
*/
*/
enum
Join
{
enum
Join
{
...
...
eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java
View file @
83dc7f8a
...
@@ -39,7 +39,6 @@ public class LimitAspect {
...
@@ -39,7 +39,6 @@ public class LimitAspect {
Method
signatureMethod
=
signature
.
getMethod
();
Method
signatureMethod
=
signature
.
getMethod
();
Limit
limit
=
signatureMethod
.
getAnnotation
(
Limit
.
class
);
Limit
limit
=
signatureMethod
.
getAnnotation
(
Limit
.
class
);
LimitType
limitType
=
limit
.
limitType
();
LimitType
limitType
=
limit
.
limitType
();
String
name
=
limit
.
name
();
String
key
=
limit
.
key
();
String
key
=
limit
.
key
();
if
(
StringUtils
.
isEmpty
(
key
))
{
if
(
StringUtils
.
isEmpty
(
key
))
{
switch
(
limitType
)
{
switch
(
limitType
)
{
...
...
eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import org.springframework.http.HttpStatus;
...
@@ -6,7 +6,7 @@ import org.springframework.http.HttpStatus;
import
static
org
.
springframework
.
http
.
HttpStatus
.
BAD_REQUEST
;
import
static
org
.
springframework
.
http
.
HttpStatus
.
BAD_REQUEST
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
* 统一异常处理
* 统一异常处理
*/
*/
...
...
eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import java.util.Map;
...
@@ -7,7 +7,7 @@ import java.util.Map;
import
java.util.stream.IntStream
;
import
java.util.stream.IntStream
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
public
class
EntityExistException
extends
RuntimeException
{
public
class
EntityExistException
extends
RuntimeException
{
...
...
eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import java.util.Map;
...
@@ -7,7 +7,7 @@ import java.util.Map;
import
java.util.stream.IntStream
;
import
java.util.stream.IntStream
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
public
class
EntityNotFoundException
extends
RuntimeException
{
public
class
EntityNotFoundException
extends
RuntimeException
{
...
...
eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import lombok.Data;
...
@@ -6,7 +6,7 @@ import lombok.Data;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
@Data
@Data
...
...
eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
View file @
83dc7f8a
...
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
...
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
import
static
org
.
springframework
.
http
.
HttpStatus
.*;
import
static
org
.
springframework
.
http
.
HttpStatus
.*;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
@Slf4j
@Slf4j
...
...
eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java
View file @
83dc7f8a
...
@@ -3,7 +3,7 @@ package me.zhengjie.mapper;
...
@@ -3,7 +3,7 @@ package me.zhengjie.mapper;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
public
interface
EntityMapper
<
D
,
E
>
{
public
interface
EntityMapper
<
D
,
E
>
{
...
...
eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
View file @
83dc7f8a
...
@@ -22,7 +22,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext;
...
@@ -22,7 +22,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext;
import
java.time.Duration
;
import
java.time.Duration
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
@Slf4j
@Slf4j
...
...
eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
View file @
83dc7f8a
...
@@ -18,7 +18,7 @@ import java.util.List;
...
@@ -18,7 +18,7 @@ import java.util.List;
/**
/**
* api页面 /swagger-ui.html
* api页面 /swagger-ui.html
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
...
...
eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
View file @
83dc7f8a
...
@@ -2,7 +2,7 @@ package me.zhengjie.utils;
...
@@ -2,7 +2,7 @@ package me.zhengjie.utils;
/**
/**
* 常用静态常量
* 常用静态常量
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-26
* @date 2018-12-26
*/
*/
public
class
ElAdminConstant
{
public
class
ElAdminConstant
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
View file @
83dc7f8a
...
@@ -9,7 +9,7 @@ import javax.crypto.spec.IvParameterSpec;
...
@@ -9,7 +9,7 @@ import javax.crypto.spec.IvParameterSpec;
/**
/**
* 加密
* 加密
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
public
class
EncryptUtils
{
public
class
EncryptUtils
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
View file @
83dc7f8a
...
@@ -8,7 +8,7 @@ import java.text.DecimalFormat;
...
@@ -8,7 +8,7 @@ import java.text.DecimalFormat;
/**
/**
* File工具类,扩展 hutool 工具包
* File工具类,扩展 hutool 工具包
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-27
* @date 2018-12-27
*/
*/
public
class
FileUtil
extends
cn
.
hutool
.
core
.
io
.
FileUtil
{
public
class
FileUtil
extends
cn
.
hutool
.
core
.
io
.
FileUtil
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
View file @
83dc7f8a
...
@@ -8,7 +8,7 @@ import java.util.Map;
...
@@ -8,7 +8,7 @@ import java.util.Map;
/**
/**
* 分页工具
* 分页工具
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-10
* @date 2018-12-10
*/
*/
public
class
PageUtil
extends
cn
.
hutool
.
core
.
util
.
PageUtil
{
public
class
PageUtil
extends
cn
.
hutool
.
core
.
util
.
PageUtil
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
View file @
83dc7f8a
...
@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
...
@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
import
java.util.*
;
import
java.util.*
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-6-4 14:59:48
* @date 2019-6-4 14:59:48
*/
*/
@Slf4j
@Slf4j
...
@@ -97,12 +97,14 @@ public class QueryHelp {
...
@@ -97,12 +97,14 @@ public class QueryHelp {
return
cb
.
and
(
list
.
toArray
(
new
Predicate
[
list
.
size
()]));
return
cb
.
and
(
list
.
toArray
(
new
Predicate
[
list
.
size
()]));
}
}
@SuppressWarnings
(
"unchecked"
)
private
static
<
T
,
R
>
Expression
<
T
>
getExpression
(
String
attributeName
,
Join
join
,
Root
<
R
>
root
)
{
private
static
<
T
,
R
>
Expression
<
T
>
getExpression
(
String
attributeName
,
Join
join
,
Root
<
R
>
root
)
{
if
(
ObjectUtil
.
isNotEmpty
(
join
))
{
if
(
ObjectUtil
.
isNotEmpty
(
join
))
{
return
join
.
get
(
attributeName
);
return
join
.
get
(
attributeName
);
}
else
return
root
.
get
(
attributeName
);
}
else
return
root
.
get
(
attributeName
);
}
}
@SuppressWarnings
(
"unchecked"
)
public
static
boolean
isBlank
(
final
CharSequence
cs
)
{
public
static
boolean
isBlank
(
final
CharSequence
cs
)
{
int
strLen
;
int
strLen
;
if
(
cs
==
null
||
(
strLen
=
cs
.
length
())
==
0
)
{
if
(
cs
==
null
||
(
strLen
=
cs
.
length
())
==
0
)
{
...
@@ -116,6 +118,7 @@ public class QueryHelp {
...
@@ -116,6 +118,7 @@ public class QueryHelp {
return
true
;
return
true
;
}
}
@SuppressWarnings
(
"unchecked"
)
private
static
List
<
Field
>
getAllFields
(
Class
clazz
,
List
<
Field
>
fields
)
{
private
static
List
<
Field
>
getAllFields
(
Class
clazz
,
List
<
Field
>
fields
)
{
if
(
clazz
!=
null
)
{
if
(
clazz
!=
null
)
{
fields
.
addAll
(
Arrays
.
asList
(
clazz
.
getDeclaredFields
()));
fields
.
addAll
(
Arrays
.
asList
(
clazz
.
getDeclaredFields
()));
...
...
eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest;
/**
/**
* 获取 HttpServletRequest
* 获取 HttpServletRequest
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
public
class
RequestHolder
{
public
class
RequestHolder
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import org.springframework.security.core.userdetails.UserDetails;
...
@@ -7,7 +7,7 @@ import org.springframework.security.core.userdetails.UserDetails;
/**
/**
* 获取当前登录的用户
* 获取当前登录的用户
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-17
* @date 2019-01-17
*/
*/
public
class
SecurityUtils
{
public
class
SecurityUtils
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import java.io.StringWriter;
...
@@ -5,7 +5,7 @@ import java.io.StringWriter;
/**
/**
* 异常工具
* 异常工具
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-06
* @date 2019-01-06
*/
*/
public
class
ThrowableUtil
{
public
class
ThrowableUtil
{
...
...
eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import java.util.Optional;
...
@@ -5,7 +5,7 @@ import java.util.Optional;
/**
/**
* 验证工具
* 验证工具
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
* @date 2018-11-23
*/
*/
public
class
ValidationUtil
{
public
class
ValidationUtil
{
...
...
Prev
1
2
3
4
5
…
9
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment