diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java index d1bb333a..7ec76752 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java @@ -29,4 +29,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons String SYSTEM_USERNAME = "system"; + int BATCH_COUNT = 500; + } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java index 2e0398bf..3a4c7e0a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java @@ -32,11 +32,11 @@ public class IpUtils { * @return addr */ public static String getRemoteAddr(HttpServletRequest request) { - // 获取实际地址 - String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP); - if (!Strings.isBlank(realIp)) { - return realIp; - } + // 获取实际地址 X_REAL_IP 在多代理情况下会有问题 + // String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP); + // if (!Strings.isBlank(realIp)) { + // return realIp; + // } // 获取请求地址 return Servlets.getRemoteAddr(request); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java index 0d474e28..05d4cff2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java @@ -7,9 +7,6 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.quartz.SchedulerFactoryBean; -import org.springframework.scheduling.quartz.SpringBeanJobFactory; - -import javax.sql.DataSource; /** * quartz 配置 @@ -22,27 +19,6 @@ import javax.sql.DataSource; @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB_QUARTZ) public class OrionQuartzAutoConfiguration { - /** - * @return 任务工厂 - */ - @Bean - public SpringBeanJobFactory jobFactory() { - return new SpringBeanJobFactory(); - } - - /** - * @param dataSource dataSource - * @param jobFactory jobFactory - * @return 调度器工厂 - */ - @Bean - public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource, SpringBeanJobFactory jobFactory) { - SchedulerFactoryBean factory = new SchedulerFactoryBean(); - factory.setDataSource(dataSource); - factory.setJobFactory(jobFactory); - return factory; - } - /** * @param schedulerFactoryBean 调度器工厂 * @return 调度器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java index f8a14ab3..4a4ce0dd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java @@ -6,6 +6,9 @@ import java.lang.annotation.*; /** * 不执行统一日志打印 + *
+ * 如果设置在方法上,则忽略该方法的日志打印
+ * 如果设置到参数上,则忽略该参数的日志打印
*
* @author Jiahang Li
* @version 1.0.0
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
index 13ae6bba..6be3f252 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
@@ -3,6 +3,7 @@ package com.orion.visor.framework.mybatis.core.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.toolkit.Db;
+import com.orion.visor.framework.common.constant.Const;
import com.orion.visor.framework.mybatis.core.query.Conditions;
import com.orion.visor.framework.mybatis.core.query.DataQuery;
@@ -61,7 +62,7 @@ public interface IMapper