IOT/MiddlePlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#update

Browse Source
This commit is contained in:
rqian
2026-04-17 17:12:41 +08:00
parent 99d9406936
commit a4b8203687
638 changed files with 4235 additions and 45595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maibu-framework/src/main/java/com/maibu/ali/AliSmsController.java
View File

@@ -1,7 +1,10 @@
package com.maibu.ali;
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.fastbee.framework.web.service.TokenService;
import com.maibu.annotation.Log;
import com.maibu.core.domain.AjaxResult;
import com.maibu.enums.BusinessType;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

2
maibu-framework/src/main/java/com/maibu/ali/AliSmsService.java
View File

@@ -1,7 +1,7 @@
package com.maibu.ali;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.fastbee.common.core.redis.RedisCache;
import com.maibu.core.redis.RedisCache;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

2
maibu-framework/src/main/java/com/maibu/ali/AliSmsUtil.java
View File

@@ -4,7 +4,7 @@ import com.aliyun.dysmsapi20170525.Client;
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.aliyun.teaopenapi.models.Config;
import com.fastbee.common.utils.json.JsonUtils;
import com.maibu.utils.json.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

19
maibu-framework/src/main/java/com/maibu/aspectj/DataScopeAspect.java
View File

@@ -2,19 +2,20 @@ package com.maibu.aspectj;
import java.util.ArrayList;
import java.util.List;
import com.maibu.annotation.DataScope;
import com.maibu.core.domain.BaseEntity;
import com.maibu.core.domain.entity.SysRole;
import com.maibu.core.domain.entity.SysUser;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.core.text.Convert;
import com.maibu.security.context.PermissionContextHolder;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.DataScope;
import com.fastbee.common.core.domain.BaseEntity;
import com.fastbee.common.core.domain.entity.SysRole;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.core.text.Convert;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.security.context.PermissionContextHolder;
/**
* 数据过滤处理

11
maibu-framework/src/main/java/com/maibu/aspectj/DataSourceAspect.java
View File

@@ -2,6 +2,10 @@ package com.maibu.aspectj;
import java.util.Objects;
import com.maibu.annotation.DataSource;
import com.maibu.datasource.DynamicDataSourceContextHolder;
import com.maibu.utils.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -12,9 +16,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.DataSource;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.datasource.DynamicDataSourceContextHolder;
/**
* 多数据源处理
@@ -28,8 +29,8 @@ public class DataSourceAspect
{
protected Logger logger = LoggerFactory.getLogger(getClass());
@Pointcut("@annotation(com.fastbee.common.annotation.DataSource)"
+ "|| @within(com.fastbee.common.annotation.DataSource)")
@Pointcut("@annotation(com.maibu.annotation.DataSource)"
+ "|| @within(com.maibu.annotation.DataSource)")
public void dsPointCut()
{

25
maibu-framework/src/main/java/com/maibu/aspectj/LogAspect.java
View File

@@ -5,6 +5,19 @@ import java.util.Collection;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.maibu.annotation.Log;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.domain.SysOperLog;
import com.maibu.enums.BusinessStatus;
import com.maibu.enums.HttpMethod;
import com.maibu.filter.PropertyPreExcludeFilter;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.IpUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing;
@@ -15,18 +28,6 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.enums.BusinessStatus;
import com.fastbee.common.enums.HttpMethod;
import com.fastbee.common.filter.PropertyPreExcludeFilter;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.system.domain.SysOperLog;
/**
* 操作日志记录处理

13
maibu-framework/src/main/java/com/maibu/aspectj/RateLimiterAspect.java
View File

@@ -4,6 +4,13 @@ package com.maibu.aspectj;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import com.maibu.annotation.RateLimiter;
import com.maibu.enums.LimitType;
import com.maibu.exception.ServiceException;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.IpUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -14,12 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.RedisScript;
import org.springframework.stereotype.Component;
import com.fastbee.common.annotation.RateLimiter;
import com.fastbee.common.enums.LimitType;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.IpUtils;
/**
* 限流处理

2
maibu-framework/src/main/java/com/maibu/config/CacheConfig.java
View File

@@ -1,8 +1,8 @@
package com.maibu.config;
import com.fastbee.framework.manager.SpringCacheManager;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.maibu.manager.SpringCacheManager;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cache.CacheManager;

2
maibu-framework/src/main/java/com/maibu/config/DataSourceConfig.java
View File

@@ -2,7 +2,7 @@ package com.maibu.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
import com.fastbee.framework.datasource.DynamicDataSource;
import com.maibu.datasource.DynamicDataSource;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;

7
maibu-framework/src/main/java/com/maibu/config/FilterConfig.java
View File

@@ -3,14 +3,15 @@ package com.maibu.config;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.DispatcherType;
import com.maibu.filter.RepeatableFilter;
import com.maibu.filter.XssFilter;
import com.maibu.utils.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.fastbee.common.filter.RepeatableFilter;
import com.fastbee.common.filter.XssFilter;
import com.fastbee.common.utils.StringUtils;
/**
* Filter配置

4
maibu-framework/src/main/java/com/maibu/config/MyBatisConfig.java
View File

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.datasource.DynamicDataSource;
import com.maibu.datasource.DynamicDataSource;
import com.maibu.utils.StringUtils;
import org.apache.ibatis.io.VFS;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;

4
maibu-framework/src/main/java/com/maibu/config/MybatisPlusMetaObjectHandler.java
View File

@@ -2,8 +2,8 @@ package com.maibu.config;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.util.ClassUtils;

2
maibu-framework/src/main/java/com/maibu/config/OtaThreadPoolConfig.java
View File

@@ -1,6 +1,6 @@
package com.maibu.config;
import com.fastbee.common.constant.FastBeeConstant;
import com.maibu.constant.FastBeeConstant;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

4
maibu-framework/src/main/java/com/maibu/config/RedissonConfig.java
View File

@@ -8,8 +8,9 @@ import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.maibu.config.properties.RedissonProperties;
import com.maibu.handler.KeyPrefixHandler;
import lombok.extern.slf4j.Slf4j;
import com.fastbee.framework.config.properties.RedissonProperties;
import org.redisson.client.codec.StringCodec;
import org.redisson.codec.CompositeCodec;
import org.redisson.codec.TypedJsonJacksonCodec;
@@ -18,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.fastbee.framework.handler.KeyPrefixHandler;
import java.time.LocalDateTime;

7
maibu-framework/src/main/java/com/maibu/config/ResourcesConfig.java
View File

@@ -2,7 +2,9 @@ package com.maibu.config;
import java.util.concurrent.TimeUnit;
import com.fastbee.framework.interceptor.LanguageInterceptor;
import com.maibu.constant.Constants;
import com.maibu.interceptor.LanguageInterceptor;
import com.maibu.interceptor.RepeatSubmitInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -13,9 +15,6 @@ import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.fastbee.common.config.RuoYiConfig;
import com.fastbee.common.constant.Constants;
import com.fastbee.framework.interceptor.RepeatSubmitInterceptor;
import javax.annotation.Resource;

8
maibu-framework/src/main/java/com/maibu/config/SecurityConfig.java
View File

@@ -1,5 +1,9 @@
package com.maibu.config;
import com.maibu.config.properties.PermitAllUrlProperties;
import com.maibu.security.filter.JwtAuthenticationTokenFilter;
import com.maibu.security.handle.AuthenticationEntryPointImpl;
import com.maibu.security.handle.LogoutSuccessHandlerImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpMethod;
@@ -18,10 +22,6 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import com.fastbee.framework.config.properties.PermitAllUrlProperties;
import com.fastbee.framework.security.filter.JwtAuthenticationTokenFilter;
import com.fastbee.framework.security.handle.AuthenticationEntryPointImpl;
import com.fastbee.framework.security.handle.LogoutSuccessHandlerImpl;
import java.util.Arrays;

3
maibu-framework/src/main/java/com/maibu/config/ServerConfig.java
View File

@@ -1,8 +1,9 @@
package com.maibu.config;
import javax.servlet.http.HttpServletRequest;
import com.maibu.utils.ServletUtils;
import org.springframework.stereotype.Component;
import com.fastbee.common.utils.ServletUtils;
/**
* 服务相关配置

2
maibu-framework/src/main/java/com/maibu/config/ThreadPoolConfig.java
View File

@@ -1,6 +1,6 @@
package com.maibu.config;
import com.fastbee.common.utils.Threads;
import com.maibu.utils.Threads;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

3
maibu-framework/src/main/java/com/maibu/config/properties/PermitAllUrlProperties.java
View File

@@ -5,6 +5,8 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Pattern;
import com.maibu.annotation.Anonymous;
import org.apache.commons.lang3.RegExUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
@@ -15,7 +17,6 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import com.fastbee.common.annotation.Anonymous;
/**
* 设置Anonymous注解允许匿名访问的url

2
maibu-framework/src/main/java/com/maibu/config/sharding/ShardingAlgorithmTool.java
View File

@@ -3,7 +3,7 @@ package com.maibu.config.sharding;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.fastbee.framework.config.sharding.enums.ShardingTableCacheEnum;
import com.maibu.config.sharding.enums.ShardingTableCacheEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.RuleConfiguration;

2
maibu-framework/src/main/java/com/maibu/config/sharding/TimeShardingAlgorithm.java
View File

@@ -1,7 +1,7 @@
package com.maibu.config.sharding;
import com.fastbee.framework.config.sharding.enums.ShardingTableCacheEnum;
import com.google.common.collect.Range;
import com.maibu.config.sharding.enums.ShardingTableCacheEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;

2
maibu-framework/src/main/java/com/maibu/config/sharding/enums/ShardingTableCacheEnum.java
View File

@@ -3,7 +3,7 @@ package com.maibu.config.sharding.enums;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import java.util.*;
import static com.fastbee.framework.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
import static com.maibu.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
/**

2
maibu-framework/src/main/java/com/maibu/handler/KeyPrefixHandler.java
View File

@@ -1,6 +1,6 @@
package com.maibu.handler;
import com.fastbee.common.utils.StringUtils;
import com.maibu.utils.StringUtils;
import org.redisson.api.NameMapper;
/**

19
maibu-framework/src/main/java/com/maibu/interceptor/LanguageInterceptor.java
View File

@@ -1,8 +1,9 @@
package com.maibu.interceptor;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.system.enums.Language;
import com.maibu.constant.Constants;
import com.maibu.enums.Language;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
@@ -13,8 +14,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Locale;
import static com.fastbee.common.constant.Constants.LANGUAGE;
/**
* 国际化语言拦截器
@@ -25,16 +24,16 @@ public class LanguageInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
String language = request.getHeader(LANGUAGE);
String language = request.getHeader(Constants.LANGUAGE);
if (StringUtils.isEmpty(language) || language.equals("undefined")
|| language.equals("")|| language.equals("null")){
|| language.equals("") || language.equals("null")) {
//针对有些接口没有增加语言字段，先去token获取
language = SecurityUtils.getLanguage();
}else if (!language.contains("-")){
language = Language.matches(language);
} else if (!language.contains("-")) {
language = Language.matches(language);
}
// 前端传递的language必须是zh-CN格式的，中间的-必须要完整，不能只传递zh或en
Locale locale = new Locale(language.split("-")[0],language.split("-")[1]);
Locale locale = new Locale(language.split("-")[0], language.split("-")[1]);
// 这样赋值以后，MessageUtils.message方法就不用修改了
LocaleContextHolder.setLocale(locale);
return true;

7
maibu-framework/src/main/java/com/maibu/interceptor/RepeatSubmitInterceptor.java
View File

@@ -3,13 +3,14 @@ package com.maibu.interceptor;
import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.maibu.annotation.RepeatSubmit;
import com.maibu.core.domain.AjaxResult;
import com.maibu.utils.ServletUtils;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.RepeatSubmit;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.utils.ServletUtils;
/**
* 防止重复提交拦截器

15
maibu-framework/src/main/java/com/maibu/interceptor/impl/SameUrlDataInterceptor.java
View File

@@ -4,17 +4,18 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import com.maibu.annotation.RepeatSubmit;
import com.maibu.constant.CacheConstants;
import com.maibu.core.redis.RedisCache;
import com.maibu.filter.RepeatedlyRequestWrapper;
import com.maibu.interceptor.RepeatSubmitInterceptor;
import com.maibu.utils.StringUtils;
import com.maibu.utils.http.HttpHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.annotation.RepeatSubmit;
import com.fastbee.common.constant.CacheConstants;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.filter.RepeatedlyRequestWrapper;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.http.HttpHelper;
import com.fastbee.framework.interceptor.RepeatSubmitInterceptor;
/**
* 判断请求url和数据是否和上一次相同，

5
maibu-framework/src/main/java/com/maibu/manager/AsyncManager.java
View File

@@ -1,10 +1,11 @@
package com.maibu.manager;
import com.maibu.utils.Threads;
import com.maibu.utils.spring.SpringUtils;
import java.util.TimerTask;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.fastbee.common.utils.Threads;
import com.fastbee.common.utils.spring.SpringUtils;
/**
* 异步任务管理器

2
maibu-framework/src/main/java/com/maibu/manager/CaffeineCacheDecorator.java
View File

@@ -1,7 +1,7 @@
package com.maibu.manager;
import com.maibu.utils.spring.SpringUtils;
import org.springframework.cache.Cache;
import com.fastbee.common.utils.spring.SpringUtils;
import java.util.concurrent.Callable;
/**

2
maibu-framework/src/main/java/com/maibu/manager/SpringCacheManager.java
View File

@@ -1,6 +1,6 @@
package com.maibu.manager;
import com.fastbee.framework.utils.RedisUtils;
import com.maibu.utils.RedisUtils;
import org.redisson.api.RMap;
import org.redisson.api.RMapCache;
import org.redisson.spring.cache.CacheConfig;

23
maibu-framework/src/main/java/com/maibu/manager/factory/AsyncFactory.java
View File

@@ -1,19 +1,20 @@
package com.maibu.manager.factory;
import java.util.TimerTask;
import com.maibu.constant.Constants;
import com.maibu.domain.SysLogininfor;
import com.maibu.domain.SysOperLog;
import com.maibu.service.ISysLogininforService;
import com.maibu.service.ISysOperLogService;
import com.maibu.utils.LogUtils;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.AddressUtils;
import com.maibu.utils.ip.IpUtils;
import com.maibu.utils.spring.SpringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.utils.LogUtils;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.AddressUtils;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.common.utils.spring.SpringUtils;
import com.fastbee.system.domain.SysLogininfor;
import com.fastbee.system.domain.SysOperLog;
import com.fastbee.system.service.ISysLogininforService;
import com.fastbee.system.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
/**

6
maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java
View File

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.fastbee.common.core.domain.PageParam;
import com.fastbee.common.core.domain.PageResult;
import com.fastbee.framework.mybatis.utils.MyBatisUtils;
import com.maibu.core.domain.PageParam;
import com.maibu.core.domain.PageResult;
import com.maibu.mybatis.utils.MyBatisUtils;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;

4
maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java
View File

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fastbee.common.core.domain.PageParam;
import com.fastbee.common.core.domain.SortingField;
import com.maibu.core.domain.PageParam;
import com.maibu.core.domain.SortingField;
import net.sf.jsqlparser.expression.Alias;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table;

2
maibu-framework/src/main/java/com/maibu/security/context/PermissionContextHolder.java
View File

@@ -1,8 +1,8 @@
package com.maibu.security.context;
import com.maibu.core.text.Convert;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import com.fastbee.common.core.text.Convert;
/**
* 权限信息

9
maibu-framework/src/main/java/com/maibu/security/filter/JwtAuthenticationTokenFilter.java
View File

@@ -5,16 +5,17 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.web.service.TokenService;
/**
* token过滤器 验证token有效性

9
maibu-framework/src/main/java/com/maibu/security/handle/AuthenticationEntryPointImpl.java
View File

@@ -4,14 +4,15 @@ import java.io.IOException;
import java.io.Serializable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.maibu.constant.HttpStatus;
import com.maibu.core.domain.AjaxResult;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.constant.HttpStatus;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
/**
* 认证失败处理类 返回未授权

17
maibu-framework/src/main/java/com/maibu/security/handle/LogoutSuccessHandlerImpl.java
View File

@@ -4,19 +4,20 @@ import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.maibu.constant.Constants;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.web.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.framework.web.service.TokenService;
/**
* 自定义退出处理类 返回成功

2
maibu-framework/src/main/java/com/maibu/utils/CacheUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils;
import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.redisson.api.RMap;

2
maibu-framework/src/main/java/com/maibu/utils/QueueUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils;
import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.redisson.api.*;

2
maibu-framework/src/main/java/com/maibu/utils/RedisUtils.java
View File

@@ -1,6 +1,6 @@
package com.maibu.utils;
import com.fastbee.common.utils.spring.SpringUtils;
import com.maibu.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.redisson.api.*;

11
maibu-framework/src/main/java/com/maibu/web/service/PermissionService.java
View File

@@ -1,13 +1,14 @@
package com.maibu.web.service;
import java.util.Set;
import com.maibu.core.domain.entity.SysRole;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.security.context.PermissionContextHolder;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.fastbee.common.core.domain.entity.SysRole;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.security.context.PermissionContextHolder;
/**
* RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母

30
maibu-framework/src/main/java/com/maibu/web/service/SysRegisterService.java
View File

@@ -1,23 +1,23 @@
package com.maibu.web.service;
import cn.hutool.core.util.ObjectUtil;
import com.maibu.constant.CacheConstants;
import com.maibu.constant.Constants;
import com.maibu.constant.UserConstants;
import com.maibu.core.domain.entity.SysUser;
import com.maibu.core.domain.model.RegisterBody;
import com.maibu.core.redis.RedisCache;
import com.maibu.exception.user.CaptchaException;
import com.maibu.exception.user.CaptchaExpireException;
import com.maibu.manager.AsyncManager;
import com.maibu.manager.factory.AsyncFactory;
import com.maibu.service.ISysConfigService;
import com.maibu.service.ISysUserService;
import com.maibu.utils.MessageUtils;
import com.maibu.utils.SecurityUtils;
import com.maibu.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.fastbee.common.constant.CacheConstants;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.constant.UserConstants;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.RegisterBody;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.exception.user.CaptchaException;
import com.fastbee.common.exception.user.CaptchaExpireException;
import com.fastbee.common.utils.MessageUtils;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.framework.manager.AsyncManager;
import com.fastbee.framework.manager.factory.AsyncFactory;
import com.fastbee.system.service.ISysConfigService;
import com.fastbee.system.service.ISysUserService;
/**
* 注册校验方法

25
maibu-framework/src/main/java/com/maibu/web/service/TokenService.java
View File

@@ -1,18 +1,17 @@
package com.maibu.web.service;
import com.fastbee.common.constant.CacheConstants;
import com.fastbee.common.constant.Constants;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.ServletUtils;
import com.fastbee.common.utils.StringUtils;
import com.fastbee.common.utils.ip.AddressUtils;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.common.utils.uuid.IdUtils;
import com.fastbee.system.domain.SysClient;
import com.fastbee.system.service.ISysClientService;
import com.maibu.constant.CacheConstants;
import com.maibu.constant.Constants;
import com.maibu.core.domain.entity.SysUser;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.core.redis.RedisCache;
import com.maibu.domain.SysClient;
import com.maibu.service.ISysClientService;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils;
import com.maibu.utils.ip.AddressUtils;
import com.maibu.utils.ip.IpUtils;
import com.maibu.utils.uuid.IdUtils;
import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;