Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pig_冷冷
Pig
提交
1c8a4150
Pig
项目概览
pig_冷冷
/
Pig
上一次同步 11 个月
通知
3
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Pig
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1c8a4150
编写于
8月 09, 2021
作者:
W
wjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
✨
Introducing new features. closed #I44EYC 使用mybatis-plus 的自动填充策略重构 审计字段
上级
d879b414
变更
29
隐藏空白更改
内联
并排
Showing
29 changed file
with
196 addition
and
140 deletion
+196
-140
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java
...pig/auth/handler/PigAuthenticationFailureEvenHandler.java
+2
-0
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java
...ig/auth/handler/PigAuthenticationSuccessEventHandler.java
+2
-0
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigLogoutSuccessEventHandler.java
...4cloud/pig/auth/handler/PigLogoutSuccessEventHandler.java
+2
-0
pig-common/pig-common-core/pom.xml
pig-common/pig-common-core/pom.xml
+0
-6
pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/EnablePigFeignClients.java
...ud/pig/common/feign/annotation/EnablePigFeignClients.java
+3
-6
pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/ext/PigSentinelFeign.java
.../com/pig4cloud/pig/common/feign/ext/PigSentinelFeign.java
+5
-5
pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java
...n/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java
+2
-1
pig-common/pig-common-mybatis/pom.xml
pig-common/pig-common-mybatis/pom.xml
+5
-0
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
...ig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
+11
-0
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java
...ava/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java
+45
-0
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/config/MybatisPlusMetaObjectHandler.java
...g/common/mybatis/config/MybatisPlusMetaObjectHandler.java
+77
-0
pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractLogoutSuccessEventHandler.java
...n/security/handler/AbstractLogoutSuccessEventHandler.java
+0
-1
pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java
...ava/com/pig4cloud/pig/common/security/util/AuthUtils.java
+0
-1
pig-upms/pig-upms-api/pom.xml
pig-upms/pig-upms-api/pom.xml
+5
-0
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java
...main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java
+2
-15
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java
...main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java
+2
-16
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java
.../java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java
+2
-16
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java
.../main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java
+2
-21
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java
...main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java
+2
-15
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java
...pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java
+2
-2
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java
...main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java
+2
-9
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java
...main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java
+2
-16
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java
.../java/com/pig4cloud/pig/admin/service/SysUserService.java
+0
-1
pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/support/CodeGenKits.java
...n/java/com/pig4cloud/pig/codegen/support/CodeGenKits.java
+8
-0
pig-visual/pig-codegen/src/main/resources/generator.properties
...isual/pig-codegen/src/main/resources/generator.properties
+3
-0
pig-visual/pig-codegen/src/main/resources/template/Entity.java.vm
...al/pig-codegen/src/main/resources/template/Entity.java.vm
+2
-2
pig-visual/pig-codegen/src/main/resources/template/avue/index.vue.vm
...pig-codegen/src/main/resources/template/avue/index.vue.vm
+2
-2
pig-visual/pig-codegen/src/main/resources/template/element/form.vue.vm
...g-codegen/src/main/resources/template/element/form.vue.vm
+1
-1
pig-visual/pig-codegen/src/main/resources/template/element/index.vue.vm
...-codegen/src/main/resources/template/element/index.vue.vm
+5
-4
未找到文件。
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java
浏览文件 @
1c8a4150
...
...
@@ -52,6 +52,8 @@ public class PigAuthenticationFailureEvenHandler extends AbstractAuthenticationF
Long
startTime
=
System
.
currentTimeMillis
();
Long
endTime
=
System
.
currentTimeMillis
();
logVo
.
setTime
(
endTime
-
startTime
);
logVo
.
setCreateBy
(
authentication
.
getName
());
logVo
.
setUpdateBy
(
authentication
.
getName
());
SpringContextHolder
.
publishEvent
(
new
SysLogEvent
(
logVo
));
}
...
...
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java
浏览文件 @
1c8a4150
...
...
@@ -48,6 +48,8 @@ public class PigAuthenticationSuccessEventHandler extends AbstractAuthentication
Long
startTime
=
System
.
currentTimeMillis
();
Long
endTime
=
System
.
currentTimeMillis
();
logVo
.
setTime
(
endTime
-
startTime
);
logVo
.
setCreateBy
(
authentication
.
getName
());
logVo
.
setUpdateBy
(
authentication
.
getName
());
SpringContextHolder
.
publishEvent
(
new
SysLogEvent
(
logVo
));
}
...
...
pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigLogoutSuccessEventHandler.java
浏览文件 @
1c8a4150
...
...
@@ -57,6 +57,8 @@ public class PigLogoutSuccessEventHandler extends AbstractLogoutSuccessEventHand
OAuth2Authentication
auth2Authentication
=
(
OAuth2Authentication
)
authentication
;
logVo
.
setServiceId
(
auth2Authentication
.
getOAuth2Request
().
getClientId
());
}
logVo
.
setCreateBy
(
authentication
.
getName
());
logVo
.
setUpdateBy
(
authentication
.
getName
());
SpringContextHolder
.
publishEvent
(
new
SysLogEvent
(
logVo
));
}
...
...
pig-common/pig-common-core/pom.xml
浏览文件 @
1c8a4150
...
...
@@ -47,12 +47,6 @@
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
</dependency>
<!--mybatis plus extension,包含了mybatis plus core-->
<dependency>
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-extension
</artifactId>
<version>
${mybatis-plus.version}
</version>
</dependency>
<!--hibernate-validator-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/EnablePigFeignClients.java
浏览文件 @
1c8a4150
...
...
@@ -16,13 +16,10 @@
package
com.pig4cloud.pig.common.feign.annotation
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
import
org.springframework.cloud.openfeign.FeignClientsConfiguration
;
import
java.lang.annotation.*
;
/**
* @author lengleng
...
...
pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/ext/PigSentinelFeign.java
浏览文件 @
1c8a4150
...
...
@@ -16,11 +16,6 @@
package
com.pig4cloud.pig.common.feign.ext
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.InvocationHandler
;
import
java.lang.reflect.Method
;
import
java.util.Map
;
import
com.alibaba.cloud.sentinel.feign.SentinelContractHolder
;
import
feign.Contract
;
import
feign.Feign
;
...
...
@@ -36,6 +31,11 @@ import org.springframework.core.annotation.AnnotationUtils;
import
org.springframework.util.ReflectionUtils
;
import
org.springframework.util.StringUtils
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.InvocationHandler
;
import
java.lang.reflect.Method
;
import
java.util.Map
;
/**
* 支持自动降级注入 重写 {@link com.alibaba.cloud.sentinel.feign.SentinelFeign}
*
...
...
pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java
浏览文件 @
1c8a4150
...
...
@@ -46,6 +46,7 @@ public class SysLogUtils {
.
requireNonNull
(
RequestContextHolder
.
getRequestAttributes
())).
getRequest
();
SysLog
sysLog
=
new
SysLog
();
sysLog
.
setCreateBy
(
Objects
.
requireNonNull
(
getUsername
()));
sysLog
.
setUpdateBy
(
Objects
.
requireNonNull
(
getUsername
()));
sysLog
.
setType
(
LogTypeEnum
.
NORMAL
.
getType
());
sysLog
.
setRemoteAddr
(
ServletUtil
.
getClientIP
(
request
));
sysLog
.
setRequestUri
(
URLUtil
.
getPath
(
request
.
getRequestURI
()));
...
...
@@ -89,4 +90,4 @@ public class SysLogUtils {
return
authentication
.
getName
();
}
}
\ No newline at end of file
}
pig-common/pig-common-mybatis/pom.xml
浏览文件 @
1c8a4150
...
...
@@ -58,5 +58,10 @@
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
</dependency>
<!--security 依赖-->
<dependency>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-core
</artifactId>
</dependency>
</dependencies>
</project>
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
浏览文件 @
1c8a4150
...
...
@@ -17,8 +17,10 @@
package
com.pig4cloud.pig.common.mybatis
;
import
com.baomidou.mybatisplus.annotation.DbType
;
import
com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
;
import
com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
;
import
com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor
;
import
com.pig4cloud.pig.common.mybatis.config.MybatisPlusMetaObjectHandler
;
import
com.pig4cloud.pig.common.mybatis.resolver.SqlFilterArgumentResolver
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -55,4 +57,13 @@ public class MybatisAutoConfiguration implements WebMvcConfigurer {
return
interceptor
;
}
/**
* 审计字段自动填充
* @return {@link MetaObjectHandler}
*/
@Bean
public
MybatisPlusMetaObjectHandler
mybatisPlusMetaObjectHandler
()
{
return
new
MybatisPlusMetaObjectHandler
();
}
}
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java
0 → 100644
浏览文件 @
1c8a4150
package
com.pig4cloud.pig.common.mybatis.base
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* 抽象实体
*
* @author lengleng
* @date 2021/8/9
*/
@Getter
@Setter
public
class
BaseEntity
implements
Serializable
{
/**
* 创建者
*/
@TableField
(
fill
=
FieldFill
.
INSERT
)
private
String
createBy
;
/**
* 创建时间
*/
@TableField
(
fill
=
FieldFill
.
INSERT
)
private
LocalDateTime
createTime
;
/**
* 更新者
*/
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
private
String
updateBy
;
/**
* 更新时间
*/
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
updateTime
;
}
pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/config/MybatisPlusMetaObjectHandler.java
0 → 100644
浏览文件 @
1c8a4150
package
com.pig4cloud.pig.common.mybatis.config
;
import
com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.ibatis.reflection.MetaObject
;
import
org.springframework.security.core.Authentication
;
import
org.springframework.security.core.context.SecurityContextHolder
;
import
org.springframework.util.ClassUtils
;
import
java.time.LocalDateTime
;
import
java.util.Optional
;
/**
* MybatisPlus 自动填充配置
*
* @author L.cm
*/
@Slf4j
public
class
MybatisPlusMetaObjectHandler
implements
MetaObjectHandler
{
@Override
public
void
insertFill
(
MetaObject
metaObject
)
{
log
.
debug
(
"mybatis plus start insert fill ...."
);
LocalDateTime
now
=
LocalDateTime
.
now
();
fillValIfNullByName
(
"createTime"
,
now
,
metaObject
,
false
);
fillValIfNullByName
(
"updateTime"
,
now
,
metaObject
,
false
);
fillValIfNullByName
(
"createBy"
,
getUserName
(),
metaObject
,
false
);
fillValIfNullByName
(
"updateBy"
,
getUserName
(),
metaObject
,
false
);
}
@Override
public
void
updateFill
(
MetaObject
metaObject
)
{
log
.
debug
(
"mybatis plus start update fill ...."
);
fillValIfNullByName
(
"updateTime"
,
LocalDateTime
.
now
(),
metaObject
,
true
);
fillValIfNullByName
(
"updateBy"
,
getUserName
(),
metaObject
,
true
);
}
/**
* 填充值,先判断是否有手动设置,优先手动设置的值,例如:job必须手动设置
*
* @param fieldName 属性名
* @param fieldVal 属性值
* @param metaObject MetaObject
* @param isCover 是否覆盖原有值,避免更新操作手动入参
*/
private
static
void
fillValIfNullByName
(
String
fieldName
,
Object
fieldVal
,
MetaObject
metaObject
,
boolean
isCover
)
{
// 1. 没有 get 方法
if
(!
metaObject
.
hasSetter
(
fieldName
))
{
return
;
}
// 2. 如果用户有手动设置的值
Object
userSetValue
=
metaObject
.
getValue
(
fieldName
);
if
(
userSetValue
!=
null
&&
!
isCover
)
{
return
;
}
// 3. field 类型相同时设置
Class
<?>
getterType
=
metaObject
.
getGetterType
(
fieldName
);
if
(
ClassUtils
.
isAssignableValue
(
getterType
,
fieldVal
))
{
metaObject
.
setValue
(
fieldName
,
fieldVal
);
}
}
/**
* 获取 spring security 当前的用户名
*
* @return 当前用户名
*/
private
String
getUserName
()
{
Authentication
authentication
=
SecurityContextHolder
.
getContext
().
getAuthentication
();
if
(
Optional
.
ofNullable
(
authentication
).
isPresent
())
{
return
authentication
.
getName
();
}
return
null
;
}
}
pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractLogoutSuccessEventHandler.java
浏览文件 @
1c8a4150
...
...
@@ -18,7 +18,6 @@ package com.pig4cloud.pig.common.security.handler;
import
cn.hutool.core.collection.CollUtil
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.security.authentication.event.AuthenticationSuccessEvent
;
import
org.springframework.security.authentication.event.LogoutSuccessEvent
;
import
org.springframework.security.core.Authentication
;
...
...
pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java
浏览文件 @
1c8a4150
...
...
@@ -24,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.http.HttpHeaders
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.IOException
;
/**
* @author lengleng
...
...
pig-upms/pig-upms-api/pom.xml
浏览文件 @
1c8a4150
...
...
@@ -46,5 +46,10 @@
<groupId>
com.pig4cloud
</groupId>
<artifactId>
pig-common-feign
</artifactId>
</dependency>
<!--mybatis 依赖-->
<dependency>
<groupId>
com.pig4cloud
</groupId>
<artifactId>
pig-common-mybatis
</artifactId>
</dependency>
</dependencies>
</project>
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java
浏览文件 @
1c8a4150
...
...
@@ -19,13 +19,12 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
java.time.LocalDateTime
;
/**
* <p>
...
...
@@ -37,7 +36,7 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysDept
extends
Model
<
SysDept
>
{
public
class
SysDept
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -58,18 +57,6 @@ public class SysDept extends Model<SysDept> {
@ApiModelProperty
(
value
=
"排序值"
)
private
Integer
sort
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 修改时间
*/
@ApiModelProperty
(
value
=
"修改时间"
)
private
LocalDateTime
updateTime
;
/**
* 父级部门id
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java
浏览文件 @
1c8a4150
...
...
@@ -18,14 +18,12 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.time.LocalDateTime
;
/**
* 字典表
*
...
...
@@ -35,7 +33,7 @@ import java.time.LocalDateTime;
@Data
@ApiModel
(
value
=
"字典类型"
)
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysDict
extends
Model
<
SysDict
>
{
public
class
SysDict
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -58,18 +56,6 @@ public class SysDict extends Model<SysDict> {
@ApiModelProperty
(
value
=
"字典描述"
)
private
String
description
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 是否是系统内置
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java
浏览文件 @
1c8a4150
...
...
@@ -17,14 +17,12 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.time.LocalDateTime
;
/**
* 字典项
*
...
...
@@ -34,7 +32,7 @@ import java.time.LocalDateTime;
@Data
@ApiModel
(
value
=
"字典项"
)
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysDictItem
extends
Model
<
SysDictItem
>
{
public
class
SysDictItem
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -81,18 +79,6 @@ public class SysDictItem extends Model<SysDictItem> {
@ApiModelProperty
(
value
=
"排序值,默认升序"
)
private
Integer
sort
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 备注信息
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java
浏览文件 @
1c8a4150
...
...
@@ -21,12 +21,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
import
com.pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
...
...
@@ -37,7 +36,7 @@ import java.time.LocalDateTime;
* @since 2019/2/1
*/
@Data
public
class
SysLog
implements
Serializable
{
public
class
SysLog
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -63,24 +62,6 @@ public class SysLog implements Serializable {
@ApiModelProperty
(
value
=
"日志标题"
)
private
String
title
;
/**
* 创建者
*/
@ApiModelProperty
(
value
=
"创建人"
)
private
String
createBy
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 操作IP地址
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java
浏览文件 @
1c8a4150
...
...
@@ -19,14 +19,13 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.time.LocalDateTime
;
/**
* <p>
...
...
@@ -38,7 +37,7 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysMenu
extends
Model
<
SysMenu
>
{
public
class
SysMenu
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -99,18 +98,6 @@ public class SysMenu extends Model<SysMenu> {
@ApiModelProperty
(
value
=
"路由缓冲"
)
private
String
keepAlive
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 0--正常 1--删除
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java
浏览文件 @
1c8a4150
...
...
@@ -18,7 +18,7 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -35,7 +35,7 @@ import javax.validation.constraints.NotBlank;
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysOauthClientDetails
extends
Model
<
SysOauthClientDetails
>
{
public
class
SysOauthClientDetails
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java
浏览文件 @
1c8a4150
...
...
@@ -19,13 +19,12 @@ package com.pig4cloud.pig.admin.api.entity;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.
baomidou.mybatisplus.extension.activerecord.Model
;
import
com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
java.time.LocalDateTime
;
/**
* <p>
...
...
@@ -37,7 +36,7 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
SysRole
extends
Model
<
SysRole
>
{
public
class
SysRole
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -57,12 +56,6 @@ public class SysRole extends Model<SysRole> {
@ApiModelProperty
(
value
=
"角色描述"
)
private
String
roleDesc
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
@ApiModelProperty
(
value
=
"修改时间"
)
private
LocalDateTime
updateTime
;
/**
* 删除标识(0-正常,1-删除)
*/
...
...
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java
浏览文件 @
1c8a4150
...
...
@@ -20,12 +20,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.pig4cloud.pig.common.mybatis.base.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
* 用户表
...
...
@@ -35,7 +33,7 @@ import java.time.LocalDateTime;
* @since 2019/2/1
*/
@Data
public
class
SysUser
implements
Serializable
{
public
class
SysUser
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -65,18 +63,6 @@ public class SysUser implements Serializable {
@ApiModelProperty
(
value
=
"随机盐"
)
private
String
salt
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 修改时间
*/
@ApiModelProperty
(
value
=
"修改时间"
)
private
LocalDateTime
updateTime
;
/**
* 锁定标记
*/
...
...
pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java
浏览文件 @
1c8a4150
...
...
@@ -23,7 +23,6 @@ import com.pig4cloud.pig.admin.api.dto.UserDTO;
import
com.pig4cloud.pig.admin.api.dto.UserInfo
;
import
com.pig4cloud.pig.admin.api.entity.SysUser
;
import
com.pig4cloud.pig.admin.api.vo.UserVO
;
import
com.pig4cloud.pig.common.core.util.R
;
import
java.util.List
;
...
...
pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/support/CodeGenKits.java
浏览文件 @
1c8a4150
...
...
@@ -147,9 +147,17 @@ public class CodeGenKits {
tableEntity
.
setLowerClassName
(
StringUtils
.
uncapitalize
(
className
));
// 获取需要在swagger文档中隐藏的属性字段
List
<
Object
>
hiddenColumns
=
config
.
getList
(
"hiddenColumn"
);
// 排除不需要处理的字段
List
<
Object
>
excludeColumns
=
config
.
getList
(
"excludeColumn"
);
// 列信息
List
<
ColumnEntity
>
columnList
=
new
ArrayList
<>();
for
(
Map
<
String
,
String
>
column
:
columns
)
{
// 判断是否处理
String
columnName
=
column
.
get
(
"columnName"
);
if
(
excludeColumns
.
contains
(
columnName
))
{
continue
;
}
ColumnEntity
columnEntity
=
new
ColumnEntity
();
columnEntity
.
setColumnName
(
column
.
get
(
"columnName"
));
columnEntity
.
setDataType
(
column
.
get
(
"dataType"
));
...
...
pig-visual/pig-codegen/src/main/resources/generator.properties
浏览文件 @
1c8a4150
...
...
@@ -26,6 +26,9 @@ author=pig code generator
#\u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
tablePrefix
=
table_
#\u6392\u9664\u4E0D\u751F\u6210\u7684\u5B57\u6BB5
excludeColumns
=
createTime,updateTime,createBy,updateBy
#\u7C7B\u578B\u8F6C\u6362\uFF0C\u914D\u7F6E\u4FE1\u606F
tinyint
=
Integer
smallint
=
Integer
...
...
pig-visual/pig-codegen/src/main/resources/template/Entity.java.vm
浏览文件 @
1c8a4150
...
...
@@ -19,7 +19,7 @@ package ${package}.${moduleName}.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.
baomidou.mybatisplus.extension.activerecord.Model
;
import com.
pig4cloud.pig.common.mybatis.base.BaseEntity
;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
...
...
@@ -40,7 +40,7 @@ import java.time.LocalDateTime;
@TableName("
${
tableName
}
")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "
${
comments
}
")
public class
${
className
}
extends
Model
<
${
className
}
>
{
public class
${
className
}
extends
BaseEntity
{
private static final long serialVersionUID = 1L;
#
foreach
($
column
in
$
columns
)
...
...
pig-visual/pig-codegen/src/main/resources/template/avue/index.vue.vm
浏览文件 @
1c8a4150
...
...
@@ -37,8 +37,8 @@
</template>
<script>
import
{
fetchList
,
getObj
,
addObj
,
putObj
,
delObj
}
from
'
@/api/
${
pathName
}
'
import
{
tableOption
}
from
'
@/const/crud/
${
pathName
}
'
import
{
addObj
,
delObj
,
fetchList
,
putObj
}
from
'
@/api/
'
import
{
tableOption
}
from
'
@/const/crud/
'
import
{
mapGetters
}
from
'
vuex
'
export
default
{
...
...
pig-visual/pig-codegen/src/main/resources/template/element/form.vue.vm
浏览文件 @
1c8a4150
...
...
@@ -20,7 +20,7 @@
</template>
<script>
import
{
getObj
,
addObj
,
putObj
}
from
'
@/api/
${
pathName
}
'
import
{
addObj
,
getObj
,
putObj
}
from
'
@/api/
'
export
default
{
data
()
{
...
...
pig-visual/pig-codegen/src/main/resources/template/element/index.vue.vm
浏览文件 @
1c8a4150
...
...
@@ -51,10 +51,11 @@
</template>
<script>
import
{
fetchList
,
delObj
}
from
'
@/api/
${
pathName
}
'
import
TableForm
from
'
./
${
pathName
}
-form
'
import
{
mapGetters
}
from
'
vuex
'
export
default
{
import
{
delObj
,
fetchList
}
from
'
@/api/
'
import
TableForm
from
'
./
'
import
{
mapGetters
}
from
'
vuex
'
export
default
{
data
()
{
return
{
dataForm
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录