diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java index 3512037cf..a43b85fa4 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java @@ -66,7 +66,7 @@ public class PigxAuthenticationFailureEventHandler implements AuthenticationFail String username = authentication.getName(); SysLogDTO sysLog = SysLogUtils.getSysLog(request, username); sysLog.setTitle(username + "用户登录"); - sysLog.setType(LogTypeEnum.ERROR.getType()); + sysLog.setLogType(LogTypeEnum.ERROR.getType()); sysLog.setParams(username); sysLog.setException(authenticationException.getLocalizedMessage()); String header = request.getHeader(HttpHeaders.AUTHORIZATION); diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 7be4096d5..f0126105b 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -22,6 +22,7 @@ 3.4.1 1.2.8 8.0.27 + 21.3.0.0 1.5.22 3.9.0 2.7.6 @@ -170,6 +171,12 @@ mysql-connector-java ${mysql.connector.version} + + + com.oracle.database.jdbc + ojdbc8 + ${oracle.version} + com.alibaba diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java index dc21728aa..f384a1eef 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java @@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.mybatis; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.pig4cloud.pigx.common.core.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.security.core.Authentication; @@ -29,6 +30,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { fillValIfNullByName("updateTime", now, metaObject, false); fillValIfNullByName("createBy", getUserName(), metaObject, false); fillValIfNullByName("updateBy", getUserName(), metaObject, false); + fillValIfNullByName("delFlag", CommonConstants.STATUS_NORMAL, metaObject, false); } @Override diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index 1ca339b89..4756657ed 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java @@ -63,7 +63,7 @@ public class SysLogAspect { obj = point.proceed(); } catch (Exception e) { - logDTO.setType(LogTypeEnum.ERROR.getType()); + logDTO.setLogType(LogTypeEnum.ERROR.getType()); logDTO.setException(e.getMessage()); throw e; } diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java index fe1cdcde3..c44af2f10 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java @@ -19,22 +19,20 @@ package com.pig4cloud.pigx.common.log.util; -import java.util.Objects; - -import javax.servlet.http.HttpServletRequest; - import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpUtil; import com.pig4cloud.pigx.admin.api.dto.SysLogDTO; import lombok.experimental.UtilityClass; - import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; +import java.util.Objects; + /** * 系统日志工具类 * @@ -48,7 +46,7 @@ public class SysLogUtils { .requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); SysLogDTO sysLog = new SysLogDTO(); sysLog.setCreateBy(Objects.requireNonNull(getUsername())); - sysLog.setType(LogTypeEnum.NORMAL.getType()); + sysLog.setLogType(LogTypeEnum.NORMAL.getType()); sysLog.setRemoteAddr(ServletUtil.getClientIP(request)); sysLog.setRequestUri(URLUtil.getPath(request.getRequestURI())); sysLog.setMethod(request.getMethod()); @@ -61,7 +59,7 @@ public class SysLogUtils { public SysLogDTO getSysLog(HttpServletRequest request, String username) { SysLogDTO sysLog = new SysLogDTO(); sysLog.setCreateBy(username); - sysLog.setType(LogTypeEnum.NORMAL.getType()); + sysLog.setLogType(LogTypeEnum.NORMAL.getType()); sysLog.setRemoteAddr(ServletUtil.getClientIP(request)); sysLog.setRequestUri(URLUtil.getPath(request.getRequestURI())); sysLog.setMethod(request.getMethod()); diff --git a/pigx-common/pigx-common-websocket/src/main/java/com/pig4cloud/pigx/common/websocket/distribute/RedisWebsocketMessageListener.java b/pigx-common/pigx-common-websocket/src/main/java/com/pig4cloud/pigx/common/websocket/distribute/RedisWebsocketMessageListener.java index 227907075..5b5be796a 100644 --- a/pigx-common/pigx-common-websocket/src/main/java/com/pig4cloud/pigx/common/websocket/distribute/RedisWebsocketMessageListener.java +++ b/pigx-common/pigx-common-websocket/src/main/java/com/pig4cloud/pigx/common/websocket/distribute/RedisWebsocketMessageListener.java @@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.websocket.distribute; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.core.StringRedisTemplate; @@ -13,6 +14,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; * @author Hccake 2021/1/12 * @version 1.0 */ +@Slf4j @RequiredArgsConstructor public class RedisWebsocketMessageListener implements MessageListener, MessageSender { @@ -22,6 +24,7 @@ public class RedisWebsocketMessageListener implements MessageListener, MessageSe @Override public void onMessage(Message message, byte[] bytes) { + log.info("redis channel Listener message send {}", message); byte[] channelBytes = message.getChannel(); RedisSerializer stringSerializer = stringRedisTemplate.getStringSerializer(); String channel = stringSerializer.deserialize(channelBytes); diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java index 504c4f675..3e0d69c9a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java @@ -25,7 +25,7 @@ public class SysLogDTO { * 日志类型 */ @NotBlank(message = "日志类型不能为空") - private String type; + private String logType; /** * 日志标题 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index fbc31ef77..9a802f371 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -19,9 +19,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -69,12 +67,14 @@ public class SysDept extends Model { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** @@ -88,6 +88,7 @@ public class SysDept extends Model { */ @TableLogic @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + @TableField(fill = FieldFill.INSERT) private String delFlag; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index fdf04a60f..28ddcb568 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -16,10 +16,7 @@ */ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -64,12 +61,14 @@ public class SysDict extends Model { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ @ApiModelProperty(value = "更新时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** @@ -89,6 +88,7 @@ public class SysDict extends Model { * 删除标记 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index 29115bc59..8ad453acd 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -16,9 +16,7 @@ */ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -86,12 +84,14 @@ public class SysDictItem extends Model { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; @@ -105,6 +105,7 @@ public class SysDictItem extends Model { * 删除标记 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java index 74315adfd..69c61109a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java @@ -17,9 +17,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -93,12 +91,14 @@ public class SysFile extends Model { /** * 更新人 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "更新者") private String updateUser; /** * 更新时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; @@ -106,6 +106,7 @@ public class SysFile extends Model { * 删除标识：1-删除，0-正常 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private Integer delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 47034cee2..8b4c3a994 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -21,9 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -60,7 +58,7 @@ public class SysLog implements Serializable { @NotBlank(message = "日志类型不能为空") @ExcelProperty("日志类型（0-正常 9-错误）") @ApiModelProperty(value = "日志类型") - private String type; + private String logType; /** * 日志标题 @@ -81,6 +79,7 @@ public class SysLog implements Serializable { * 创建时间 */ @ExcelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; @@ -88,6 +87,7 @@ public class SysLog implements Serializable { * 更新时间 */ @ExcelIgnore + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; @@ -151,6 +151,7 @@ public class SysLog implements Serializable { */ @TableLogic @ExcelIgnore + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index b53f4a5bf..34ff2d6d3 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -19,9 +19,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -108,12 +106,14 @@ public class SysMenu extends Model { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; @@ -121,6 +121,7 @@ public class SysMenu extends Model { * 0--正常 1--删除 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index bb33f201d..db34455e7 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -19,9 +19,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -122,6 +120,7 @@ public class SysOauthClientDetails extends Model { * 删除标记 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index 5574b87c4..c29145a6c 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -77,6 +74,7 @@ public class SysPublicParam extends Model { * 删除状态（0：正常 1：已删除） */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "状态[0-正常，1-删除]", example = "0") private String delFlag; @@ -89,12 +87,14 @@ public class SysPublicParam extends Model { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", example = "2019-03-21 12:28:48") private Date createTime; /** * 修改时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "修改时间", example = "2019-03-21 12:28:48") private Date updateTime; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index 46c6b4ccc..09db7ea8f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -19,9 +19,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -76,18 +74,21 @@ public class SysRole extends Model { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** * 删除标识（0-正常,1-删除） */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java index 559665dc6..da69b68cb 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.IdType; -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; @@ -81,9 +80,8 @@ public class SysRouteConf extends Model { /** * 排序 */ - @TableField(value = "`order`") @ApiModelProperty(value = "排序值") - private Integer order; + private Integer sortOrder; @ApiModelProperty(value = "元数据") private String metadata; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index e526a010e..25d8368f5 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -17,9 +17,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -86,18 +84,21 @@ public class SysSocialDetails extends Model { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ @ApiModelProperty(value = "更新时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** * 删除标记 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index 35bab3c46..e4a0a2a21 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -17,9 +17,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -82,18 +80,21 @@ public class SysTenant extends Model { * 删除标记 */ @TableLogic + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标记,1:已删除,0:正常") private String delFlag; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 197beb1cf..85284ef55 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -19,9 +19,7 @@ package com.pig4cloud.pigx.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.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -73,12 +71,14 @@ public class SysUser implements Serializable { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; /** * 修改时间 */ + @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "修改时间") private LocalDateTime updateTime; @@ -92,6 +92,7 @@ public class SysUser implements Serializable { /** * 锁定标记 */ + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "锁定标记") private String lockFlag; diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 52292b518..e357b101a 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -33,6 +33,11 @@ pigx 通用用户权限管理系统业务处理模块 + + + com.oracle.database.jdbc + ojdbc8 + com.pig4cloud @@ -102,11 +107,6 @@ com.alibaba druid-spring-boot-starter - - - mysql - mysql-connector-java - org.springframework.boot diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java index 040d5f11d..39b2e25a7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java @@ -69,7 +69,7 @@ public class DynamicRouteInitRunner { vo.setRouteName(route.getRouteName()); vo.setId(route.getRouteId()); vo.setUri(URI.create(route.getUri())); - vo.setOrder(route.getOrder()); + vo.setOrder(route.getSortOrder()); JSONArray filterObj = JSONUtil.parseArray(route.getFilters()); vo.setFilters(filterObj.toList(FilterDefinition.class)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index 9a21a871e..308250c44 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.vo.UserExcelVO; -import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.SysUserService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; @@ -54,8 +53,6 @@ import java.util.List; @Api(value = "user", tags = "用户管理模块") public class SysUserController { - private final SysUserMapper userMapper; - private final SysUserService userService; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index fe4a39d03..b8d0eb297 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -61,7 +61,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme public Boolean saveBatchLogs(List preLogVoList) { List sysLogs = preLogVoList.stream().map(pre -> { SysLog log = new SysLog(); - log.setType(CommonConstants.STATUS_LOCK); + log.setLogType(CommonConstants.STATUS_LOCK); log.setTitle(pre.getInfo()); log.setException(pre.getStack()); log.setParams(pre.getMessage()); @@ -77,8 +77,8 @@ public class SysLogServiceImpl extends ServiceImpl impleme public Page getLogByPage(Page page, SysLogDTO sysLog) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (StrUtil.isNotBlank(sysLog.getType())) { - wrapper.eq(SysLog::getType, sysLog.getType()); + if (StrUtil.isNotBlank(sysLog.getLogType())) { + wrapper.eq(SysLog::getLogType, sysLog.getLogType()); } if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java index 0e4ac9591..52cef406e 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java @@ -140,7 +140,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl - + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml index a5e30a6f5..e5894525c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml @@ -23,21 +23,4 @@ - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml index 2542b4faa..2bd2e0264 100755 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml @@ -20,17 +20,4 @@ - - - - - - - - - - - - - diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 51e45c7bc..7a46d76d8 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -18,7 +18,6 @@ 0.0.1 4.0 11.5.0.0 - 12.1.0.1-atlassian-hosted 1.10 @@ -59,9 +58,8 @@ - com.oracle - ojdbc6 - ${oracle.version} + com.oracle.database.jdbc + ojdbc8 diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/MsgController.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/MsgController.java new file mode 100644 index 000000000..7c1a52986 --- /dev/null +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/MsgController.java @@ -0,0 +1,37 @@ +package com.pig4cloud.pigx.act.controller; + +import cn.hutool.core.collection.CollUtil; +import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; +import com.pig4cloud.pigx.common.security.annotation.Inner; +import com.pig4cloud.pigx.common.websocket.distribute.MessageDO; +import com.pig4cloud.pigx.common.websocket.distribute.RedisMessageDistributor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lengleng + * @date 2021/12/16 + */ +@RequestMapping("/msg") +@RestController +public class MsgController { + + @Inner(value = false) + @GetMapping("/send") + public R send() { + RedisMessageDistributor messageDistributor = SpringContextHolder.getBean(RedisMessageDistributor.class); + + // websocket 发送消息 + MessageDO messageDO = new MessageDO(); + messageDO.setNeedBroadcast(Boolean.FALSE); + // 给目标用户ID + messageDO.setSessionKeys(CollUtil.newArrayList(1)); + messageDO.setMessageText("消息内容"); + messageDistributor.distribute(messageDO); + + return R.ok(); + } + +} diff --git a/pom.xml b/pom.xml index 49af3bbbb..19fdc5a1b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 3.8.1 0.0.28 2.2.5 - 2.5.3 + 2.5.5 5.7.16 1.2.7 3.0.0