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
eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import javax.persistence.*;
...
@@ -5,7 +5,7 @@ import javax.persistence.*;
/**
/**
* 代码生成配置
* 代码生成配置
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-03
* @date 2019-01-03
*/
*/
@Data
@Data
...
...
eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
...
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
/**
/**
* 列的数据信息
* 列的数据信息
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
@Data
@Data
...
...
eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
View file @
83dc7f8a
...
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
...
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
/**
/**
* 表的数据信息
* 表的数据信息
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
@Data
@Data
...
...
eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
View file @
83dc7f8a
...
@@ -4,7 +4,7 @@ import me.zhengjie.domain.GenConfig;
...
@@ -4,7 +4,7 @@ import me.zhengjie.domain.GenConfig;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.JpaRepository
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-14
* @date 2019-01-14
*/
*/
public
interface
GenConfigRepository
extends
JpaRepository
<
GenConfig
,
Long
>
{
public
interface
GenConfigRepository
extends
JpaRepository
<
GenConfig
,
Long
>
{
...
...
eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
View file @
83dc7f8a
...
@@ -9,7 +9,7 @@ import org.springframework.validation.annotation.Validated;
...
@@ -9,7 +9,7 @@ import org.springframework.validation.annotation.Validated;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-14
* @date 2019-01-14
*/
*/
@RestController
@RestController
...
...
eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
View file @
83dc7f8a
...
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
...
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
@RestController
@RestController
...
...
eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import org.springframework.cache.annotation.CachePut;
...
@@ -7,7 +7,7 @@ import org.springframework.cache.annotation.CachePut;
import
org.springframework.cache.annotation.Cacheable
;
import
org.springframework.cache.annotation.Cacheable
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-14
* @date 2019-01-14
*/
*/
@CacheConfig
(
cacheNames
=
"genConfig"
)
@CacheConfig
(
cacheNames
=
"genConfig"
)
...
...
eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import me.zhengjie.domain.vo.ColumnInfo;
...
@@ -5,7 +5,7 @@ import me.zhengjie.domain.vo.ColumnInfo;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
public
interface
GeneratorService
{
public
interface
GeneratorService
{
...
...
eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
View file @
83dc7f8a
...
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
...
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import
java.util.Optional
;
import
java.util.Optional
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-14
* @date 2019-01-14
*/
*/
@Service
@Service
...
...
eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
View file @
83dc7f8a
...
@@ -17,7 +17,7 @@ import java.util.ArrayList;
...
@@ -17,7 +17,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
@Service
@Service
...
...
eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import org.apache.commons.configuration.*;
...
@@ -5,7 +5,7 @@ import org.apache.commons.configuration.*;
/**
/**
* sql字段转java
* sql字段转java
*
*
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-03
* @date 2019-01-03
*/
*/
public
class
ColUtil
{
public
class
ColUtil
{
...
...
eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
View file @
83dc7f8a
...
@@ -18,7 +18,7 @@ import java.util.Map;
...
@@ -18,7 +18,7 @@ import java.util.Map;
/**
/**
* 代码生成
* 代码生成
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-01-02
* @date 2019-01-02
*/
*/
@Slf4j
@Slf4j
...
...
eladmin-logging/src/main/java/me/zhengjie/aop/log/Log.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 2018-11-24
* @date 2018-11-24
*/
*/
@Target
(
ElementType
.
METHOD
)
@Target
(
ElementType
.
METHOD
)
...
...
eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
View file @
83dc7f8a
...
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
...
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
@Component
@Component
...
@@ -65,7 +65,7 @@ public class LogAspect {
...
@@ -65,7 +65,7 @@ public class LogAspect {
@AfterThrowing
(
pointcut
=
"logPointcut()"
,
throwing
=
"e"
)
@AfterThrowing
(
pointcut
=
"logPointcut()"
,
throwing
=
"e"
)
public
void
logAfterThrowing
(
JoinPoint
joinPoint
,
Throwable
e
)
{
public
void
logAfterThrowing
(
JoinPoint
joinPoint
,
Throwable
e
)
{
Log
log
=
new
Log
(
"ERROR"
,
System
.
currentTimeMillis
()
-
currentTime
);
Log
log
=
new
Log
(
"ERROR"
,
System
.
currentTimeMillis
()
-
currentTime
);
log
.
setExceptionDetail
(
ThrowableUtil
.
getStackTrace
(
e
));
log
.
setExceptionDetail
(
ThrowableUtil
.
getStackTrace
(
e
)
.
getBytes
()
);
logService
.
save
(
getUsername
(),
StringUtils
.
getIP
(
RequestHolder
.
getHttpServletRequest
()),
(
ProceedingJoinPoint
)
joinPoint
,
log
);
logService
.
save
(
getUsername
(),
StringUtils
.
getIP
(
RequestHolder
.
getHttpServletRequest
()),
(
ProceedingJoinPoint
)
joinPoint
,
log
);
}
}
...
...
eladmin-logging/src/main/java/me/zhengjie/domain/Log.java
View file @
83dc7f8a
...
@@ -8,7 +8,7 @@ import java.io.Serializable;
...
@@ -8,7 +8,7 @@ import java.io.Serializable;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
@Entity
@Entity
...
@@ -63,7 +63,7 @@ public class Log implements Serializable {
...
@@ -63,7 +63,7 @@ public class Log implements Serializable {
* 异常详细
* 异常详细
*/
*/
@Column
(
name
=
"exception_detail"
,
columnDefinition
=
"text"
)
@Column
(
name
=
"exception_detail"
,
columnDefinition
=
"text"
)
private
String
exceptionDetail
;
private
byte
[]
exceptionDetail
;
/**
/**
* 创建日期
* 创建日期
...
...
eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
...
@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
@Repository
@Repository
...
...
eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
View file @
83dc7f8a
...
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
@RestController
@RestController
...
...
eladmin-logging/src/main/java/me/zhengjie/service/LogService.java
View file @
83dc7f8a
...
@@ -7,7 +7,7 @@ import org.springframework.data.domain.Pageable;
...
@@ -7,7 +7,7 @@ import org.springframework.data.domain.Pageable;
import
org.springframework.scheduling.annotation.Async
;
import
org.springframework.scheduling.annotation.Async
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-24
* @date 2018-11-24
*/
*/
public
interface
LogService
{
public
interface
LogService
{
...
...
eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import java.io.Serializable;
...
@@ -5,7 +5,7 @@ import java.io.Serializable;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
/**
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-5-22
* @date 2019-5-22
*/
*/
@Data
@Data
...
...
eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
View file @
83dc7f8a
...
@@ -5,7 +5,7 @@ import me.zhengjie.annotation.Query;
...
@@ -5,7 +5,7 @@ import me.zhengjie.annotation.Query;
/**
/**
* 日志查询类
* 日志查询类
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-6-4 09:23:07
* @date 2019-6-4 09:23:07
*/
*/
@Data
@Data
...
...
Prev
1
2
3
4
5
6
…
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