zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 优化 适配Oracle 数据库

Browse Source
This commit is contained in:
lbw committed 2021-12-20 20:15:30 +08:00
1 parent a09ebf7d9a
commit 1b0685a4d2
31 files changed
+119 -101
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java
+1 -1
View File
@@ -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);
pigx-common/pigx-common-bom/pom.xml
+7
View File
@@ -22,6 +22,7 @@
<dynamic-ds.version>3.4.1</dynamic-ds.version>
<druid.version>1.2.8</druid.version>
<mysql.connector.version>8.0.27</mysql.connector.version>
<oracle.version>21.3.0.0</oracle.version>
<swagger.core.version>1.5.22</swagger.core.version>
<mp.weixin.version>3.9.0</mp.weixin.version>
<ijpay.version>2.7.6</ijpay.version>
@@ -170,6 +171,12 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--oracle 驱动-->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
</dependency>
<!--fastjson-->
<dependency>
<groupId>com.alibaba</groupId>
pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java
+2
View File
@@ -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
pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java
+1 -1
View File
@@ -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;
}
pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java
+5 -7
View File
@@ -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());
pigx-common/pigx-common-websocket/src/main/java/com/pig4cloud/pigx/common/websocket/distribute/RedisWebsocketMessageListener.java
+3
View File
@@ -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<String> stringSerializer = stringRedisTemplate.getStringSerializer();
String channel = stringSerializer.deserialize(channelBytes);
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class SysLogDTO {
* 日志类型
*/
@NotBlank(message = "日志类型不能为空")
private String type;
private String logType;
/**
* 日志标题
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java
+4 -3
View File
@@ -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<SysDept> {
* 创建时间
*/
@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<SysDept> {
*/
@TableLogic
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
@TableField(fill = FieldFill.INSERT)
private String delFlag;
}
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java
+4 -4
View File
@@ -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<SysDict> {
* 创建时间
*/
@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<SysDict> {
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
private String delFlag;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java
+4 -3
View File
@@ -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<SysDictItem> {
/**
* 创建时间
*/
@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<SysDictItem> {
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
private String delFlag;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java
+4 -3
View File
@@ -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<SysFile> {
/**
* 更新人
*/
@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<SysFile> {
* 删除标识：1-删除，0-正常
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
private Integer delFlag;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java
+5 -4
View File
@@ -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;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java
+4 -3
View File
@@ -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<SysMenu> {
/**
* 创建时间
*/
@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<SysMenu> {
* 0--正常 1--删除
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
private String delFlag;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java
+2 -3
View File
@@ -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<SysOauthClientDetails> {
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
private String delFlag;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
+4 -4
View File
@@ -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<SysPublicParam> {
* 删除状态（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<SysPublicParam> {
/**
* 创建时间
*/
@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;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java
+4 -3
View File
@@ -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<SysRole> {
* 创建时间
*/
@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;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java
+1 -3
View File
@@ -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<SysRouteConf> {
/**
* 排序
*/
@TableField(value = "`order`")
@ApiModelProperty(value = "排序值")
private Integer order;
private Integer sortOrder;
@ApiModelProperty(value = "元数据")
private String metadata;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java
+4 -3
View File
@@ -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<SysSocialDetails> {
* 创建时间
*/
@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;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java
+4 -3
View File
@@ -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<SysTenant> {
* 删除标记
*/
@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;
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java
+4 -3
View File
@@ -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;
pigx-upms/pigx-upms-biz/pom.xml
+5 -5
View File
@@ -33,6 +33,11 @@
<description>pigx 通用用户权限管理系统业务处理模块</description>
<dependencies>
<!-- 数据库驱动 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--upms api、model 模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
@@ -102,11 +107,6 @@
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<!--数据库-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!--web 模块-->
<dependency>
<groupId>org.springframework.boot</groupId>
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java
+1 -1
View File
@@ -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));
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java
-3
View File
@@ -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;
/**
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
+3 -3
View File
@@ -61,7 +61,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
public Boolean saveBatchLogs(List<PreLogVO> preLogVoList) {
List<SysLog> 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<SysLogMapper, SysLog> impleme
public Page getLogByPage(Page page, SysLogDTO sysLog) {
LambdaQueryWrapper<SysLog> 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())) {
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
routeConf.setRouteName(vo.getRouteName());
routeConf.setFilters(JSONUtil.toJsonStr(vo.getFilters()));
routeConf.setPredicates(JSONUtil.toJsonStr(vo.getPredicates()));
routeConf.setOrder(vo.getOrder());
routeConf.setSortOrder(vo.getOrder());
routeConf.setUri(vo.getUri().toString());
routeConf.setMetadata(JSONUtil.toJsonStr(vo.getMetadata()));
return routeConf;
pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml
+1 -1
View File
@@ -60,7 +60,7 @@
</logger>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="INFO">
<root level="debug">
<appender-ref ref="console"/>
<appender-ref ref="debug"/>
</root>
pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml
-17
View File
@@ -23,21 +23,4 @@
<mapper namespace="com.pig4cloud.pigx.admin.mapper.SysLogMapper">
<resultMap id="sysLogMap" type="com.pig4cloud.pigx.admin.api.entity.SysLog">
<id property="id" column="id"/>
<result property="type" column="type"/>
<result property="title" column="title"/>
<result property="serviceId" column="service_id"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="remoteAddr" column="remote_addr"/>
<result property="userAgent" column="user_agent"/>
<result property="requestUri" column="request_uri"/>
<result property="method" column="method"/>
<result property="params" column="params"/>
<result property="time" column="time"/>
<result property="delFlag" column="del_flag"/>
<result property="exception" column="exception"/>
</resultMap>
</mapper>
pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml
-13
View File
@@ -20,17 +20,4 @@
<mapper namespace="com.pig4cloud.pigx.admin.mapper.SysRouteConfMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.pig4cloud.pigx.admin.api.entity.SysRouteConf" id="sysRouteConfMap">
<result property="routeId" column="route_id"/>
<result property="predicates" column="predicates"/>
<result property="filters" column="filters"/>
<result property="uri" column="uri"/>
<result property="order" column="order"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
</mapper>
pigx-visual/pigx-codegen/pom.xml
+2 -4
View File
@@ -18,7 +18,6 @@
<screw.version>0.0.1</screw.version>
<sqlserver.version>4.0</sqlserver.version>
<db2.version>11.5.0.0</db2.version>
<oracle.version>12.1.0.1-atlassian-hosted</oracle.version>
<configuration.version>1.10</configuration.version>
</properties>
@@ -59,9 +58,8 @@
</dependency>
<!-- oracle 驱动 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!-- sqlserver 驱动 -->
<dependency>
pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/MsgController.java
+37
View File
@@ -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();
}
}
pom.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<maven.compiler.version>3.8.1</maven.compiler.version>
<spring.checkstyle.version>0.0.28</spring.checkstyle.version>
<git.commit.version>2.2.5</git.commit.version>
<spring-boot-admin.version>2.5.3</spring-boot-admin.version>
<spring-boot-admin.version>2.5.5</spring-boot-admin.version>
<hutool.version>5.7.16</hutool.version>
<captcha.version>1.2.7</captcha.version>
<swagger.fox.version>3.0.0</swagger.fox.version>