qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 重构代码。

Browse Source
This commit is contained in:
tianyongbao
2025-10-21 10:00:26 +08:00
parent 7f40a94819
commit f50ee440ef
916 changed files with 4485 additions and 4536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
ruoyi-admin/Dockerfile → intc-admin/Dockerfile
View File

50
ruoyi-admin/pom.xml → intc-admin/pom.xml
View File

@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi-vue-plus</artifactId> <artifactId>intc-vue-plus</artifactId>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId> <artifactId>intc-admin</artifactId>
<description> <description>
web服务入口 web服务入口
@@ -46,62 +46,62 @@
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-doc</artifactId> <artifactId>intc-common-doc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-social</artifactId> <artifactId>intc-common-social</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-ratelimiter</artifactId> <artifactId>intc-common-ratelimiter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-mail</artifactId> <artifactId>intc-common-mail</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-system</artifactId> <artifactId>intc-system</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-job</artifactId> <artifactId>intc-job</artifactId>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>intc-generator</artifactId>
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-demo</artifactId> <artifactId>intc-demo</artifactId>
</dependency> </dependency>
<!-- 鱼测云模块 --> <!-- 鱼测云模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-fishery</artifactId> <artifactId>intc-fishery</artifactId>
<version>${revision}</version> <!-- 使用项目统一版本变量 --> <version>${revision}</version> <!-- 使用项目统一版本变量 -->
</dependency> </dependency>
<!-- 鱼测云模块 --> <!-- 鱼测云模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-tdengine</artifactId> <artifactId>intc-tdengine</artifactId>
<version>${revision}</version> <!-- 使用项目统一版本变量 --> <version>${revision}</version> <!-- 使用项目统一版本变量 -->
</dependency> </dependency>
<!-- 工作流模块 --> <!-- 工作流模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-workflow</artifactId> <artifactId>intc-workflow</artifactId>
</dependency> </dependency>
<dependency> <dependency>

8
ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java → intc-admin/src/main/java/com/intc/IntcApplication.java
View File

@@ -1,4 +1,4 @@
package org.dromara; package com.intc;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,13 +11,13 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*/ */
@SpringBootApplication @SpringBootApplication
public class DromaraApplication { public class IntcApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication application = new SpringApplication(DromaraApplication.class); SpringApplication application = new SpringApplication(IntcApplication.class);
application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args); application.run(args);
System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); System.out.println("(♥◠‿◠)ﾉﾞ Intc-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ");
} }
} }

6
ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java → intc-admin/src/main/java/com/intc/IntcServletInitializer.java
View File

@@ -1,4 +1,4 @@
package org.dromara; package com.intc;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
* *
* @author Lion Li * @author Lion Li
*/ */
public class DromaraServletInitializer extends SpringBootServletInitializer { public class IntcServletInitializer extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(DromaraApplication.class); return application.sources(IntcApplication.class);
} }
} }

62
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java → intc-admin/src/main/java/com/intc/web/controller/AuthController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.controller; package com.intc.web.controller;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
@@ -6,6 +6,36 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.R;
import com.intc.common.core.domain.model.LoginBody;
import com.intc.common.core.domain.model.RegisterBody;
import com.intc.common.core.domain.model.SocialLoginBody;
import com.intc.common.core.utils.*;
import com.intc.common.encrypt.annotation.ApiEncrypt;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.ratelimiter.annotation.RateLimiter;
import com.intc.common.ratelimiter.enums.LimitType;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.social.config.properties.SocialLoginConfigProperties;
import com.intc.common.social.config.properties.SocialProperties;
import com.intc.common.social.utils.SocialUtils;
import com.intc.common.sse.dto.SseMessageDto;
import com.intc.common.sse.utils.SseMessageUtils;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.system.domain.bo.SysTenantBo;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysTenantVo;
import com.intc.system.service.ISysClientService;
import com.intc.system.service.ISysConfigService;
import com.intc.system.service.ISysSocialService;
import com.intc.system.service.ISysTenantService;
import com.intc.web.domain.vo.LoginTenantVo;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.domain.vo.TenantListVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import com.intc.web.service.SysRegisterService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -13,36 +43,6 @@ import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.utils.AuthStateUtils; import me.zhyd.oauth.utils.AuthStateUtils;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginBody;
import org.dromara.common.core.domain.model.RegisterBody;
import org.dromara.common.core.domain.model.SocialLoginBody;
import org.dromara.common.core.utils.*;
import org.dromara.common.encrypt.annotation.ApiEncrypt;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.ratelimiter.annotation.RateLimiter;
import org.dromara.common.ratelimiter.enums.LimitType;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.sse.dto.SseMessageDto;
import org.dromara.common.sse.utils.SseMessageUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.service.ISysClientService;
import org.dromara.system.service.ISysConfigService;
import org.dromara.system.service.ISysSocialService;
import org.dromara.system.service.ISysTenantService;
import org.dromara.web.domain.vo.LoginTenantVo;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.domain.vo.TenantListVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.dromara.web.service.SysRegisterService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

32
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java → intc-admin/src/main/java/com/intc/web/controller/CaptchaController.java
View File

@@ -1,31 +1,31 @@
package org.dromara.web.controller; package com.intc.web.controller;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.GlobalConstants;
import com.intc.common.core.domain.R;
import com.intc.common.core.exception.ServiceException;
import com.intc.common.core.utils.SpringUtils;
import com.intc.common.core.utils.StringUtils;
import com.intc.common.core.utils.reflect.ReflectUtils;
import com.intc.common.mail.config.properties.MailProperties;
import com.intc.common.mail.utils.MailUtils;
import com.intc.common.ratelimiter.annotation.RateLimiter;
import com.intc.common.ratelimiter.enums.LimitType;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.web.config.properties.CaptchaProperties;
import com.intc.common.web.enums.CaptchaType;
import com.intc.web.domain.vo.CaptchaVo;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.reflect.ReflectUtils;
import org.dromara.common.mail.config.properties.MailProperties;
import org.dromara.common.mail.utils.MailUtils;
import org.dromara.common.ratelimiter.annotation.RateLimiter;
import org.dromara.common.ratelimiter.enums.LimitType;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.common.web.enums.CaptchaType;
import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.core.factory.SmsFactory;
import org.dromara.web.domain.vo.CaptchaVo;
import org.springframework.expression.Expression; import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser; import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser;

6
ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java → intc-admin/src/main/java/com/intc/web/controller/IndexController.java
View File

@@ -1,9 +1,9 @@
package org.dromara.web.controller; package com.intc.web.controller;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import com.intc.common.core.utils.SpringUtils;
import com.intc.common.core.utils.StringUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java → intc-admin/src/main/java/com/intc/web/domain/vo/CaptchaVo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.domain.vo; package com.intc.web.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java → intc-admin/src/main/java/com/intc/web/domain/vo/LoginTenantVo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.domain.vo; package com.intc.web.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java → intc-admin/src/main/java/com/intc/web/domain/vo/LoginVo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.domain.vo; package com.intc.web.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;

4
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java → intc-admin/src/main/java/com/intc/web/domain/vo/TenantListVo.java
View File

@@ -1,6 +1,6 @@
package org.dromara.web.domain.vo; package com.intc.web.domain.vo;
import org.dromara.system.domain.vo.SysTenantVo; import com.intc.system.domain.vo.SysTenantVo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;

26
ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java → intc-admin/src/main/java/com/intc/web/listener/UserActionListener.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.listener; package com.intc.web.listener;
import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
@@ -6,20 +6,20 @@ import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.http.useragent.UserAgentUtil;
import com.intc.common.core.constant.CacheConstants;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.domain.dto.UserOnlineDTO;
import com.intc.common.core.utils.MessageUtils;
import com.intc.common.core.utils.ServletUtils;
import com.intc.common.core.utils.SpringUtils;
import com.intc.common.core.utils.ip.AddressUtils;
import com.intc.common.log.event.LogininforEvent;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.domain.dto.UserOnlineDTO;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.ip.AddressUtils;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.Duration; import java.time.Duration;

11
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/IAuthStrategy.java
View File

@@ -1,11 +1,10 @@
package org.dromara.web.service; package com.intc.web.service;
import org.dromara.common.core.exception.ServiceException; import com.intc.common.core.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils; import com.intc.common.core.utils.SpringUtils;
import org.dromara.system.domain.SysClient; import com.intc.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysClientVo; import com.intc.web.domain.vo.LoginVo;
import org.dromara.web.domain.vo.LoginVo;
/** /**
* 授权策略 * 授权策略

46
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java → intc-admin/src/main/java/com/intc/web/service/SysLoginService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.web.service; package com.intc.web.service;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
@@ -7,31 +7,31 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Opt; import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.annotation.Lock4j;
import com.intc.common.core.constant.CacheConstants;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.constant.TenantConstants;
import com.intc.common.core.domain.dto.PostDTO;
import com.intc.common.core.domain.dto.RoleDTO;
import com.intc.common.core.domain.model.LoginUser;
import com.intc.common.core.enums.LoginType;
import com.intc.common.core.exception.ServiceException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.*;
import com.intc.common.log.event.LogininforEvent;
import com.intc.common.mybatis.helper.DataPermissionHelper;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.tenant.exception.TenantException;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.system.domain.SysUser;
import com.intc.system.domain.bo.SysSocialBo;
import com.intc.system.domain.vo.*;
import com.intc.system.mapper.SysUserMapper;
import com.intc.system.service.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.dto.PostDTO;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.*;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.mybatis.helper.DataPermissionHelper;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.exception.TenantException;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysSocialBo;
import org.dromara.system.domain.vo.*;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.*;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

40
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java → intc-admin/src/main/java/com/intc/web/service/SysRegisterService.java
View File

@@ -1,27 +1,27 @@
package org.dromara.web.service; package com.intc.web.service;
import cn.hutool.crypto.digest.BCrypt; import cn.hutool.crypto.digest.BCrypt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.GlobalConstants;
import com.intc.common.core.domain.model.RegisterBody;
import com.intc.common.core.enums.UserType;
import com.intc.common.core.exception.user.CaptchaException;
import com.intc.common.core.exception.user.CaptchaExpireException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.MessageUtils;
import com.intc.common.core.utils.ServletUtils;
import com.intc.common.core.utils.SpringUtils;
import com.intc.common.core.utils.StringUtils;
import com.intc.common.log.event.LogininforEvent;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.common.web.config.properties.CaptchaProperties;
import com.intc.system.domain.SysUser;
import com.intc.system.domain.bo.SysUserBo;
import com.intc.system.mapper.SysUserMapper;
import com.intc.system.service.ISysUserService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.domain.model.RegisterBody;
import org.dromara.common.core.enums.UserType;
import org.dromara.common.core.exception.user.CaptchaException;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysUserService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

46
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/impl/EmailAuthStrategy.java
View File

@@ -1,33 +1,33 @@
package org.dromara.web.service.impl; package com.intc.web.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.GlobalConstants;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.model.EmailLoginBody;
import com.intc.common.core.domain.model.LoginUser;
import com.intc.common.core.enums.LoginType;
import com.intc.common.core.exception.user.CaptchaExpireException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.MessageUtils;
import com.intc.common.core.utils.StringUtils;
import com.intc.common.core.utils.ValidatorUtils;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.system.domain.SysUser;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysUserVo;
import com.intc.system.mapper.SysUserMapper;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.EmailLoginBody;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

50
ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/impl/PasswordAuthStrategy.java
View File

@@ -1,36 +1,36 @@
package org.dromara.web.service.impl; package com.intc.web.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.digest.BCrypt; import cn.hutool.crypto.digest.BCrypt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.GlobalConstants;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.model.LoginUser;
import com.intc.common.core.domain.model.PasswordLoginBody;
import com.intc.common.core.enums.LoginType;
import com.intc.common.core.exception.user.CaptchaException;
import com.intc.common.core.exception.user.CaptchaExpireException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.MessageUtils;
import com.intc.common.core.utils.StringUtils;
import com.intc.common.core.utils.ValidatorUtils;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.common.web.config.properties.CaptchaProperties;
import com.intc.system.domain.SysUser;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysUserVo;
import com.intc.system.mapper.SysUserMapper;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.PasswordLoginBody;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.user.CaptchaException;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

46
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/impl/SmsAuthStrategy.java
View File

@@ -1,33 +1,33 @@
package org.dromara.web.service.impl; package com.intc.web.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.intc.common.core.constant.Constants;
import com.intc.common.core.constant.GlobalConstants;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.model.LoginUser;
import com.intc.common.core.domain.model.SmsLoginBody;
import com.intc.common.core.enums.LoginType;
import com.intc.common.core.exception.user.CaptchaExpireException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.MessageUtils;
import com.intc.common.core.utils.StringUtils;
import com.intc.common.core.utils.ValidatorUtils;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.redis.utils.RedisUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.system.domain.SysUser;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysUserVo;
import com.intc.system.mapper.SysUserMapper;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.SmsLoginBody;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

42
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/impl/SocialAuthStrategy.java
View File

@@ -1,33 +1,33 @@
package org.dromara.web.service.impl; package com.intc.web.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.model.LoginUser;
import com.intc.common.core.domain.model.SocialLoginBody;
import com.intc.common.core.exception.ServiceException;
import com.intc.common.core.exception.user.UserException;
import com.intc.common.core.utils.StreamUtils;
import com.intc.common.core.utils.ValidatorUtils;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.common.social.config.properties.SocialProperties;
import com.intc.common.social.utils.SocialUtils;
import com.intc.common.tenant.helper.TenantHelper;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysSocialVo;
import com.intc.system.domain.vo.SysUserVo;
import com.intc.system.mapper.SysUserMapper;
import com.intc.system.service.ISysSocialService;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.SocialLoginBody;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysSocialVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysSocialService;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;

26
ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java → intc-admin/src/main/java/com/intc/web/service/impl/XcxAuthStrategy.java
View File

@@ -1,8 +1,20 @@
package org.dromara.web.service.impl; package com.intc.web.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.intc.common.core.constant.SystemConstants;
import com.intc.common.core.domain.model.XcxLoginBody;
import com.intc.common.core.domain.model.XcxLoginUser;
import com.intc.common.core.exception.ServiceException;
import com.intc.common.core.utils.ValidatorUtils;
import com.intc.common.json.utils.JsonUtils;
import com.intc.common.satoken.utils.LoginHelper;
import com.intc.system.domain.vo.SysClientVo;
import com.intc.system.domain.vo.SysUserVo;
import com.intc.web.domain.vo.LoginVo;
import com.intc.web.service.IAuthStrategy;
import com.intc.web.service.SysLoginService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthConfig;
@@ -12,18 +24,6 @@ import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.request.AuthWechatMiniProgramRequest; import me.zhyd.oauth.request.AuthWechatMiniProgramRequest;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.XcxLoginBody;
import org.dromara.common.core.domain.model.XcxLoginUser;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.web.domain.vo.LoginVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

0
ruoyi-admin/src/main/resources/application-dev.yml → intc-admin/src/main/resources/application-dev.yml
View File

0
ruoyi-admin/src/main/resources/application-prod.yml → intc-admin/src/main/resources/application-prod.yml
View File

6
ruoyi-admin/src/main/resources/application.yml → intc-admin/src/main/resources/application.yml
View File

@@ -141,12 +141,12 @@ tenant:
mybatis-plus: mybatis-plus:
# 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效 # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
enableLogicDelete: true enableLogicDelete: true
# 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper # 多包名使用 例如 com.intc.**.mapper,org.xxx.**.mapper
mapperPackage: org.dromara.**.mapper mapperPackage: com.intc.**.mapper
# 对应的 XML 文件位置 # 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔 # 实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: org.dromara.**.domain typeAliasesPackage: com.intc.**.domain
global-config: global-config:
dbConfig: dbConfig:
# 主键类型 # 主键类型

0
ruoyi-admin/src/main/resources/banner.txt → intc-admin/src/main/resources/banner.txt
View File

0
ruoyi-admin/src/main/resources/i18n/messages.properties → intc-admin/src/main/resources/i18n/messages.properties
View File

0
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties → intc-admin/src/main/resources/i18n/messages_en_US.properties
View File

0
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties → intc-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

0
ruoyi-admin/src/main/resources/ip2region.xdb → intc-admin/src/main/resources/ip2region.xdb
View File

0
ruoyi-admin/src/main/resources/logback-plus.xml → intc-admin/src/main/resources/logback-plus.xml
View File

2
ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java → intc-admin/src/test/java/com/intc/test/AssertUnitTest.java
View File

@@ -1,4 +1,4 @@
package org.dromara.test; package com.intc.test;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;

4
ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java → intc-admin/src/test/java/com/intc/test/DemoUnitTest.java
View File

@@ -1,6 +1,6 @@
package org.dromara.test; package com.intc.test;
import org.dromara.common.web.config.properties.CaptchaProperties; import com.intc.common.web.config.properties.CaptchaProperties;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

4
ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java → intc-admin/src/test/java/com/intc/test/ParamUnitTest.java
View File

@@ -1,6 +1,6 @@
package org.dromara.test; package com.intc.test;
import org.dromara.common.core.enums.UserType; import com.intc.common.core.enums.UserType;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;

2
ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java → intc-admin/src/test/java/com/intc/test/TagUnitTest.java
View File

@@ -1,4 +1,4 @@
package org.dromara.test; package com.intc.test;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

96
ruoyi-common/ruoyi-common-bom/pom.xml → intc-common/intc-common-bom/pom.xml
View File

@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-bom</artifactId> <artifactId>intc-common-bom</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
@@ -21,161 +21,161 @@
<dependencies> <dependencies>
<!-- 核心模块 --> <!-- 核心模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-core</artifactId> <artifactId>intc-common-core</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 接口模块 --> <!-- 接口模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-doc</artifactId> <artifactId>intc-common-doc</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- excel --> <!-- excel -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-excel</artifactId> <artifactId>intc-common-excel</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 幂等 --> <!-- 幂等 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-idempotent</artifactId> <artifactId>intc-common-idempotent</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 调度模块 --> <!-- 调度模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-job</artifactId> <artifactId>intc-common-job</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 日志记录 --> <!-- 日志记录 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-log</artifactId> <artifactId>intc-common-log</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 邮件服务 --> <!-- 邮件服务 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-mail</artifactId> <artifactId>intc-common-mail</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 数据库服务 --> <!-- 数据库服务 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-mybatis</artifactId> <artifactId>intc-common-mybatis</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- OSS --> <!-- OSS -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-oss</artifactId> <artifactId>intc-common-oss</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 限流 --> <!-- 限流 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-ratelimiter</artifactId> <artifactId>intc-common-ratelimiter</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 缓存服务 --> <!-- 缓存服务 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-redis</artifactId> <artifactId>intc-common-redis</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- satoken --> <!-- satoken -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-satoken</artifactId> <artifactId>intc-common-satoken</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 安全模块 --> <!-- 安全模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-security</artifactId> <artifactId>intc-common-security</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 短信模块 --> <!-- 短信模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-sms</artifactId> <artifactId>intc-common-sms</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-social</artifactId> <artifactId>intc-common-social</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- web服务 --> <!-- web服务 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-web</artifactId> <artifactId>intc-common-web</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 翻译模块 --> <!-- 翻译模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-translation</artifactId> <artifactId>intc-common-translation</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 脱敏模块 --> <!-- 脱敏模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-sensitive</artifactId> <artifactId>intc-common-sensitive</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 序列化模块 --> <!-- 序列化模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-json</artifactId> <artifactId>intc-common-json</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 数据库加解密模块 --> <!-- 数据库加解密模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-encrypt</artifactId> <artifactId>intc-common-encrypt</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 租户模块 --> <!-- 租户模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-tenant</artifactId> <artifactId>intc-common-tenant</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- WebSocket模块 --> <!-- WebSocket模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-websocket</artifactId> <artifactId>intc-common-websocket</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- SSE模块 --> <!-- SSE模块 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common-sse</artifactId> <artifactId>intc-common-sse</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

6
ruoyi-common/ruoyi-common-core/pom.xml → intc-common/intc-common-core/pom.xml
View File

@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>com.intc</groupId>
<artifactId>ruoyi-common</artifactId> <artifactId>intc-common</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId> <artifactId>intc-common-core</artifactId>
<description> <description>
ruoyi-common-core 核心模块 ruoyi-common-core 核心模块

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ApplicationConfig.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.config; package com.intc.common.core.config;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.EnableAspectJAutoProxy;

8
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ThreadPoolConfig.java
View File

@@ -1,11 +1,11 @@
package org.dromara.common.core.config; package com.intc.common.core.config;
import jakarta.annotation.PreDestroy; import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.dromara.common.core.config.properties.ThreadPoolProperties; import com.intc.common.core.config.properties.ThreadPoolProperties;
import org.dromara.common.core.utils.SpringUtils; import com.intc.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.Threads; import com.intc.common.core.utils.Threads;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ValidatorConfig.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.config; package com.intc.common.core.config;
import jakarta.validation.Validator; import jakarta.validation.Validator;
import org.hibernate.validator.HibernateValidator; import org.hibernate.validator.HibernateValidator;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/config/properties/ThreadPoolProperties.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.config.properties; package com.intc.common.core.config.properties;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 缓存的key 常量 * 缓存的key 常量

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheNames.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 缓存组名称常量 * 缓存组名称常量

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 通用常量信息 * 通用常量信息

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GlobalConstants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 全局的key常量 (业务无关的key) * 全局的key常量 (业务无关的key)

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 返回状态码 * 返回状态码

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/RegexConstants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
import cn.hutool.core.lang.RegexPool; import cn.hutool.core.lang.RegexPool;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SystemConstants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 系统常量信息 * 系统常量信息

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TenantConstants.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.constant; package com.intc.common.core.constant;
/** /**
* 租户常量信息 * 租户常量信息

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.domain; package com.intc.common.core.domain;
import org.dromara.common.core.constant.HttpStatus; import com.intc.common.core.constant.HttpStatus;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/CompleteTaskDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DeptDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictDataDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictTypeDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/FlowCopyDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/OssDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/PostDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/RoleDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessReturnDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/TaskAssigneeDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserOnlineDTO.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto; package com.intc.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessDeleteEvent.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.event; package com.intc.common.core.domain.event;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessEvent.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.event; package com.intc.common.core.domain.event;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessTaskEvent.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.event; package com.intc.common.core.domain.event;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/EmailLoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginUser.java
View File

@@ -1,9 +1,9 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.dromara.common.core.domain.dto.PostDTO; import com.intc.common.core.domain.dto.PostDTO;
import org.dromara.common.core.domain.dto.RoleDTO; import com.intc.common.core.domain.dto.RoleDTO;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/PasswordLoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/RegisterBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SmsLoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SocialLoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/TaskAssigneeBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginBody.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginUser.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model; package com.intc.common.core.domain.model;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/BusinessStatusEnum.java
View File

@@ -1,10 +1,10 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.dromara.common.core.exception.ServiceException; import com.intc.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils; import com.intc.common.core.utils.StringUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/DeviceType.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/FormatsType.java
View File

@@ -1,8 +1,8 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.dromara.common.core.utils.StringUtils; import com.intc.common.core.utils.StringUtils;
/* /*
* 日期格式 * 日期格式

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/LoginType.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserType.java
View File

@@ -1,8 +1,8 @@
package org.dromara.common.core.enums; package com.intc.common.core.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.dromara.common.core.utils.StringUtils; import com.intc.common.core.utils.StringUtils;
/** /**
* 用户类型 * 用户类型

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception; package com.intc.common.core.exception;
import cn.hutool.core.text.StrFormatter; import cn.hutool.core.text.StrFormatter;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/SseException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception; package com.intc.common.core.exception;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java
View File

@@ -1,8 +1,8 @@
package org.dromara.common.core.exception.base; package com.intc.common.core.exception.base;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.dromara.common.core.utils.MessageUtils; import com.intc.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StringUtils; import com.intc.common.core.utils.StringUtils;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.exception.file; package com.intc.common.core.exception.file;
import org.dromara.common.core.exception.base.BaseException; import com.intc.common.core.exception.base.BaseException;
import java.io.Serial; import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception.file; package com.intc.common.core.exception.file;
import java.io.Serial; import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception.file; package com.intc.common.core.exception.file;
import java.io.Serial; import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception.user; package com.intc.common.core.exception.user;
import java.io.Serial; import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.exception.user; package com.intc.common.core.exception.user;
import java.io.Serial; import java.io.Serial;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.exception.user; package com.intc.common.core.exception.user;
import org.dromara.common.core.exception.base.BaseException; import com.intc.common.core.exception.base.BaseException;
import java.io.Serial; import java.io.Serial;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/RegexPatternPoolFactory.java
View File

@@ -1,7 +1,7 @@
package org.dromara.common.core.factory; package com.intc.common.core.factory;
import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.PatternPool;
import org.dromara.common.core.constant.RegexConstants; import com.intc.common.core.constant.RegexConstants;
import java.util.regex.Pattern; import java.util.regex.Pattern;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/YmlPropertySourceFactory.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.factory; package com.intc.common.core.factory;
import org.dromara.common.core.utils.StringUtils; import com.intc.common.core.utils.StringUtils;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySource;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/ConfigService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
/** /**
* 通用 参数配置服务 * 通用 参数配置服务

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DeptService.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import org.dromara.common.core.domain.dto.DeptDTO; import com.intc.common.core.domain.dto.DeptDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DictService.java
View File

@@ -1,7 +1,7 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import org.dromara.common.core.domain.dto.DictDataDTO; import com.intc.common.core.domain.dto.DictDataDTO;
import org.dromara.common.core.domain.dto.DictTypeDTO; import com.intc.common.core.domain.dto.DictTypeDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/OssService.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import org.dromara.common.core.domain.dto.OssDTO; import com.intc.common.core.domain.dto.OssDTO;
import java.util.List; import java.util.List;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PermissionService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import java.util.Set; import java.util.Set;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PostService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/RoleService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/TaskAssigneeService.java
View File

@@ -1,7 +1,7 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import com.intc.common.core.domain.dto.TaskAssigneeDTO;
import org.dromara.common.core.domain.model.TaskAssigneeBody; import com.intc.common.core.domain.model.TaskAssigneeBody;
/** /**
* 工作流设计器获取任务执行人 * 工作流设计器获取任务执行人

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java → intc-common/intc-common-core/src/main/java/com/intc/common/core/service/UserService.java
View File

@@ -1,6 +1,6 @@
package org.dromara.common.core.service; package com.intc.common.core.service;
import org.dromara.common.core.domain.dto.UserDTO; import com.intc.common.core.domain.dto.UserDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

Some files were not shown because too many files have changed in this diff Show More