diff --git a/ruoyi-admin/Dockerfile b/intc-admin/Dockerfile similarity index 100% rename from ruoyi-admin/Dockerfile rename to intc-admin/Dockerfile diff --git a/ruoyi-admin/pom.xml b/intc-admin/pom.xml similarity index 79% rename from ruoyi-admin/pom.xml rename to intc-admin/pom.xml index 9da7e97..8f83bc0 100644 --- a/ruoyi-admin/pom.xml +++ b/intc-admin/pom.xml @@ -3,13 +3,13 @@ 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"> - ruoyi-vue-plus - org.dromara + intc-vue-plus + com.intc ${revision} 4.0.0 jar - ruoyi-admin + intc-admin web服务入口 @@ -46,62 +46,62 @@ - org.dromara - ruoyi-common-doc + com.intc + intc-common-doc - org.dromara - ruoyi-common-social + com.intc + intc-common-social - org.dromara - ruoyi-common-ratelimiter + com.intc + intc-common-ratelimiter - org.dromara - ruoyi-common-mail + com.intc + intc-common-mail - org.dromara - ruoyi-system + com.intc + intc-system - org.dromara - ruoyi-job + com.intc + intc-job - org.dromara - ruoyi-generator + com.intc + intc-generator - org.dromara - ruoyi-demo + com.intc + intc-demo - org.dromara - ruoyi-fishery + com.intc + intc-fishery ${revision} - org.dromara - ruoyi-tdengine + com.intc + intc-tdengine ${revision} - org.dromara - ruoyi-workflow + com.intc + intc-workflow diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/intc-admin/src/main/java/com/intc/IntcApplication.java similarity index 64% rename from ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to intc-admin/src/main/java/com/intc/IntcApplication.java index 8ef33fe..29f43cf 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/intc-admin/src/main/java/com/intc/IntcApplication.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.intc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,13 +11,13 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt */ @SpringBootApplication -public class DromaraApplication { +public class IntcApplication { public static void main(String[] args) { - SpringApplication application = new SpringApplication(DromaraApplication.class); + SpringApplication application = new SpringApplication(IntcApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙"); + System.out.println("(♥◠‿◠)ノ゙ Intc-Vue-Plus启动成功 ლ(´ڡ`ლ)゙"); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/intc-admin/src/main/java/com/intc/IntcServletInitializer.java similarity index 66% rename from ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to intc-admin/src/main/java/com/intc/IntcServletInitializer.java index 066a683..e13e60d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java +++ b/intc-admin/src/main/java/com/intc/IntcServletInitializer.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.intc; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * * @author Lion Li */ -public class DromaraServletInitializer extends SpringBootServletInitializer { +public class IntcServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(DromaraApplication.class); + return application.sources(IntcApplication.class); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/intc-admin/src/main/java/com/intc/web/controller/AuthController.java similarity index 82% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java rename to intc-admin/src/main/java/com/intc/web/controller/AuthController.java index 9ec501a..372d896 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/intc-admin/src/main/java/com/intc/web/controller/AuthController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package com.intc.web.controller; import cn.dev33.satoken.annotation.SaIgnore; 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.collection.CollUtil; 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 lombok.RequiredArgsConstructor; 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.request.AuthRequest; 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.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/intc-admin/src/main/java/com/intc/web/controller/CaptchaController.java similarity index 86% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to intc-admin/src/main/java/com/intc/web/controller/CaptchaController.java index dcd04c5..c56ca08 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/intc-admin/src/main/java/com/intc/web/controller/CaptchaController.java @@ -1,31 +1,31 @@ -package org.dromara.web.controller; +package com.intc.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; 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 lombok.RequiredArgsConstructor; 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.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; -import org.dromara.web.domain.vo.CaptchaVo; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/intc-admin/src/main/java/com/intc/web/controller/IndexController.java similarity index 80% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java rename to intc-admin/src/main/java/com/intc/web/controller/IndexController.java index cdcfed6..d5256cd 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ b/intc-admin/src/main/java/com/intc/web/controller/IndexController.java @@ -1,9 +1,9 @@ -package org.dromara.web.controller; +package com.intc.web.controller; import cn.dev33.satoken.annotation.SaIgnore; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; 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.RestController; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/intc-admin/src/main/java/com/intc/web/domain/vo/CaptchaVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to intc-admin/src/main/java/com/intc/web/domain/vo/CaptchaVo.java index 664df1e..5ca92dd 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ b/intc-admin/src/main/java/com/intc/web/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.intc.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/intc-admin/src/main/java/com/intc/web/domain/vo/LoginTenantVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to intc-admin/src/main/java/com/intc/web/domain/vo/LoginTenantVo.java index 0a83ace..e970e7c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ b/intc-admin/src/main/java/com/intc/web/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.intc.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/intc-admin/src/main/java/com/intc/web/domain/vo/LoginVo.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to intc-admin/src/main/java/com/intc/web/domain/vo/LoginVo.java index 834afe5..207ddf9 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/intc-admin/src/main/java/com/intc/web/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.intc.web.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/intc-admin/src/main/java/com/intc/web/domain/vo/TenantListVo.java similarity index 82% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to intc-admin/src/main/java/com/intc/web/domain/vo/TenantListVo.java index db9c271..02c61e3 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ b/intc-admin/src/main/java/com/intc/web/domain/vo/TenantListVo.java @@ -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 lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/intc-admin/src/main/java/com/intc/web/listener/UserActionListener.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java rename to intc-admin/src/main/java/com/intc/web/listener/UserActionListener.java index 6c8accb..ce2076a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java +++ b/intc-admin/src/main/java/com/intc/web/listener/UserActionListener.java @@ -1,4 +1,4 @@ -package org.dromara.web.listener; +package com.intc.web.listener; import cn.dev33.satoken.listener.SaTokenListener; 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.http.useragent.UserAgent; 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.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 java.time.Duration; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/IAuthStrategy.java similarity index 77% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/IAuthStrategy.java index a75b913..45474fe 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/IAuthStrategy.java @@ -1,11 +1,10 @@ -package org.dromara.web.service; +package com.intc.web.service; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.web.domain.vo.LoginVo; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.web.domain.vo.LoginVo; /** * 授权策略 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/intc-admin/src/main/java/com/intc/web/service/SysLoginService.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to intc-admin/src/main/java/com/intc/web/service/SysLoginService.java index 41a802b..bf363cd 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/intc-admin/src/main/java/com/intc/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package com.intc.web.service; import cn.dev33.satoken.exception.NotLoginException; 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.util.ObjectUtil; 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.extern.slf4j.Slf4j; 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.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/intc-admin/src/main/java/com/intc/web/service/SysRegisterService.java similarity index 76% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to intc-admin/src/main/java/com/intc/web/service/SysRegisterService.java index 5a3351d..0764bee 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/intc-admin/src/main/java/com/intc/web/service/SysRegisterService.java @@ -1,27 +1,27 @@ -package org.dromara.web.service; +package com.intc.web.service; import cn.hutool.crypto.digest.BCrypt; 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 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; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/impl/EmailAuthStrategy.java similarity index 73% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/impl/EmailAuthStrategy.java index e4315dc..8a84fa3 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/impl/EmailAuthStrategy.java @@ -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.parameter.SaLoginParameter; import cn.hutool.core.util.ObjectUtil; 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.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; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/impl/PasswordAuthStrategy.java similarity index 75% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/impl/PasswordAuthStrategy.java index abf590b..e7d48c8 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/impl/PasswordAuthStrategy.java @@ -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.parameter.SaLoginParameter; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; 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.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; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/impl/SmsAuthStrategy.java similarity index 74% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/impl/SmsAuthStrategy.java index 597a601..db8b47b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/impl/SmsAuthStrategy.java @@ -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.parameter.SaLoginParameter; import cn.hutool.core.util.ObjectUtil; 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.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; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/impl/SocialAuthStrategy.java similarity index 78% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/impl/SocialAuthStrategy.java index e01666e..583610a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/impl/SocialAuthStrategy.java @@ -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.parameter.SaLoginParameter; import cn.hutool.core.collection.CollUtil; 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.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthResponse; 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 java.util.List; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/intc-admin/src/main/java/com/intc/web/service/impl/XcxAuthStrategy.java similarity index 86% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to intc-admin/src/main/java/com/intc/web/service/impl/XcxAuthStrategy.java index f223dd8..bfabf42 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/intc-admin/src/main/java/com/intc/web/service/impl/XcxAuthStrategy.java @@ -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.parameter.SaLoginParameter; 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.extern.slf4j.Slf4j; 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.request.AuthRequest; 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; /** diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/intc-admin/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to intc-admin/src/main/resources/application-dev.yml diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/intc-admin/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to intc-admin/src/main/resources/application-prod.yml diff --git a/ruoyi-admin/src/main/resources/application.yml b/intc-admin/src/main/resources/application.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application.yml rename to intc-admin/src/main/resources/application.yml index 95c36e7..b06593c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/intc-admin/src/main/resources/application.yml @@ -141,12 +141,12 @@ tenant: mybatis-plus: # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效 enableLogicDelete: true - # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: org.dromara.**.mapper + # 多包名使用 例如 com.intc.**.mapper,org.xxx.**.mapper + mapperPackage: com.intc.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描,多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain + typeAliasesPackage: com.intc.**.domain global-config: dbConfig: # 主键类型 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/intc-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to intc-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/intc-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to intc-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/intc-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to intc-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/intc-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to intc-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/intc-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to intc-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/intc-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to intc-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/intc-admin/src/test/java/com/intc/test/AssertUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java rename to intc-admin/src/test/java/com/intc/test/AssertUnitTest.java index dba2323..d207764 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/intc-admin/src/test/java/com/intc/test/AssertUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.intc.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/intc-admin/src/test/java/com/intc/test/DemoUnitTest.java similarity index 94% rename from ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java rename to intc-admin/src/test/java/com/intc/test/DemoUnitTest.java index 2d11a10..2d351e5 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/intc-admin/src/test/java/com/intc/test/DemoUnitTest.java @@ -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.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/intc-admin/src/test/java/com/intc/test/ParamUnitTest.java similarity index 96% rename from ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java rename to intc-admin/src/test/java/com/intc/test/ParamUnitTest.java index 1db51df..80dfe6f 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/intc-admin/src/test/java/com/intc/test/ParamUnitTest.java @@ -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.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/intc-admin/src/test/java/com/intc/test/TagUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java rename to intc-admin/src/test/java/com/intc/test/TagUnitTest.java index b50afa6..4acf84d 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ b/intc-admin/src/test/java/com/intc/test/TagUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.intc.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/intc-common/intc-common-bom/pom.xml similarity index 58% rename from ruoyi-common/ruoyi-common-bom/pom.xml rename to intc-common/intc-common-bom/pom.xml index 6ddaafe..b4ab6da 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/intc-common/intc-common-bom/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-common-bom + com.intc + intc-common-bom ${revision} pom @@ -21,161 +21,161 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core ${revision} - org.dromara - ruoyi-common-doc + com.intc + intc-common-doc ${revision} - org.dromara - ruoyi-common-excel + com.intc + intc-common-excel ${revision} - org.dromara - ruoyi-common-idempotent + com.intc + intc-common-idempotent ${revision} - org.dromara - ruoyi-common-job + com.intc + intc-common-job ${revision} - org.dromara - ruoyi-common-log + com.intc + intc-common-log ${revision} - org.dromara - ruoyi-common-mail + com.intc + intc-common-mail ${revision} - org.dromara - ruoyi-common-mybatis + com.intc + intc-common-mybatis ${revision} - org.dromara - ruoyi-common-oss + com.intc + intc-common-oss ${revision} - org.dromara - ruoyi-common-ratelimiter + com.intc + intc-common-ratelimiter ${revision} - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis ${revision} - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken ${revision} - org.dromara - ruoyi-common-security + com.intc + intc-common-security ${revision} - org.dromara - ruoyi-common-sms + com.intc + intc-common-sms ${revision} - org.dromara - ruoyi-common-social + com.intc + intc-common-social ${revision} - org.dromara - ruoyi-common-web + com.intc + intc-common-web ${revision} - org.dromara - ruoyi-common-translation + com.intc + intc-common-translation ${revision} - org.dromara - ruoyi-common-sensitive + com.intc + intc-common-sensitive ${revision} - org.dromara - ruoyi-common-json + com.intc + intc-common-json ${revision} - org.dromara - ruoyi-common-encrypt + com.intc + intc-common-encrypt ${revision} - org.dromara - ruoyi-common-tenant + com.intc + intc-common-tenant ${revision} - org.dromara - ruoyi-common-websocket + com.intc + intc-common-websocket ${revision} - org.dromara - ruoyi-common-sse + com.intc + intc-common-sse ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/intc-common/intc-common-core/pom.xml similarity index 95% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to intc-common/intc-common-core/pom.xml index ad37e90..6e0b954 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/intc-common/intc-common-core/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-core + intc-common-core ruoyi-common-core 核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ApplicationConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ApplicationConfig.java index d9f70e4..75bdc5e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ApplicationConfig.java @@ -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.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ThreadPoolConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ThreadPoolConfig.java index 16f309d..df4c407 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ThreadPoolConfig.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.config; +package com.intc.common.core.config; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.dromara.common.core.config.properties.ThreadPoolProperties; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.Threads; +import com.intc.common.core.config.properties.ThreadPoolProperties; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.Threads; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ValidatorConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ValidatorConfig.java index ddcd836..bce93ad 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.intc.common.core.config; import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidator; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/properties/ThreadPoolProperties.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/config/properties/ThreadPoolProperties.java index 820564f..26d641c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config.properties; +package com.intc.common.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java index ceb8370..3ea447c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 缓存的key 常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheNames.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheNames.java index c38f39b..c7d7b38 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java index 0c6671a..9ff6fc9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 通用常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GlobalConstants.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GlobalConstants.java index 5352b11..1779610 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GlobalConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 全局的key常量 (业务无关的key) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java index 85566e8..cdfb370 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/RegexConstants.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/RegexConstants.java index f1e04f7..9eb06d2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/RegexConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; import cn.hutool.core.lang.RegexPool; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SystemConstants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SystemConstants.java index 4bd858f..654d1cf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SystemConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 系统常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TenantConstants.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TenantConstants.java index 33ce0cf..4672fae 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TenantConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.intc.common.core.constant; /** * 租户常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java index be85805..dba0038 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java @@ -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.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/CompleteTaskDTO.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/CompleteTaskDTO.java index e011874..5c3053e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/CompleteTaskDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DeptDTO.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DeptDTO.java index 7b748b0..5791d96 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DeptDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictDataDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictDataDTO.java index dff1a75..a5f46f4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictDataDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictTypeDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictTypeDTO.java index 43ab142..7d48ac0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/DictTypeDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/FlowCopyDTO.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/FlowCopyDTO.java index 2f20b21..15a75fb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/FlowCopyDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/OssDTO.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/OssDTO.java index 463821c..87ef1b4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/OssDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/PostDTO.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/PostDTO.java index 7536ee3..6c36c26 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/PostDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/RoleDTO.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/RoleDTO.java index d14ffbb..adb3d46 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessDTO.java index a6d4cb3..bf475b5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessReturnDTO.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessReturnDTO.java index 9bcbd12..1bfb71f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/StartProcessReturnDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/TaskAssigneeDTO.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/TaskAssigneeDTO.java index 78fb40e..932a53e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/TaskAssigneeDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserDTO.java index cb5def9..8e319e3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserOnlineDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserOnlineDTO.java index 43d8c3c..28c5439 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.intc.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessDeleteEvent.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessDeleteEvent.java index d570c31..e9bae7d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessDeleteEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.intc.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessEvent.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessEvent.java index d830dbe..ad97537 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.intc.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessTaskEvent.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessTaskEvent.java index 0984727..6456be5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/event/ProcessTaskEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.intc.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/EmailLoginBody.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/EmailLoginBody.java index ffde8c6..0931d1e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/EmailLoginBody.java @@ -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.NotBlank; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginBody.java index 63bee0d..94417c6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginUser.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginUser.java index 338d4d7..f60449e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/LoginUser.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.domain.dto.PostDTO; -import org.dromara.common.core.domain.dto.RoleDTO; +import com.intc.common.core.domain.dto.PostDTO; +import com.intc.common.core.domain.dto.RoleDTO; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/PasswordLoginBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/PasswordLoginBody.java index 143c959..5491dfa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/PasswordLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/RegisterBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/RegisterBody.java index 3f23249..ae34a7e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/RegisterBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SmsLoginBody.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SmsLoginBody.java index a878348..efaa1fb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SmsLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SocialLoginBody.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SocialLoginBody.java index 0d1b121..3119957 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/SocialLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/TaskAssigneeBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/TaskAssigneeBody.java index 0cbed2f..c34fd7d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/TaskAssigneeBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginBody.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginBody.java index 518fe2e..a903971 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginUser.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginUser.java index e5f3d6c..ba652fc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/model/XcxLoginUser.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.intc.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/BusinessStatusEnum.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/BusinessStatusEnum.java index c1660ee..e222030 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/BusinessStatusEnum.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/DeviceType.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/DeviceType.java index 1667ac7..2695811 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/FormatsType.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/FormatsType.java index 8d4b6d9..8958db1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/FormatsType.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /* * 日期格式 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/LoginType.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/LoginType.java index f9cac66..0247c5f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java index be7e44d..4d46b05 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserType.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserType.java index 636988f..927daf0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserType.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.enums; +package com.intc.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 用户类型 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java index 90f5752..9b60951 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package com.intc.common.core.exception; import cn.hutool.core.text.StrFormatter; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/SseException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/SseException.java index a76e16d..b33ca17 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/SseException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package com.intc.common.core.exception; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java index 40ce01b..0d9dfd2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.exception.base; +package com.intc.common.core.exception.base; import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.MessageUtils; +import com.intc.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java similarity index 73% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java index d374fc0..76797ae 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java @@ -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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java index af98124..503174a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package com.intc.common.core.exception.file; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java index 1eb8d40..b1ad56d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package com.intc.common.core.exception.file; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaException.java index 43824e0..213f7a9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.user; +package com.intc.common.core.exception.user; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java index f4b8cac..fa7fe8e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.user; +package com.intc.common.core.exception.user; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java similarity index 73% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java index 024fed6..e29e3fc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java @@ -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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/RegexPatternPoolFactory.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/RegexPatternPoolFactory.java index fd907d2..4689252 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/RegexPatternPoolFactory.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.factory; +package com.intc.common.core.factory; 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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/YmlPropertySourceFactory.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/YmlPropertySourceFactory.java index af61b90..c88ef0d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/factory/YmlPropertySourceFactory.java @@ -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.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/ConfigService.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/ConfigService.java index 7328c69..c5bb6e6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.intc.common.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DeptService.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DeptService.java index 725718a..4b753b3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DeptService.java @@ -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.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DictService.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DictService.java index d80395c..a2d5c2f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/DictService.java @@ -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 org.dromara.common.core.domain.dto.DictTypeDTO; +import com.intc.common.core.domain.dto.DictDataDTO; +import com.intc.common.core.domain.dto.DictTypeDTO; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/OssService.java similarity index 83% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/OssService.java index 1a52de0..f4fc8c4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/OssService.java @@ -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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PermissionService.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PermissionService.java index d7db79a..0cdff70 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.intc.common.core.service; import java.util.Set; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PostService.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PostService.java index 58c68d6..7cf4ea1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/PostService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.intc.common.core.service; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/RoleService.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/RoleService.java index d2805b7..a81fa5b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/RoleService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.intc.common.core.service; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/TaskAssigneeService.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/TaskAssigneeService.java index 9af6691..22162f8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/TaskAssigneeService.java @@ -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 org.dromara.common.core.domain.model.TaskAssigneeBody; +import com.intc.common.core.domain.dto.TaskAssigneeDTO; +import com.intc.common.core.domain.model.TaskAssigneeBody; /** * 工作流设计器获取任务执行人 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/UserService.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/UserService.java index eefeef0..c5cf6c6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/UserService.java @@ -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.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/WorkflowService.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/service/WorkflowService.java index 706d357..1b0401b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/service/WorkflowService.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.service; +package com.intc.common.core.service; -import org.dromara.common.core.domain.dto.CompleteTaskDTO; -import org.dromara.common.core.domain.dto.StartProcessDTO; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import com.intc.common.core.domain.dto.CompleteTaskDTO; +import com.intc.common.core.domain.dto.StartProcessDTO; +import com.intc.common.core.domain.dto.StartProcessReturnDTO; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java index b4d1462..960bfdc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import org.apache.commons.lang3.time.DateFormatUtils; -import org.dromara.common.core.enums.FormatsType; -import org.dromara.common.core.exception.ServiceException; +import com.intc.common.core.enums.FormatsType; +import com.intc.common.core.exception.ServiceException; import java.lang.management.ManagementFactory; import java.text.ParseException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MapstructUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MapstructUtils.java index b6acff7..ccd19db 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MapstructUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MessageUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MessageUtils.java index 48dfc08..041a346 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/NetUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/NetUtils.java index 72fdf40..5298001 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/NetUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.lang.PatternPool; import cn.hutool.core.net.NetUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.regex.RegexUtils; +import com.intc.common.core.utils.regex.RegexUtils; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ObjectUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ObjectUtils.java index 199fd82..de79266 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java index 509026f..a0ef3cd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.JakartaServletUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java index 169c6e2..8a8f656 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.extra.spring.SpringUtil; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StreamUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StreamUtils.java index c5487c0..5bda277 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java index 6eac2fc..0e52722 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/Threads.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/Threads.java index 82ea5ca..8de0de6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/Threads.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TreeBuildUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TreeBuildUtils.java index 5f60ebf..2dfc1d1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TreeBuildUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -7,7 +7,7 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.intc.common.core.utils.reflect.ReflectUtils; import java.util.List; import java.util.Set; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ValidatorUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ValidatorUtils.java index 06b8fd6..405791e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.intc.common.core.utils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java index 573b207..f8c554f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package com.intc.common.core.utils.file; import cn.hutool.core.io.FileUtil; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java index 23fa2cf..a981861 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package com.intc.common.core.utils.file; /** * 媒体类型工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/AddressUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/AddressUtils.java index 2fe3bd7..f408f04 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/AddressUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils.ip; +package com.intc.common.core.utils.ip; import cn.hutool.http.HtmlUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.NetUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.NetUtils; +import com.intc.common.core.utils.StringUtils; /** * 获取地址类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/RegionUtils.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/RegionUtils.java index c9e8678..91f8bfd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.utils.ip; +package com.intc.common.core.utils.ip; import cn.hutool.core.io.resource.NoResourceException; import cn.hutool.core.io.resource.ResourceUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; import org.lionsoul.ip2region.xdb.Searcher; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java index 367e8c9..ee92f93 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.utils.reflect; +package com.intc.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexUtils.java index 6dde129..675f02a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.intc.common.core.utils.regex; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.constant.RegexConstants; +import com.intc.common.core.constant.RegexConstants; /** * 正则相关工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexValidator.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexValidator.java index c0dda20..80029c1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/regex/RegexValidator.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.intc.common.core.utils.regex; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.lang.Validator; -import org.dromara.common.core.factory.RegexPatternPoolFactory; +import com.intc.common.core.factory.RegexPatternPoolFactory; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java index 1020c81..3438b8c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.sql; +package com.intc.common.core.utils.sql; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * sql操作工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/AddGroup.java similarity index 65% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/AddGroup.java index 0275899..9ed4ec7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.intc.common.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/EditGroup.java similarity index 66% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/EditGroup.java index 77c5040..9c4d138 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.intc.common.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/QueryGroup.java similarity index 66% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/QueryGroup.java index 02a0ac2..4e5063a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.intc.common.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPattern.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPattern.java index 73fc4c4..ea64c6b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPattern.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate.dicts; +package com.intc.common.core.validate.dicts; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPatternValidator.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPatternValidator.java index 558a343..4884c5a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/dicts/DictPatternValidator.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.validate.dicts; +package com.intc.common.core.validate.dicts; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; /** * 自定义字典值校验器 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPattern.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPattern.java index 3d4adb9..146bc10 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPattern.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate.enumd; +package com.intc.common.core.validate.enumd; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPatternValidator.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPatternValidator.java index e63f44a..454910a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/validate/enumd/EnumPatternValidator.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.validate.enumd; +package com.intc.common.core.validate.enumd; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.reflect.ReflectUtils; /** * 自定义枚举校验注解实现 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java index eed495f..26d3140 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.intc.common.core.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java index 9c32563..2f25c1d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.intc.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1015c81 --- /dev/null +++ b/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +com.intc.common.core.config.ApplicationConfig +com.intc.common.core.config.ThreadPoolConfig +com.intc.common.core.config.ValidatorConfig +com.intc.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/intc-common/intc-common-doc/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-doc/pom.xml rename to intc-common/intc-common-doc/pom.xml index c6199a1..178c173 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/intc-common/intc-common-doc/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-doc + intc-common-doc ruoyi-common-doc 系统接口 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/SpringDocConfig.java similarity index 95% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java rename to intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/SpringDocConfig.java index 35b6ce9..a5b30b3 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/SpringDocConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.doc.config; +package com.intc.common.doc.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.doc.config.properties.SpringDocProperties; -import org.dromara.common.doc.handler.OpenApiHandler; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.doc.config.properties.SpringDocProperties; +import com.intc.common.doc.handler.OpenApiHandler; import org.springdoc.core.configuration.SpringDocConfiguration; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.OpenApiCustomizer; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/properties/SpringDocProperties.java similarity index 97% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/properties/SpringDocProperties.java index eae3b4c..b67cbe5 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/config/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.config.properties; +package com.intc.common.doc.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/handler/OpenApiHandler.java similarity index 99% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to intc-common/intc-common-doc/src/main/java/com/intc/common/doc/handler/OpenApiHandler.java index 56b7369..f85376e 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/intc-common/intc-common-doc/src/main/java/com/intc/common/doc/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.handler; +package com.intc.common.doc.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; @@ -11,7 +11,7 @@ import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StreamUtils; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.ServerBaseUrlCustomizer; import org.springdoc.core.properties.SpringDocConfigProperties; diff --git a/intc-common/intc-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..5be0b1d --- /dev/null +++ b/intc-common/intc-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/intc-common/intc-common-encrypt/pom.xml similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/pom.xml rename to intc-common/intc-common-encrypt/pom.xml index ed4910e..acab971 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/intc-common/intc-common-encrypt/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-encrypt + intc-common-encrypt ruoyi-common-encrypt 数据加解密模块 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/ApiEncrypt.java similarity index 87% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/ApiEncrypt.java index 7f52de8..e2febd0 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/ApiEncrypt.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.annotation; +package com.intc.common.encrypt.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/EncryptField.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/EncryptField.java index d357d72..de8a416 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.annotation; +package com.intc.common.encrypt.annotation; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 86% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/ApiDecryptAutoConfiguration.java index 38b22f3..c90f315 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.config; +package com.intc.common.encrypt.config; import jakarta.servlet.DispatcherType; -import org.dromara.common.encrypt.filter.CryptoFilter; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.intc.common.encrypt.filter.CryptoFilter; +import com.intc.common.encrypt.properties.ApiDecryptProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 82% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/EncryptorAutoConfiguration.java index fbc4e52..3dc889b 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/config/EncryptorAutoConfiguration.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.config; +package com.intc.common.encrypt.config; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; -import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.intc.common.encrypt.core.EncryptorManager; +import com.intc.common.encrypt.interceptor.MybatisDecryptInterceptor; +import com.intc.common.encrypt.interceptor.MybatisEncryptInterceptor; +import com.intc.common.encrypt.properties.EncryptorProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptContext.java similarity index 77% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptContext.java index 2f02eaf..285beea 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptContext.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.intc.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; import lombok.Data; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptorManager.java similarity index 95% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptorManager.java index 5e2c731..66346b1 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/EncryptorManager.java @@ -1,14 +1,14 @@ -package org.dromara.common.encrypt.core; +package com.intc.common.encrypt.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.io.Resources; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.annotation.EncryptField; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/IEncryptor.java similarity index 78% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/IEncryptor.java index dbc4420..6ebcd1f 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/IEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.intc.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; /** * 加解者 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 62% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AbstractEncryptor.java index 858d229..d52c154 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.IEncryptor; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.core.IEncryptor; /** * 所有加密执行者的基类 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AesEncryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AesEncryptor.java index e4dc597..94de7c6 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/AesEncryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.utils.EncryptUtils; /** * AES算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 75% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Base64Encryptor.java index 0028548..5bc67e8 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.utils.EncryptUtils; /** * Base64算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/RsaEncryptor.java index 5f03a4b..2a394e9 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/RsaEncryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.utils.EncryptUtils; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm2Encryptor.java index aec5d82..b2b2259 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.utils.EncryptUtils; /** * sm2算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm4Encryptor.java index adaf674..1042ddc 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.intc.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.utils.EncryptUtils; /** * sm4算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/AlgorithmType.java similarity index 86% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/AlgorithmType.java index 26ee1ee..6800515 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/AlgorithmType.java @@ -1,8 +1,9 @@ -package org.dromara.common.encrypt.enumd; +package com.intc.common.encrypt.enumd; +import com.intc.common.encrypt.core.encryptor.*; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.encrypt.core.encryptor.*; + /** * 算法名称 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/EncodeType.java similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/EncodeType.java index f471221..28df3e7 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/enumd/EncodeType.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.enumd; +package com.intc.common.encrypt.enumd; /** * 编码类型 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/CryptoFilter.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/CryptoFilter.java index 79d58da..a1db5c5 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/CryptoFilter.java @@ -1,15 +1,15 @@ -package org.dromara.common.encrypt.filter; +package com.intc.common.encrypt.filter; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.constant.HttpStatus; -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.encrypt.annotation.ApiEncrypt; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.intc.common.core.constant.HttpStatus; +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.encrypt.annotation.ApiEncrypt; +import com.intc.common.encrypt.properties.ApiDecryptProperties; import org.springframework.http.HttpMethod; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerExceptionResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 94% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/DecryptRequestBodyWrapper.java index 98f4bc7..a16f0aa 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.filter; +package com.intc.common.encrypt.filter; import cn.hutool.core.io.IoUtil; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.core.constant.Constants; +import com.intc.common.encrypt.utils.EncryptUtils; import org.springframework.http.MediaType; import java.io.BufferedReader; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 97% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/EncryptResponseBodyWrapper.java index 78e06ff..2559fde 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -1,11 +1,11 @@ -package org.dromara.common.encrypt.filter; +package com.intc.common.encrypt.filter; import cn.hutool.core.util.RandomUtil; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.intc.common.encrypt.utils.EncryptUtils; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisDecryptInterceptor.java index d5faae7..77aadd2 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.interceptor; +package com.intc.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,13 +8,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.parameter.ParameterHandler; import org.apache.ibatis.executor.resultset.ResultSetHandler; import org.apache.ibatis.plugin.*; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.annotation.EncryptField; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.core.EncryptorManager; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.Statement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 90% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisEncryptInterceptor.java index bcc2f4c..9324a45 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.interceptor; +package com.intc.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -10,13 +10,13 @@ import org.apache.ibatis.plugin.Interceptor; import org.apache.ibatis.plugin.Intercepts; import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Signature; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.annotation.EncryptField; +import com.intc.common.encrypt.core.EncryptContext; +import com.intc.common.encrypt.core.EncryptorManager; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.PreparedStatement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/ApiDecryptProperties.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/ApiDecryptProperties.java index 6aadb3e..ab78d13 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/ApiDecryptProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.properties; +package com.intc.common.encrypt.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/EncryptorProperties.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/EncryptorProperties.java index ba445c1..1b7437e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.properties; +package com.intc.common.encrypt.properties; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.intc.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.enumd.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/utils/EncryptUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/utils/EncryptUtils.java index ff0fbc8..29f7112 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/intc-common/intc-common-encrypt/src/main/java/com/intc/common/encrypt/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.utils; +package com.intc.common.encrypt.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/intc-common/intc-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..062ef24 --- /dev/null +++ b/intc-common/intc-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.intc.common.encrypt.config.EncryptorAutoConfiguration +com.intc.common.encrypt.config.ApiDecryptAutoConfiguration + diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/intc-common/intc-common-excel/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-excel/pom.xml rename to intc-common/intc-common-excel/pom.xml index 47ba528..4993638 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/intc-common/intc-common-excel/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-excel + intc-common-excel ruoyi-common-excel @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/CellMerge.java similarity index 80% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/CellMerge.java index 6b9211b..42f13ea 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.intc.common.excel.annotation; -import org.dromara.common.excel.core.CellMergeStrategy; +import com.intc.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelDictFormat.java similarity index 85% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelDictFormat.java index 5c51842..a39f8d8 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.intc.common.excel.annotation; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelEnumFormat.java similarity index 92% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelEnumFormat.java index 290379d..3fe7823 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.intc.common.excel.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelNotation.java similarity index 90% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelNotation.java index ed42371..0a926be 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelNotation.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.intc.common.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelRequired.java similarity index 91% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelRequired.java index ca8083b..ff3765c 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/annotation/ExcelRequired.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.intc.common.excel.annotation; import org.apache.poi.ss.usermodel.IndexedColors; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelBigNumberConvert.java index c6beb55..2adf20c 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.intc.common.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelDictConvert.java similarity index 88% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelDictConvert.java index c54816f..3d67caf 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.intc.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,11 +9,11 @@ import cn.idev.excel.metadata.GlobalConfiguration; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.metadata.data.WriteCellData; import cn.idev.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.utils.ExcelUtil; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelEnumConvert.java similarity index 95% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelEnumConvert.java index 5723e61..cf2785a 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.intc.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,8 +9,8 @@ import cn.idev.excel.metadata.GlobalConfiguration; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.metadata.data.WriteCellData; import cn.idev.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.intc.common.core.utils.reflect.ReflectUtils; +import com.intc.common.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeHandler.java index 204a88e..8d588a7 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; @@ -8,8 +8,8 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import lombok.SneakyThrows; import org.apache.poi.ss.util.CellRangeAddress; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.CellMerge; +import com.intc.common.core.utils.reflect.ReflectUtils; +import com.intc.common.excel.annotation.CellMerge; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeStrategy.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeStrategy.java index 34bf4a4..92de032 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/CellMergeStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.idev.excel.metadata.Head; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelListener.java similarity index 94% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelListener.java index e715c5f..cc44b0d 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.util.StrUtil; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.event.AnalysisEventListener; import cn.idev.excel.exception.ExcelAnalysisException; import cn.idev.excel.exception.ExcelDataConvertException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.ValidatorUtils; +import com.intc.common.json.utils.JsonUtils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelResult.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelResult.java index 7373e12..49f24af 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DropDownOptions.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DropDownOptions.java index 7cdb5c5..d246143 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/DropDownOptions.java @@ -1,11 +1,11 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; +import com.intc.common.core.exception.ServiceException; import java.util.ArrayList; import java.util.HashMap; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelDownHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelDownHandler.java index 1397283..ba3e687 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelDownHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -17,13 +17,13 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.WorkbookUtil; import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.annotation.ExcelEnumFormat; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelListener.java similarity index 83% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelListener.java index 957b307..9c67ad8 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import cn.idev.excel.read.listener.ReadListener; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelResult.java similarity index 88% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelResult.java index 0c2a418..e9f8ea0 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.intc.common.excel.core; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/handler/DataWriteHandler.java similarity index 96% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/handler/DataWriteHandler.java index 3770f80..7e3b691 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/handler/DataWriteHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.handler; +package com.intc.common.excel.handler; import cn.hutool.core.collection.CollUtil; import cn.idev.excel.annotation.ExcelProperty; @@ -14,8 +14,8 @@ import cn.idev.excel.write.metadata.style.WriteFont; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.dromara.common.excel.annotation.ExcelNotation; -import org.dromara.common.excel.annotation.ExcelRequired; +import com.intc.common.excel.annotation.ExcelNotation; +import com.intc.common.excel.annotation.ExcelRequired; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelUtil.java index 74dbccb..96bea40 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.utils; +package com.intc.common.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -10,15 +10,15 @@ import cn.idev.excel.write.metadata.WriteSheet; import cn.idev.excel.write.metadata.fill.FillConfig; import cn.idev.excel.write.metadata.fill.FillWrapper; import cn.idev.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.intc.common.excel.core.*; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.*; -import org.dromara.common.excel.handler.DataWriteHandler; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.common.excel.convert.ExcelBigNumberConvert; +import com.intc.common.excel.handler.DataWriteHandler; import java.io.IOException; import java.io.InputStream; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelWriterWrapper.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java rename to intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelWriterWrapper.java index 396f371..0dc00f6 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java +++ b/intc-common/intc-common-excel/src/main/java/com/intc/common/excel/utils/ExcelWriterWrapper.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.utils; +package com.intc.common.excel.utils; import cn.idev.excel.ExcelWriter; import cn.idev.excel.FastExcel; diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/intc-common/intc-common-idempotent/pom.xml similarity index 72% rename from ruoyi-common/ruoyi-common-idempotent/pom.xml rename to intc-common/intc-common-idempotent/pom.xml index 64418b4..2a341f6 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/intc-common/intc-common-idempotent/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-idempotent + intc-common-idempotent ruoyi-common-idempotent 幂等功能 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/annotation/RepeatSubmit.java similarity index 91% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/annotation/RepeatSubmit.java index 42ae802..e79974e 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.annotation; +package com.intc.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/aspectj/RepeatSubmitAspect.java index 5a27e91..e164343 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.aspectj; +package com.intc.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; @@ -11,15 +11,15 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -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.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; +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.MessageUtils; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.redis.utils.RedisUtils; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/config/IdempotentConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java rename to intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/config/IdempotentConfig.java index fcb9d03..b31bdc0 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java +++ b/intc-common/intc-common-idempotent/src/main/java/com/intc/common/idempotent/config/IdempotentConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.idempotent.config; +package com.intc.common.idempotent.config; -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; +import com.intc.common.idempotent.aspectj.RepeatSubmitAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/intc-common/intc-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..7316c35 --- /dev/null +++ b/intc-common/intc-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/intc-common/intc-common-job/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-job/pom.xml rename to intc-common/intc-common-job/pom.xml index 3a4a0cb..40faa62 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/intc-common/intc-common-job/pom.xml @@ -3,13 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-job + intc-common-job ruoyi-common-job 定时任务 @@ -38,8 +38,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/intc-common/intc-common-job/src/main/java/com/intc/common/job/config/SnailJobConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java rename to intc-common/intc-common-job/src/main/java/com/intc/common/job/config/SnailJobConfig.java index cba3753..46927c4 100644 --- a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java +++ b/intc-common/intc-common-job/src/main/java/com/intc/common/job/config/SnailJobConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.job.config; +package com.intc.common.job.config; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; diff --git a/intc-common/intc-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fd2afe0 --- /dev/null +++ b/intc-common/intc-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/intc-common/intc-common-json/pom.xml similarity index 79% rename from ruoyi-common/ruoyi-common-json/pom.xml rename to intc-common/intc-common-json/pom.xml index 870df5c..02bf0e0 100644 --- a/ruoyi-common/ruoyi-common-json/pom.xml +++ b/intc-common/intc-common-json/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-json + intc-common-json ruoyi-common-json 序列化模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/intc-common/intc-common-json/src/main/java/com/intc/common/json/config/JacksonConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to intc-common/intc-common-json/src/main/java/com/intc/common/json/config/JacksonConfig.java index 0392573..8bbbe0d 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ b/intc-common/intc-common-json/src/main/java/com/intc/common/json/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.config; +package com.intc.common.json.config; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.json.handler.BigNumberSerializer; -import org.dromara.common.json.handler.CustomDateDeserializer; +import com.intc.common.json.handler.BigNumberSerializer; +import com.intc.common.json.handler.CustomDateDeserializer; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/BigNumberSerializer.java similarity index 96% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/BigNumberSerializer.java index 8752353..f7561fb 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package com.intc.common.json.handler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/CustomDateDeserializer.java similarity index 92% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java rename to intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/CustomDateDeserializer.java index 21c6a6a..fc72a31 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java +++ b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/CustomDateDeserializer.java @@ -1,11 +1,11 @@ -package org.dromara.common.json.handler; +package com.intc.common.json.handler; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import org.dromara.common.core.utils.ObjectUtils; +import com.intc.common.core.utils.ObjectUtils; import java.io.IOException; import java.util.Date; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/DoubleSerializer.java b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/DoubleSerializer.java similarity index 94% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/DoubleSerializer.java rename to intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/DoubleSerializer.java index c3fd6ef..fab1dc1 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/DoubleSerializer.java +++ b/intc-common/intc-common-json/src/main/java/com/intc/common/json/handler/DoubleSerializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package com.intc.common.json.handler; import java.io.IOException; import java.text.DecimalFormat; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/intc-common/intc-common-json/src/main/java/com/intc/common/json/utils/JsonUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to intc-common/intc-common-json/src/main/java/com/intc/common/json/utils/JsonUtils.java index 65c2faa..471295d 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java +++ b/intc-common/intc-common-json/src/main/java/com/intc/common/json/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.utils; +package com.intc.common.json.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/intc-common/intc-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..279b38b --- /dev/null +++ b/intc-common/intc-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/intc-common/intc-common-log/pom.xml similarity index 63% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to intc-common/intc-common-log/pom.xml index 1e2b33b..bfc368c 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/intc-common/intc-common-log/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-log + intc-common-log ruoyi-common-log 日志记录 @@ -18,13 +18,13 @@ - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java similarity index 84% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java index 2dced97..ffb0ce8 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java @@ -1,7 +1,7 @@ -package org.dromara.common.log.annotation; +package com.intc.common.log.annotation; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.log.enums.OperatorType; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.log.enums.OperatorType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java index d68be22..c9b427f 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.aspect; +package com.intc.common.log.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; @@ -13,15 +13,15 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.domain.model.LoginUser; -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.json.utils.JsonUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessStatus; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.model.LoginUser; +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.json.utils.JsonUtils; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessStatus; +import com.intc.common.log.event.OperLogEvent; +import com.intc.common.satoken.utils.LoginHelper; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; import org.springframework.validation.BindingResult; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java similarity index 80% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java index d303dc3..3a6ded2 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.intc.common.log.enums; /** * 操作状态 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java similarity index 93% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java index 2d25ebb..e74184b 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.intc.common.log.enums; /** * 业务操作类型 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java similarity index 85% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java index de9328b..f00dbc6 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.intc.common.log.enums; /** * 操作人类别 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/event/LogininforEvent.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/event/LogininforEvent.java index 938eaad..741c562 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.intc.common.log.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/event/OperLogEvent.java index 0386192..60a7c99 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/event/OperLogEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.intc.common.log.event; import lombok.Data; diff --git a/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..17a378e --- /dev/null +++ b/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/intc-common/intc-common-mail/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-mail/pom.xml rename to intc-common/intc-common-mail/pom.xml index c0e1b2e..f79eb75 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/intc-common/intc-common-mail/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-mail + intc-common-mail ruoyi-common-mail 邮件模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/MailConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java rename to intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/MailConfig.java index 0ea3007..ac17a40 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java +++ b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/MailConfig.java @@ -1,7 +1,7 @@ -package org.dromara.common.mail.config; +package com.intc.common.mail.config; import cn.hutool.extra.mail.MailAccount; -import org.dromara.common.mail.config.properties.MailProperties; +import com.intc.common.mail.config.properties.MailProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/properties/MailProperties.java similarity index 96% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java rename to intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/properties/MailProperties.java index e44aa3d..3172871 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java +++ b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.config.properties; +package com.intc.common.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/utils/MailUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java rename to intc-common/intc-common-mail/src/main/java/com/intc/common/mail/utils/MailUtils.java index a28701f..80b4bf7 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java +++ b/intc-common/intc-common-mail/src/main/java/com/intc/common/mail/utils/MailUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.intc.common.mail.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -12,8 +12,8 @@ import jakarta.mail.Authenticator; import jakarta.mail.Session; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; import java.io.File; import java.io.InputStream; diff --git a/intc-common/intc-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c3c5231 --- /dev/null +++ b/intc-common/intc-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/intc-common/intc-common-mybatis/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-mybatis/pom.xml rename to intc-common/intc-common-mybatis/pom.xml index a9baa54..474f92a 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/intc-common/intc-common-mybatis/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-mybatis + intc-common-mybatis ruoyi-common-mybatis 数据库服务 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataColumn.java similarity index 95% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataColumn.java index 2879b9d..ebda417 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.intc.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataPermission.java similarity index 93% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataPermission.java index f5f22d5..4c5c709 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.intc.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAdvice.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionAdvice.java similarity index 90% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAdvice.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionAdvice.java index 54d5ad4..f60345b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAdvice.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionAdvice.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.aspect; +package com.intc.common.mybatis.aspect; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.helper.DataPermissionHelper; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.helper.DataPermissionHelper; import java.lang.reflect.Method; import java.lang.reflect.Proxy; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcut.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcut.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcut.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcut.java index 4b7d945..792a6c2 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcut.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcut.java @@ -1,7 +1,7 @@ -package org.dromara.common.mybatis.aspect; +package com.intc.common.mybatis.aspect; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.annotation.DataPermission; import org.springframework.aop.support.StaticMethodMatcherPointcut; import java.lang.reflect.Method; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcutAdvisor.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcutAdvisor.java index 351288c..31818b2 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/aspect/DataPermissionPointcutAdvisor.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.aspect; +package com.intc.common.mybatis.aspect; import org.aopalliance.aop.Advice; import org.springframework.aop.Pointcut; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/config/MybatisPlusConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/config/MybatisPlusConfig.java index b088257..444009a 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.config; +package com.intc.common.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.aspect.DataPermissionPointcutAdvisor; -import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; -import org.dromara.common.mybatis.handler.MybatisExceptionHandler; -import org.dromara.common.mybatis.handler.PlusPostInitTableInfoHandler; -import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import com.intc.common.core.factory.YmlPropertySourceFactory; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.mybatis.aspect.DataPermissionPointcutAdvisor; +import com.intc.common.mybatis.handler.InjectionMetaObjectHandler; +import com.intc.common.mybatis.handler.MybatisExceptionHandler; +import com.intc.common.mybatis.handler.PlusPostInitTableInfoHandler; +import com.intc.common.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/domain/BaseEntity.java index 13a7941..f7304c4 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.domain; +package com.intc.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 97% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlus.java index aec0673..dfcc70b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.mapper; +package com.intc.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,8 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; +import com.intc.common.core.utils.MapstructUtils; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlusJoin.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlusJoin.java similarity index 99% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlusJoin.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlusJoin.java index 4681bed..1b98ce9 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlusJoin.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/mapper/BaseMapperPlusJoin.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.mapper; +package com.intc.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,7 +11,7 @@ import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.MapstructUtils; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/PageQuery.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/PageQuery.java index 1d5c3c9..13381ca 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/PageQuery.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package com.intc.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.sql.SqlUtil; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.sql.SqlUtil; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/TableDataInfo.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/TableDataInfo.java index 1fe2b3e..2fa99eb 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package com.intc.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpStatus; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataBaseType.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataBaseType.java index 2d5244b..9ee4464 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataBaseType.java @@ -1,8 +1,8 @@ -package org.dromara.common.mybatis.enums; +package com.intc.common.mybatis.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 数据库类型 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataScopeType.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataScopeType.java index 02a5f48..062eb8e 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/enums/DataScopeType.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.enums; +package com.intc.common.mybatis.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.helper.DataPermissionHelper; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.helper.DataPermissionHelper; /** * 数据权限类型枚举 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 93% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/InjectionMetaObjectHandler.java index 38f7247..ebbec16 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -1,15 +1,15 @@ -package org.dromara.common.mybatis.handler; +package com.intc.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.satoken.utils.LoginHelper; import java.util.Date; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/MybatisExceptionHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/MybatisExceptionHandler.java index 9a572b5..62304a0 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/MybatisExceptionHandler.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.handler; +package com.intc.common.mybatis.handler; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; import org.mybatis.spring.MyBatisSystemException; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusDataPermissionHandler.java index 5c2ca98..2080a5c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusDataPermissionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.handler; +package com.intc.common.mybatis.handler; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -9,17 +9,17 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList; import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.enums.DataScopeType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.dto.RoleDTO; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.enums.DataScopeType; +import com.intc.common.mybatis.helper.DataPermissionHelper; +import com.intc.common.satoken.utils.LoginHelper; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.expression.*; import org.springframework.expression.common.TemplateParserContext; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusPostInitTableInfoHandler.java similarity index 84% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusPostInitTableInfoHandler.java index 60ca20b..1c8dc2c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/handler/PlusPostInitTableInfoHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.mybatis.handler; +package com.intc.common.mybatis.handler; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler; import com.baomidou.mybatisplus.core.metadata.TableInfo; import org.apache.ibatis.session.Configuration; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.reflect.ReflectUtils; /** * 修改表信息初始化方式 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataBaseHelper.java similarity index 93% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataBaseHelper.java index 487ffd3..74cead5 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataBaseHelper.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.helper; +package com.intc.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.enums.DataBaseType; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.mybatis.enums.DataBaseType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataPermissionHelper.java similarity index 97% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataPermissionHelper.java index f03d74e..1c868e3 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.helper; +package com.intc.common.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mybatis.annotation.DataPermission; +import com.intc.common.core.utils.reflect.ReflectUtils; +import com.intc.common.mybatis.annotation.DataPermission; import java.util.HashMap; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index b37d96e..943380c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/intc-common/intc-common-mybatis/src/main/java/com/intc/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.interceptor; +package com.intc.common.mybatis.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; @@ -20,7 +20,7 @@ import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; -import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; +import com.intc.common.mybatis.handler.PlusDataPermissionHandler; import java.sql.Connection; import java.sql.SQLException; diff --git a/intc-common/intc-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1f1b00c --- /dev/null +++ b/intc-common/intc-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/intc-common/intc-common-mybatis/src/main/resources/common-mybatis.yml similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml rename to intc-common/intc-common-mybatis/src/main/resources/common-mybatis.yml diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/intc-common/intc-common-mybatis/src/main/resources/spy.properties similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties rename to intc-common/intc-common-mybatis/src/main/resources/spy.properties diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/intc-common/intc-common-oss/pom.xml similarity index 86% rename from ruoyi-common/ruoyi-common-oss/pom.xml rename to intc-common/intc-common-oss/pom.xml index 190dc5d..25e5b1c 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/intc-common/intc-common-oss/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-oss + intc-common-oss ruoyi-common-oss oss服务 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/constant/OssConstant.java similarity index 87% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/constant/OssConstant.java index 9d8db93..05a6cfb 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/constant/OssConstant.java @@ -1,6 +1,6 @@ -package org.dromara.common.oss.constant; +package com.intc.common.oss.constant; -import org.dromara.common.core.constant.GlobalConstants; +import com.intc.common.core.constant.GlobalConstants; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/OssClient.java similarity index 97% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/OssClient.java index b9a90dc..d2a98d4 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/OssClient.java @@ -1,17 +1,17 @@ -package org.dromara.common.oss.core; +package com.intc.common.oss.core; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enums.AccessPolicyType; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.common.oss.constant.OssConstant; +import com.intc.common.oss.entity.UploadResult; +import com.intc.common.oss.enums.AccessPolicyType; +import com.intc.common.oss.exception.OssException; +import com.intc.common.oss.properties.OssProperties; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.async.*; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/WriteOutSubscriber.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/WriteOutSubscriber.java similarity index 83% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/WriteOutSubscriber.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/WriteOutSubscriber.java index d3a9841..8eb2c7e 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/WriteOutSubscriber.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/core/WriteOutSubscriber.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.core; +package com.intc.common.oss.core; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/entity/UploadResult.java similarity index 90% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/entity/UploadResult.java index 81a18e6..a505289 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.entity; +package com.intc.common.oss.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/enums/AccessPolicyType.java similarity index 96% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/enums/AccessPolicyType.java index 45b13be..477d9a9 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/enums/AccessPolicyType.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.enums; +package com.intc.common.oss.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/exception/OssException.java similarity index 86% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/exception/OssException.java index 52e9623..8db4d9c 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.exception; +package com.intc.common.oss.exception; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/factory/OssFactory.java similarity index 80% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/factory/OssFactory.java index 3da1ba5..d4ff27c 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/factory/OssFactory.java @@ -1,15 +1,15 @@ -package org.dromara.common.oss.factory; +package com.intc.common.oss.factory; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.oss.constant.OssConstant; +import com.intc.common.oss.core.OssClient; +import com.intc.common.oss.exception.OssException; +import com.intc.common.oss.properties.OssProperties; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.common.redis.utils.RedisUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/properties/OssProperties.java similarity index 95% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java rename to intc-common/intc-common-oss/src/main/java/com/intc/common/oss/properties/OssProperties.java index cb37206..7cfac75 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java +++ b/intc-common/intc-common-oss/src/main/java/com/intc/common/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.properties; +package com.intc.common.oss.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/intc-common/intc-common-ratelimiter/pom.xml similarity index 63% rename from ruoyi-common/ruoyi-common-ratelimiter/pom.xml rename to intc-common/intc-common-ratelimiter/pom.xml index bbde940..6132000 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ b/intc-common/intc-common-ratelimiter/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-ratelimiter + intc-common-ratelimiter ruoyi-common-ratelimiter 限流功能 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/annotation/RateLimiter.java similarity index 89% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/annotation/RateLimiter.java index 79272d4..43585b8 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java +++ b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.annotation; +package com.intc.common.ratelimiter.annotation; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.intc.common.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 89% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/aspectj/RateLimiterAspect.java index 2d6d82e..a7a6776 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,19 +1,19 @@ -package org.dromara.common.ratelimiter.aspectj; +package com.intc.common.ratelimiter.aspectj; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.exception.ServiceException; -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.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.core.exception.ServiceException; +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.ratelimiter.annotation.RateLimiter; +import com.intc.common.ratelimiter.enums.LimitType; +import com.intc.common.redis.utils.RedisUtils; import org.redisson.api.RateType; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.MethodBasedEvaluationContext; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/config/RateLimiterConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/config/RateLimiterConfig.java index 4b7e5b7..39406d0 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java +++ b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/config/RateLimiterConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.config; +package com.intc.common.ratelimiter.config; -import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect; +import com.intc.common.ratelimiter.aspectj.RateLimiterAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/enums/LimitType.java similarity index 85% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/enums/LimitType.java index b7f059f..7c6bde5 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java +++ b/intc-common/intc-common-ratelimiter/src/main/java/com/intc/common/ratelimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package org.dromara.common.ratelimiter.enums; +package com.intc.common.ratelimiter.enums; /** * 限流类型 diff --git a/intc-common/intc-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..92a30a5 --- /dev/null +++ b/intc-common/intc-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/intc-common/intc-common-ratelimiter/src/main/resources/spel-extension.json similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json rename to intc-common/intc-common-ratelimiter/src/main/resources/spel-extension.json diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/intc-common/intc-common-redis/pom.xml similarity index 88% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to intc-common/intc-common-redis/pom.xml index d7d99ca..7981f0e 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/intc-common/intc-common-redis/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-redis + intc-common-redis ruoyi-common-redis 缓存服务 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/CacheConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/CacheConfig.java index d57ba4e..da19625 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/CacheConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.config; +package com.intc.common.redis.config; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.manager.PlusSpringCacheManager; +import com.intc.common.redis.manager.PlusSpringCacheManager; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/RedisConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/RedisConfig.java index 7ba9475..983f7e1 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/RedisConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config; +package com.intc.common.redis.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -9,10 +9,10 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.redis.handler.RedisExceptionHandler; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.redis.config.properties.RedissonProperties; +import com.intc.common.redis.handler.KeyPrefixHandler; +import com.intc.common.redis.handler.RedisExceptionHandler; import org.redisson.client.codec.StringCodec; import org.redisson.codec.CompositeCodec; import org.redisson.codec.TypedJsonJacksonCodec; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/properties/RedissonProperties.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/properties/RedissonProperties.java index ebec786..198b00c 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config.properties; +package com.intc.common.redis.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/KeyPrefixHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/KeyPrefixHandler.java index 3bf3e34..2cc996d 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.handler; +package com.intc.common.redis.handler; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/RedisExceptionHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/RedisExceptionHandler.java index 5e904f3..9749ab7 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/handler/RedisExceptionHandler.java @@ -1,10 +1,10 @@ -package org.dromara.common.redis.handler; +package com.intc.common.redis.handler; import cn.hutool.http.HttpStatus; import com.baomidou.lock.exception.LockFailureException; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/CaffeineCacheDecorator.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/CaffeineCacheDecorator.java index 8662c53..c2ea216 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/CaffeineCacheDecorator.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.manager; +package com.intc.common.redis.manager; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import java.util.concurrent.Callable; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/PlusSpringCacheManager.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/PlusSpringCacheManager.java index 8428ef7..ce96e2a 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.common.redis.manager; +package com.intc.common.redis.manager; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.redis.utils.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/CacheUtils.java similarity index 94% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/CacheUtils.java index 865ffa5..b2d1a5a 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/CacheUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.intc.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/QueueUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/QueueUtils.java index 5b1c7f7..a340519 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/QueueUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.intc.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import org.redisson.api.*; import java.util.concurrent.CompletionStage; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/RedisUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/RedisUtils.java index c433bff..d81221d 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/RedisUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.intc.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import org.redisson.api.*; import org.redisson.api.options.KeysScanOptions; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/SequenceUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/SequenceUtils.java index a3d0bad..5dd1164 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/utils/SequenceUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.redis.utils; +package com.intc.common.redis.utils; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DatePattern; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; import org.redisson.api.RIdGenerator; import org.redisson.api.RedissonClient; diff --git a/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..48b5bac --- /dev/null +++ b/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.intc.common.redis.config.RedisConfig +com.intc.common.redis.config.CacheConfig diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/intc-common/intc-common-satoken/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-satoken/pom.xml rename to intc-common/intc-common-satoken/pom.xml index 4df7d4d..f304b4a 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/intc-common/intc-common-satoken/pom.xml @@ -3,25 +3,25 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-satoken + intc-common-satoken - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/config/SaTokenConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java rename to intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/config/SaTokenConfig.java index 61c6b9a..d658b91 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java +++ b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/config/SaTokenConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.satoken.config; +package com.intc.common.satoken.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; -import org.dromara.common.satoken.core.service.SaPermissionImpl; -import org.dromara.common.satoken.handler.SaTokenExceptionHandler; +import com.intc.common.core.factory.YmlPropertySourceFactory; +import com.intc.common.satoken.core.dao.PlusSaTokenDao; +import com.intc.common.satoken.core.service.SaPermissionImpl; +import com.intc.common.satoken.handler.SaTokenExceptionHandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/dao/PlusSaTokenDao.java similarity index 98% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/dao/PlusSaTokenDao.java index 14abf89..dcfca00 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/dao/PlusSaTokenDao.java @@ -1,10 +1,10 @@ -package org.dromara.common.satoken.core.dao; +package com.intc.common.satoken.core.dao; import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.util.SaFoxUtil; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.redis.utils.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/service/SaPermissionImpl.java similarity index 87% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/service/SaPermissionImpl.java index c9f8c8c..2eb02bf 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/core/service/SaPermissionImpl.java @@ -1,15 +1,15 @@ -package org.dromara.common.satoken.core.service; +package com.intc.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.PermissionService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.enums.UserType; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.PermissionService; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.satoken.utils.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/handler/SaTokenExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java rename to intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/handler/SaTokenExceptionHandler.java index a45af89..bb4bd40 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java +++ b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/handler/SaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.handler; +package com.intc.common.satoken.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -6,7 +6,7 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/utils/LoginHelper.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/utils/LoginHelper.java index 730bae2..4c0b26e 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/intc-common/intc-common-satoken/src/main/java/com/intc/common/satoken/utils/LoginHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.utils; +package com.intc.common.satoken.utils; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; @@ -8,10 +8,10 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.enums.UserType; import java.util.Set; diff --git a/intc-common/intc-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b8a58ef --- /dev/null +++ b/intc-common/intc-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/intc-common/intc-common-satoken/src/main/resources/common-satoken.yml similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml rename to intc-common/intc-common-satoken/src/main/resources/common-satoken.yml diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/intc-common/intc-common-security/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to intc-common/intc-common-security/pom.xml index 5b39df2..797fed6 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/intc-common/intc-common-security/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-security + intc-common-security ruoyi-common-security 安全模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/SecurityConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/config/SecurityConfig.java index 21f2c11..e0a9ae1 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config; +package com.intc.common.security.config; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.filter.SaServletFilter; @@ -10,13 +10,13 @@ import cn.dev33.satoken.util.SaResult; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.HttpStatus; -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.satoken.utils.LoginHelper; -import org.dromara.common.security.config.properties.SecurityProperties; -import org.dromara.common.security.handler.AllUrlHandler; +import com.intc.common.core.constant.HttpStatus; +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.satoken.utils.LoginHelper; +import com.intc.common.security.config.properties.SecurityProperties; +import com.intc.common.security.handler.AllUrlHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/properties/SecurityProperties.java similarity index 84% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/config/properties/SecurityProperties.java index be1cc6e..09c7274 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config.properties; +package com.intc.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/AllUrlHandler.java similarity index 93% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/AllUrlHandler.java index a0c6ada..e11edd1 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package org.dromara.common.security.handler; +package com.intc.common.security.handler; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.method.HandlerMethod; diff --git a/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..103c486 --- /dev/null +++ b/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.intc.common.security.handler.AllUrlHandler +com.intc.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/intc-common/intc-common-sensitive/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to intc-common/intc-common-sensitive/pom.xml index fecdf09..fb6c083 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/intc-common/intc-common-sensitive/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-sensitive + intc-common-sensitive ruoyi-common-sensitive 脱敏模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/annotation/Sensitive.java similarity index 81% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/annotation/Sensitive.java index e75dc5b..a42e1e2 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package org.dromara.common.sensitive.annotation; +package com.intc.common.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.sensitive.handler.SensitiveHandler; +import com.intc.common.sensitive.core.SensitiveStrategy; +import com.intc.common.sensitive.handler.SensitiveHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveService.java similarity index 86% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveService.java index 03a7f9c..366f152 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java +++ b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.intc.common.sensitive.core; /** * 脱敏服务 diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveStrategy.java similarity index 97% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveStrategy.java index 087132e..187cc70 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java +++ b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.intc.common.sensitive.core; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.DesensitizedUtil; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/handler/SensitiveHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/handler/SensitiveHandler.java index d454724..ee8315e 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java +++ b/intc-common/intc-common-sensitive/src/main/java/com/intc/common/sensitive/handler/SensitiveHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.handler; +package com.intc.common.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.sensitive.annotation.Sensitive; +import com.intc.common.sensitive.core.SensitiveService; +import com.intc.common.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/intc-common/intc-common-sms/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-sms/pom.xml rename to intc-common/intc-common-sms/pom.xml index 932cb9d..9cbd91d 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/intc-common/intc-common-sms/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-sms + intc-common-sms ruoyi-common-sms 短信模块 @@ -24,8 +24,8 @@ - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/config/SmsAutoConfiguration.java similarity index 82% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java rename to intc-common/intc-common-sms/src/main/java/com/intc/common/sms/config/SmsAutoConfiguration.java index 3a39cc2..9d2922c 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java +++ b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/config/SmsAutoConfiguration.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.config; +package com.intc.common.sms.config; -import org.dromara.common.sms.core.dao.PlusSmsDao; -import org.dromara.common.sms.handler.SmsExceptionHandler; +import com.intc.common.sms.core.dao.PlusSmsDao; +import com.intc.common.sms.handler.SmsExceptionHandler; import org.dromara.sms4j.api.dao.SmsDao; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/core/dao/PlusSmsDao.java similarity index 91% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java rename to intc-common/intc-common-sms/src/main/java/com/intc/common/sms/core/dao/PlusSmsDao.java index a757655..6c05f88 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java +++ b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/core/dao/PlusSmsDao.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.core.dao; +package com.intc.common.sms.core.dao; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.redis.utils.RedisUtils; import org.dromara.sms4j.api.dao.SmsDao; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/handler/SmsExceptionHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java rename to intc-common/intc-common-sms/src/main/java/com/intc/common/sms/handler/SmsExceptionHandler.java index 2c619a3..091d1b5 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java +++ b/intc-common/intc-common-sms/src/main/java/com/intc/common/sms/handler/SmsExceptionHandler.java @@ -1,9 +1,9 @@ -package org.dromara.common.sms.handler; +package com.intc.common.sms.handler; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/intc-common/intc-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..be8129c --- /dev/null +++ b/intc-common/intc-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/intc-common/intc-common-social/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-social/pom.xml rename to intc-common/intc-common-social/pom.xml index 9f9a965..8e09b4c 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/intc-common/intc-common-social/pom.xml @@ -3,13 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-social + intc-common-social ruoyi-common-social 授权认证 @@ -22,13 +22,13 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/SocialAutoConfiguration.java similarity index 75% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/config/SocialAutoConfiguration.java index 19b39d8..4efad27 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/SocialAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.social.config; +package com.intc.common.social.config; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.AuthRedisStateCache; +import com.intc.common.social.config.properties.SocialProperties; +import com.intc.common.social.utils.AuthRedisStateCache; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialLoginConfigProperties.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialLoginConfigProperties.java index 5f49d9c..6ae9f0d 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialLoginConfigProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.intc.common.social.config.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialProperties.java similarity index 88% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialProperties.java index 1487a6a..f1f5982 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/config/properties/SocialProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.intc.common.social.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaRequest.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaRequest.java index d3fc751..13980e7 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.gitea; +package com.intc.common.social.gitea; import cn.hutool.core.lang.Dict; import cn.hutool.http.HttpRequest; @@ -11,8 +11,8 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.json.utils.JsonUtils; /** * @author lcry diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaSource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaSource.java index 201b223..b10a270 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/gitea/AuthGiteaSource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.gitea; +package com.intc.common.social.gitea; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeyRequest.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeyRequest.java index 97774ac..aa3cc7c 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeyRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.intc.common.social.maxkey; import cn.hutool.core.lang.Dict; import me.zhyd.oauth.cache.AuthStateCache; @@ -8,8 +8,8 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.json.utils.JsonUtils; /** * @author 长春叭哥 2023年03月26日 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeySource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeySource.java index 1ff57f7..add9215 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/maxkey/AuthMaxKeySource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.intc.common.social.maxkey; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamRequest.java similarity index 94% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamRequest.java index 080c97a..973eaac 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.intc.common.social.topiam; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.Dict; @@ -16,10 +16,10 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.json.utils.JsonUtils; -import static org.dromara.common.social.topiam.AuthTopIamSource.TOPIAM; +import static com.intc.common.social.topiam.AuthTopIamSource.TOPIAM; /** * TopIAM 认证请求 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamSource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamSource.java index 852d7f5..13f925a 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/topiam/AuthTopIamSource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.intc.common.social.topiam; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/AuthRedisStateCache.java similarity index 91% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/AuthRedisStateCache.java index 0b6ec20..be27426 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/AuthRedisStateCache.java @@ -1,9 +1,9 @@ -package org.dromara.common.social.utils; +package com.intc.common.social.utils; import lombok.AllArgsConstructor; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.redis.utils.RedisUtils; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/SocialUtils.java similarity index 90% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java rename to intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/SocialUtils.java index 151d84c..031947e 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/intc-common/intc-common-social/src/main/java/com/intc/common/social/utils/SocialUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.utils; +package com.intc.common.social.utils; import cn.hutool.core.util.ObjectUtil; import me.zhyd.oauth.config.AuthConfig; @@ -7,12 +7,12 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.*; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.gitea.AuthGiteaRequest; -import org.dromara.common.social.maxkey.AuthMaxKeyRequest; -import org.dromara.common.social.topiam.AuthTopIamRequest; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.social.config.properties.SocialLoginConfigProperties; +import com.intc.common.social.config.properties.SocialProperties; +import com.intc.common.social.gitea.AuthGiteaRequest; +import com.intc.common.social.maxkey.AuthMaxKeyRequest; +import com.intc.common.social.topiam.AuthTopIamRequest; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java b/intc-common/intc-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java rename to intc-common/intc-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java diff --git a/intc-common/intc-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..95cadfd --- /dev/null +++ b/intc-common/intc-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.social.config.SocialAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/intc-common/intc-common-sse/pom.xml similarity index 55% rename from ruoyi-common/ruoyi-common-sse/pom.xml rename to intc-common/intc-common-sse/pom.xml index ae44c98..7e7112d 100644 --- a/ruoyi-common/ruoyi-common-sse/pom.xml +++ b/intc-common/intc-common-sse/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-sse + intc-common-sse ruoyi-common-sse 模块 @@ -17,20 +17,20 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseAutoConfiguration.java similarity index 80% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseAutoConfiguration.java index 0cf8054..5b113a5 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.sse.config; +package com.intc.common.sse.config; -import org.dromara.common.sse.controller.SseController; -import org.dromara.common.sse.core.SseEmitterManager; -import org.dromara.common.sse.listener.SseTopicListener; +import com.intc.common.sse.controller.SseController; +import com.intc.common.sse.core.SseEmitterManager; +import com.intc.common.sse.listener.SseTopicListener; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseProperties.java similarity index 88% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseProperties.java index ce4e173..69a03c7 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/config/SseProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.sse.config; +package com.intc.common.sse.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/controller/SseController.java similarity index 93% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/controller/SseController.java index f77b5b5..8f75789 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/controller/SseController.java @@ -1,11 +1,11 @@ -package org.dromara.common.sse.controller; +package com.intc.common.sse.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sse.core.SseEmitterManager; +import com.intc.common.core.domain.R; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.sse.core.SseEmitterManager; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.MediaType; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/core/SseEmitterManager.java similarity index 97% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/core/SseEmitterManager.java index bc19460..437bd1c 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/core/SseEmitterManager.java @@ -1,9 +1,9 @@ -package org.dromara.common.sse.core; +package com.intc.common.sse.core; import cn.hutool.core.map.MapUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.sse.dto.SseMessageDto; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.common.sse.dto.SseMessageDto; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/dto/SseMessageDto.java similarity index 92% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/dto/SseMessageDto.java index a2e1210..1aa82fc 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/dto/SseMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.sse.dto; +package com.intc.common.sse.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/listener/SseTopicListener.java similarity index 94% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/listener/SseTopicListener.java index 7a4dff1..64df714 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/listener/SseTopicListener.java @@ -1,8 +1,8 @@ -package org.dromara.common.sse.listener; +package com.intc.common.sse.listener; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.sse.core.SseEmitterManager; +import com.intc.common.sse.core.SseEmitterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/utils/SseMessageUtils.java similarity index 90% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java rename to intc-common/intc-common-sse/src/main/java/com/intc/common/sse/utils/SseMessageUtils.java index ce3aad4..cc99f8a 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java +++ b/intc-common/intc-common-sse/src/main/java/com/intc/common/sse/utils/SseMessageUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.sse.utils; +package com.intc.common.sse.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sse.core.SseEmitterManager; -import org.dromara.common.sse.dto.SseMessageDto; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.sse.core.SseEmitterManager; +import com.intc.common.sse.dto.SseMessageDto; /** * SSE工具类 diff --git a/intc-common/intc-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b491419 --- /dev/null +++ b/intc-common/intc-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.sse.config.SseAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/intc-common/intc-common-tenant/pom.xml similarity index 65% rename from ruoyi-common/ruoyi-common-tenant/pom.xml rename to intc-common/intc-common-tenant/pom.xml index 8e1a6ab..b3e1113 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/intc-common/intc-common-tenant/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-tenant + intc-common-tenant ruoyi-common-tenant 租户模块 @@ -17,14 +17,14 @@ - org.dromara - ruoyi-common-mybatis + com.intc + intc-common-mybatis true - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/config/TenantConfig.java similarity index 83% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/config/TenantConfig.java index 3767fa2..8ddaaff 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/config/TenantConfig.java @@ -1,16 +1,16 @@ -package org.dromara.common.tenant.config; +package com.intc.common.tenant.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.redis.config.RedisConfig; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.tenant.core.TenantSaTokenDao; -import org.dromara.common.tenant.handle.PlusTenantLineHandler; -import org.dromara.common.tenant.handle.TenantKeyPrefixHandler; -import org.dromara.common.tenant.manager.TenantSpringCacheManager; -import org.dromara.common.tenant.properties.TenantProperties; +import com.intc.common.core.utils.reflect.ReflectUtils; +import com.intc.common.redis.config.RedisConfig; +import com.intc.common.redis.config.properties.RedissonProperties; +import com.intc.common.tenant.core.TenantSaTokenDao; +import com.intc.common.tenant.handle.PlusTenantLineHandler; +import com.intc.common.tenant.handle.TenantKeyPrefixHandler; +import com.intc.common.tenant.manager.TenantSpringCacheManager; +import com.intc.common.tenant.properties.TenantProperties; import org.redisson.config.ClusterServersConfig; import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantEntity.java similarity index 73% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantEntity.java index 8ad0d2c..18ae61b 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantEntity.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.core; +package com.intc.common.tenant.core; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantSaTokenDao.java similarity index 95% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantSaTokenDao.java index 9aaa753..d573079 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/core/TenantSaTokenDao.java @@ -1,8 +1,8 @@ -package org.dromara.common.tenant.core; +package com.intc.common.tenant.core; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.common.satoken.core.dao.PlusSaTokenDao; import java.time.Duration; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/exception/TenantException.java similarity index 74% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/exception/TenantException.java index ee2bc97..265d1a8 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/exception/TenantException.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.exception; +package com.intc.common.tenant.exception; -import org.dromara.common.core.exception.base.BaseException; +import com.intc.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/PlusTenantLineHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/PlusTenantLineHandler.java index f6d224b..bfde240 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/PlusTenantLineHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.handle; +package com.intc.common.tenant.handle; import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; @@ -7,9 +7,9 @@ import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.StringValue; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.tenant.properties.TenantProperties; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.tenant.helper.TenantHelper; +import com.intc.common.tenant.properties.TenantProperties; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/TenantKeyPrefixHandler.java similarity index 89% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/TenantKeyPrefixHandler.java index dcdef6e..542bf1c 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/handle/TenantKeyPrefixHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.tenant.handle; +package com.intc.common.tenant.handle; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.tenant.helper.TenantHelper; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.redis.handler.KeyPrefixHandler; +import com.intc.common.tenant.helper.TenantHelper; /** * 多租户redis缓存key前缀处理 diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/helper/TenantHelper.java similarity index 95% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/helper/TenantHelper.java index 4b6981a..3df0179 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/helper/TenantHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.helper; +package com.intc.common.tenant.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -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.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.constant.GlobalConstants; +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.redis.utils.RedisUtils; +import com.intc.common.satoken.utils.LoginHelper; import java.util.Stack; import java.util.function.Supplier; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/manager/TenantSpringCacheManager.java similarity index 79% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/manager/TenantSpringCacheManager.java index 346e36f..fc615f1 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/manager/TenantSpringCacheManager.java @@ -1,11 +1,11 @@ -package org.dromara.common.tenant.manager; +package com.intc.common.tenant.manager; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.manager.PlusSpringCacheManager; -import org.dromara.common.tenant.helper.TenantHelper; +import com.intc.common.core.constant.GlobalConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.redis.manager.PlusSpringCacheManager; +import com.intc.common.tenant.helper.TenantHelper; import org.springframework.cache.Cache; /** diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/properties/TenantProperties.java similarity index 89% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java rename to intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/properties/TenantProperties.java index 1675ccf..9529149 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java +++ b/intc-common/intc-common-tenant/src/main/java/com/intc/common/tenant/properties/TenantProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.properties; +package com.intc.common.tenant.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/intc-common/intc-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..03549a5 --- /dev/null +++ b/intc-common/intc-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.tenant.config.TenantConfig diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/intc-common/intc-common-translation/pom.xml similarity index 70% rename from ruoyi-common/ruoyi-common-translation/pom.xml rename to intc-common/intc-common-translation/pom.xml index e77b868..134439b 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/intc-common/intc-common-translation/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-translation + intc-common-translation ruoyi-common-translation 通用翻译功能 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/Translation.java similarity index 87% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/Translation.java index c24aa6f..36aa4a2 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/Translation.java @@ -1,8 +1,8 @@ -package org.dromara.common.translation.annotation; +package com.intc.common.translation.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.intc.common.translation.core.handler.TranslationHandler; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/TranslationType.java similarity index 73% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/TranslationType.java index 43bfab0..6620359 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/annotation/TranslationType.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.annotation; +package com.intc.common.translation.annotation; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.translation.core.TranslationInterface; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/config/TranslationConfig.java similarity index 80% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/config/TranslationConfig.java index 5dcd0c1..b9814d0 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/config/TranslationConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.config; +package com.intc.common.translation.config; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.core.TranslationInterface; +import com.intc.common.translation.core.handler.TranslationBeanSerializerModifier; +import com.intc.common.translation.core.handler.TranslationHandler; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/constant/TransConstant.java similarity index 91% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/constant/TransConstant.java index c084ea1..99dd540 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/constant/TransConstant.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.constant; +package com.intc.common.translation.constant; /** * 翻译常量 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/TranslationInterface.java similarity index 76% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/TranslationInterface.java index e4d6dd3..c4542ce 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/TranslationInterface.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.core; +package com.intc.common.translation.core; -import org.dromara.common.translation.annotation.TranslationType; +import com.intc.common.translation.annotation.TranslationType; /** * 翻译接口 (实现类需标注 {@link TranslationType} 注解标明翻译类型) diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 95% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationBeanSerializerModifier.java index 727672f..97d3346 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.intc.common.translation.core.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationHandler.java index a90f1e1..6f7ba53 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.intc.common.translation.core.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.reflect.ReflectUtils; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.core.TranslationInterface; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DeptNameTranslationImpl.java similarity index 67% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DeptNameTranslationImpl.java index c391437..d91a271 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DeptNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.intc.common.translation.core.impl; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.service.DeptService; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.constant.TransConstant; +import com.intc.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 61% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DictTypeTranslationImpl.java index 859a93e..8a9540c 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.intc.common.translation.core.impl; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.constant.TransConstant; +import com.intc.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/NicknameTranslationImpl.java similarity index 67% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/NicknameTranslationImpl.java index b92c7f0..b40b87f 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/NicknameTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.intc.common.translation.core.impl; import lombok.AllArgsConstructor; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.service.UserService; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.constant.TransConstant; +import com.intc.common.translation.core.TranslationInterface; /** * 用户名称翻译实现 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/OssUrlTranslationImpl.java similarity index 66% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/OssUrlTranslationImpl.java index fc6f6df..6a15f1f 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/OssUrlTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.intc.common.translation.core.impl; -import org.dromara.common.core.service.OssService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.service.OssService; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.constant.TransConstant; +import com.intc.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/UserNameTranslationImpl.java similarity index 62% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/UserNameTranslationImpl.java index 96f1cd3..984a0b2 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/intc-common/intc-common-translation/src/main/java/com/intc/common/translation/core/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.intc.common.translation.core.impl; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.intc.common.core.service.UserService; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.constant.TransConstant; +import com.intc.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/intc-common/intc-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1de76f3 --- /dev/null +++ b/intc-common/intc-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.intc.common.translation.config.TranslationConfig +com.intc.common.translation.core.impl.DeptNameTranslationImpl +com.intc.common.translation.core.impl.DictTypeTranslationImpl +com.intc.common.translation.core.impl.OssUrlTranslationImpl +com.intc.common.translation.core.impl.UserNameTranslationImpl +com.intc.common.translation.core.impl.NicknameTranslationImpl diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/intc-common/intc-common-web/pom.xml similarity index 87% rename from ruoyi-common/ruoyi-common-web/pom.xml rename to intc-common/intc-common-web/pom.xml index c687ad5..2fa9cc1 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/intc-common/intc-common-web/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-web + intc-common-web ruoyi-common-web web服务 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/CaptchaConfig.java similarity index 94% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/CaptchaConfig.java index 650517e..71bb6ab 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/CaptchaConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.intc.common.web.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.LineCaptcha; import cn.hutool.captcha.ShearCaptcha; -import org.dromara.common.web.config.properties.CaptchaProperties; +import com.intc.common.web.config.properties.CaptchaProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/FilterConfig.java similarity index 84% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/FilterConfig.java index 155a8d0..fc15a6e 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/FilterConfig.java @@ -1,9 +1,9 @@ -package org.dromara.common.web.config; +package com.intc.common.web.config; import jakarta.servlet.DispatcherType; -import org.dromara.common.web.config.properties.XssProperties; -import org.dromara.common.web.filter.RepeatableFilter; -import org.dromara.common.web.filter.XssFilter; +import com.intc.common.web.config.properties.XssProperties; +import com.intc.common.web.filter.RepeatableFilter; +import com.intc.common.web.filter.XssFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/I18nConfig.java similarity index 84% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/I18nConfig.java index 4e212cb..3f14e54 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/I18nConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.config; +package com.intc.common.web.config; -import org.dromara.common.web.core.I18nLocaleResolver; +import com.intc.common.web.core.I18nLocaleResolver; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/ResourcesConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/ResourcesConfig.java index 81ec905..0221bff 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/ResourcesConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.intc.common.web.config; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.web.handler.GlobalExceptionHandler; -import org.dromara.common.web.interceptor.PlusWebInvokeTimeInterceptor; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.web.handler.GlobalExceptionHandler; +import com.intc.common.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.format.FormatterRegistry; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/UndertowConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/UndertowConfig.java index 84f88ff..9769920 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/UndertowConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.intc.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.server.handlers.DisallowedMethodsHandler; import io.undertow.util.HttpString; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; -import org.dromara.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/CaptchaProperties.java similarity index 79% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/CaptchaProperties.java index bfc52f4..3a8c299 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.config.properties; +package com.intc.common.web.config.properties; -import org.dromara.common.web.enums.CaptchaCategory; -import org.dromara.common.web.enums.CaptchaType; +import com.intc.common.web.enums.CaptchaCategory; +import com.intc.common.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/XssProperties.java similarity index 89% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/XssProperties.java index bd3e59b..11a8905 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.config.properties; +package com.intc.common.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/core/BaseController.java similarity index 83% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/core/BaseController.java index fd01dda..97c9d0d 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/core/BaseController.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.core; +package com.intc.common.web.core; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; /** * web层通用数据处理 diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/core/I18nLocaleResolver.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/core/I18nLocaleResolver.java index 98ddd06..f1778cb 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/core/I18nLocaleResolver.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.core; +package com.intc.common.web.core; import org.springframework.web.servlet.LocaleResolver; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaCategory.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaCategory.java index ecf2658..256b50d 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.enums; +package com.intc.common.web.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaType.java similarity index 92% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaType.java index d0b6ca3..6145d10 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/enums/CaptchaType.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.enums; +package com.intc.common.web.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.MathGenerator; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatableFilter.java similarity index 92% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatableFilter.java index e0a3bf2..8e3d3f4 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package com.intc.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.http.MediaType; import jakarta.servlet.*; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatedlyRequestWrapper.java index 8933225..ba0f8ee 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.filter; +package com.intc.common.web.filter; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.constant.Constants; +import com.intc.common.core.constant.Constants; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssFilter.java similarity index 89% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssFilter.java index 95bcdd9..1c507cf 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssFilter.java @@ -1,8 +1,8 @@ -package org.dromara.common.web.filter; +package com.intc.common.web.filter; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.web.config.properties.XssProperties; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.web.config.properties.XssProperties; import org.springframework.http.HttpMethod; import jakarta.servlet.*; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssHttpServletRequestWrapper.java similarity index 97% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssHttpServletRequestWrapper.java index 914e549..565fc56 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.filter; +package com.intc.common.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; @@ -9,7 +9,7 @@ import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/handler/GlobalExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/handler/GlobalExceptionHandler.java index 28aacbc..81e92ac 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.handler; +package com.intc.common.web.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; @@ -8,12 +8,12 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.SseException; -import org.dromara.common.core.exception.base.BaseException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.domain.R; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.exception.SseException; +import com.intc.common.core.exception.base.BaseException; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.json.utils.JsonUtils; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/intc-common/intc-common-web/src/main/java/com/intc/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java rename to intc-common/intc-common-web/src/main/java/com/intc/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index f256015..ee47bb1 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/intc-common/intc-common-web/src/main/java/com/intc/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.interceptor; +package com.intc.common.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; @@ -7,9 +7,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.web.filter.RepeatedlyRequestWrapper; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.web.filter.RepeatedlyRequestWrapper; import org.springframework.http.MediaType; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/intc-common/intc-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3163c8e --- /dev/null +++ b/intc-common/intc-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.intc.common.web.config.CaptchaConfig +com.intc.common.web.config.FilterConfig +com.intc.common.web.config.I18nConfig +com.intc.common.web.config.ResourcesConfig +com.intc.common.web.config.UndertowConfig diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/intc-common/intc-common-websocket/pom.xml similarity index 66% rename from ruoyi-common/ruoyi-common-websocket/pom.xml rename to intc-common/intc-common-websocket/pom.xml index 0587cd7..d521318 100644 --- a/ruoyi-common/ruoyi-common-websocket/pom.xml +++ b/intc-common/intc-common-websocket/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-common + com.intc + intc-common ${revision} 4.0.0 - ruoyi-common-websocket + intc-common-websocket ruoyi-common-websocket 模块 @@ -17,20 +17,20 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-redis + com.intc + intc-common-redis - org.dromara - ruoyi-common-satoken + com.intc + intc-common-satoken - org.dromara - ruoyi-common-json + com.intc + intc-common-json org.springframework.boot diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/WebSocketConfig.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/WebSocketConfig.java index ef5cfc9..c8eaa27 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/WebSocketConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.websocket.config; +package com.intc.common.websocket.config; import cn.hutool.core.util.StrUtil; -import org.dromara.common.websocket.config.properties.WebSocketProperties; -import org.dromara.common.websocket.handler.PlusWebSocketHandler; -import org.dromara.common.websocket.interceptor.PlusWebSocketInterceptor; -import org.dromara.common.websocket.listener.WebSocketTopicListener; +import com.intc.common.websocket.config.properties.WebSocketProperties; +import com.intc.common.websocket.handler.PlusWebSocketHandler; +import com.intc.common.websocket.interceptor.PlusWebSocketInterceptor; +import com.intc.common.websocket.listener.WebSocketTopicListener; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/properties/WebSocketProperties.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/properties/WebSocketProperties.java index d629fe5..5d39e40 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/config/properties/WebSocketProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.config.properties; +package com.intc.common.websocket.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/constant/WebSocketConstants.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/constant/WebSocketConstants.java index e243279..9ed6f36 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/constant/WebSocketConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.constant; +package com.intc.common.websocket.constant; /** * websocket的常量配置 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/dto/WebSocketMessageDto.java similarity index 91% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/dto/WebSocketMessageDto.java index e2d4456..71a35e8 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/dto/WebSocketMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.dto; +package com.intc.common.websocket.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/handler/PlusWebSocketHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/handler/PlusWebSocketHandler.java index 8b1cc5d..c89ebf6 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/handler/PlusWebSocketHandler.java @@ -1,18 +1,18 @@ -package org.dromara.common.websocket.handler; +package com.intc.common.websocket.handler; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.websocket.dto.WebSocketMessageDto; +import com.intc.common.websocket.holder.WebSocketSessionHolder; +import com.intc.common.websocket.utils.WebSocketUtils; import org.springframework.web.socket.*; import org.springframework.web.socket.handler.AbstractWebSocketHandler; import java.io.IOException; import java.util.List; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static com.intc.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocketHandler 实现类 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/holder/WebSocketSessionHolder.java similarity index 98% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/holder/WebSocketSessionHolder.java index 9c2372b..4b99e00 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/holder/WebSocketSessionHolder.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.holder; +package com.intc.common.websocket.holder; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 88% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/interceptor/PlusWebSocketInterceptor.java index c70e377..70295fa 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/interceptor/PlusWebSocketInterceptor.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.interceptor; +package com.intc.common.websocket.interceptor; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.satoken.utils.LoginHelper; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketHandler; @@ -14,7 +14,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.Map; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static com.intc.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocket握手请求的拦截器 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/listener/WebSocketTopicListener.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/listener/WebSocketTopicListener.java index 0ad39af..4dd3906 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/listener/WebSocketTopicListener.java @@ -1,9 +1,9 @@ -package org.dromara.common.websocket.listener; +package com.intc.common.websocket.listener; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.intc.common.websocket.holder.WebSocketSessionHolder; +import com.intc.common.websocket.utils.WebSocketUtils; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.Ordered; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/utils/WebSocketUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/utils/WebSocketUtils.java index 8c4170a..00fe2f2 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/intc-common/intc-common-websocket/src/main/java/com/intc/common/websocket/utils/WebSocketUtils.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.utils; +package com.intc.common.websocket.utils; import cn.hutool.core.collection.CollUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.common.websocket.dto.WebSocketMessageDto; +import com.intc.common.websocket.holder.WebSocketSessionHolder; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; +import static com.intc.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; /** * 工具类 diff --git a/intc-common/intc-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fa45cb8 --- /dev/null +++ b/intc-common/intc-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.websocket.config.WebSocketConfig diff --git a/intc-common/pom.xml b/intc-common/pom.xml new file mode 100644 index 0000000..d34ccac --- /dev/null +++ b/intc-common/pom.xml @@ -0,0 +1,46 @@ + + + + intc-vue-plus + com.intc + ${revision} + + 4.0.0 + + + intc-common-bom + intc-common-social + intc-common-core + intc-common-doc + intc-common-excel + intc-common-idempotent + intc-common-job + intc-common-log + intc-common-mail + intc-common-mybatis + intc-common-oss + intc-common-ratelimiter + intc-common-redis + intc-common-satoken + intc-common-security + intc-common-sms + intc-common-web + intc-common-translation + intc-common-sensitive + intc-common-json + intc-common-encrypt + intc-common-tenant + intc-common-websocket + intc-common-sse + + + intc-common + pom + + + common 通用模块 + + + diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/intc-extend/intc-monitor-admin/Dockerfile similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to intc-extend/intc-monitor-admin/Dockerfile diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/intc-extend/intc-monitor-admin/pom.xml similarity index 94% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to intc-extend/intc-monitor-admin/pom.xml index 538ffbd..edf93c4 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/intc-extend/intc-monitor-admin/pom.xml @@ -3,13 +3,13 @@ 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"> - ruoyi-extend - org.dromara + intc-extend + com.intc ${revision} 4.0.0 jar - ruoyi-monitor-admin + intc-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/MonitorAdminApplication.java similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java rename to intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/MonitorAdminApplication.java index a733561..81286c9 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java +++ b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/MonitorAdminApplication.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin; +package com.intc.monitor.admin; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/config/SecurityConfig.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java rename to intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/config/SecurityConfig.java index 41372f2..5a7e0a8 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java +++ b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.config; +package com.intc.monitor.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/notifier/CustomNotifier.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java rename to intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/notifier/CustomNotifier.java index 838eefc..ff48950 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java +++ b/intc-extend/intc-monitor-admin/src/main/java/com/intc/monitor/admin/notifier/CustomNotifier.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.notifier; +package com.intc.monitor.admin.notifier; import de.codecentric.boot.admin.server.domain.entities.Instance; import de.codecentric.boot.admin.server.domain.entities.InstanceRepository; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/intc-extend/intc-monitor-admin/src/main/resources/application.yml similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to intc-extend/intc-monitor-admin/src/main/resources/application.yml diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/intc-extend/intc-monitor-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to intc-extend/intc-monitor-admin/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/intc-extend/intc-monitor-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml rename to intc-extend/intc-monitor-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/intc-extend/intc-snailjob-server/Dockerfile similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/Dockerfile rename to intc-extend/intc-snailjob-server/Dockerfile diff --git a/ruoyi-extend/ruoyi-snailjob-server/pom.xml b/intc-extend/intc-snailjob-server/pom.xml similarity index 93% rename from ruoyi-extend/ruoyi-snailjob-server/pom.xml rename to intc-extend/intc-snailjob-server/pom.xml index 0b3afd3..8227418 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/pom.xml +++ b/intc-extend/intc-snailjob-server/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-extend + com.intc + intc-extend ${revision} 4.0.0 jar - ruoyi-snailjob-server + intc-snailjob-server diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java b/intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java rename to intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/common/register/ServerRegister.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java b/intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java rename to intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java b/intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java rename to intc-extend/intc-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/intc-extend/intc-snailjob-server/src/main/java/com/intc/snailjob/SnailJobServerApplication.java similarity index 93% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java rename to intc-extend/intc-snailjob-server/src/main/java/com/intc/snailjob/SnailJobServerApplication.java index dfab068..1b29e06 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java +++ b/intc-extend/intc-snailjob-server/src/main/java/com/intc/snailjob/SnailJobServerApplication.java @@ -1,4 +1,4 @@ -package org.dromara.snailjob; +package com.intc.snailjob; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/intc-extend/intc-snailjob-server/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml rename to intc-extend/intc-snailjob-server/src/main/resources/application-dev.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/intc-extend/intc-snailjob-server/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml rename to intc-extend/intc-snailjob-server/src/main/resources/application-prod.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/intc-extend/intc-snailjob-server/src/main/resources/application.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml rename to intc-extend/intc-snailjob-server/src/main/resources/application.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt b/intc-extend/intc-snailjob-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt rename to intc-extend/intc-snailjob-server/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/intc-extend/intc-snailjob-server/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml rename to intc-extend/intc-snailjob-server/src/main/resources/logback-plus.xml diff --git a/ruoyi-extend/pom.xml b/intc-extend/pom.xml similarity index 66% rename from ruoyi-extend/pom.xml rename to intc-extend/pom.xml index d7280ce..691e274 100644 --- a/ruoyi-extend/pom.xml +++ b/intc-extend/pom.xml @@ -3,17 +3,17 @@ 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"> - ruoyi-vue-plus - org.dromara + intc-vue-plus + com.intc ${revision} 4.0.0 - ruoyi-extend + intc-extend pom - ruoyi-monitor-admin - ruoyi-snailjob-server + intc-monitor-admin + intc-snailjob-server diff --git a/intc-modules/intc-demo/pom.xml b/intc-modules/intc-demo/pom.xml new file mode 100644 index 0000000..094f562 --- /dev/null +++ b/intc-modules/intc-demo/pom.xml @@ -0,0 +1,108 @@ + + + + com.intc + intc-modules + ${revision} + + 4.0.0 + + intc-demo + + + demo模块 + + + + + + + com.intc + intc-common-core + + + + com.intc + intc-common-doc + + + + com.intc + intc-common-sms + + + + com.intc + intc-common-mail + + + + com.intc + intc-common-redis + + + + com.intc + intc-common-idempotent + + + + com.intc + intc-common-mybatis + + + + com.intc + intc-common-log + + + + com.intc + intc-common-excel + + + + com.intc + intc-common-security + + + + com.intc + intc-common-web + + + + com.intc + intc-common-ratelimiter + + + + com.intc + intc-common-translation + + + + com.intc + intc-common-sensitive + + + + com.intc + intc-common-encrypt + + + + com.intc + intc-common-tenant + + + + com.intc + intc-common-websocket + + + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/MailSendController.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/MailSendController.java index 48365a3..8f9bc63 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/MailSendController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.mail.utils.MailUtils; +import com.intc.common.core.domain.R; +import com.intc.common.mail.utils.MailUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisCacheController.java similarity index 94% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisCacheController.java index 2335da4..23fd084 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisCacheController.java @@ -1,9 +1,9 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import cn.hutool.core.thread.ThreadUtil; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.domain.R; +import com.intc.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisLockController.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisLockController.java index 237b6ee..44683ad 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisLockController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisPubSubController.java similarity index 89% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisPubSubController.java index bdbf033..3d01962 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.intc.common.core.domain.R; +import com.intc.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisRateLimiterController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisRateLimiterController.java index f8adf7d..0a6b3c2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.intc.common.core.domain.R; +import com.intc.common.ratelimiter.annotation.RateLimiter; +import com.intc.common.ratelimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/SmsController.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/SmsController.java index b993f60..294f3a2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/SmsController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/Swagger3DemoController.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/Swagger3DemoController.java index bb02f98..9fefb46 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; +import com.intc.common.core.domain.R; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestBatchController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestBatchController.java index af8c77b..06b6492 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.mapper.TestDemoMapper; +import com.intc.common.core.domain.R; +import com.intc.common.web.core.BaseController; +import com.intc.demo.domain.TestDemo; +import com.intc.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestDemoController.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestDemoController.java index f31c540..430c458 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestDemoController.java @@ -1,25 +1,25 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.bo.TestDemoImportVo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.service.ITestDemoService; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.ValidatorUtils; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.core.validate.QueryGroup; +import com.intc.common.web.core.BaseController; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.excel.core.ExcelResult; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.demo.domain.TestDemo; +import com.intc.demo.domain.bo.TestDemoBo; +import com.intc.demo.domain.bo.TestDemoImportVo; +import com.intc.demo.domain.vo.TestDemoVo; +import com.intc.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestEncryptController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestEncryptController.java index 2b6886d..87f1666 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestEncryptController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.demo.domain.TestDemoEncrypt; -import org.dromara.demo.mapper.TestDemoEncryptMapper; +import com.intc.common.core.domain.R; +import com.intc.demo.domain.TestDemoEncrypt; +import com.intc.demo.mapper.TestDemoEncryptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestExcelController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestExcelController.java index 64243b7..cffbb0f 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestExcelController.java @@ -1,16 +1,15 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.collection.CollUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.listener.ExportDemoListener; -import org.dromara.demo.service.IExportExcelService; +import com.intc.common.excel.core.ExcelResult; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.demo.domain.vo.ExportDemoVo; +import com.intc.demo.listener.ExportDemoListener; +import com.intc.demo.service.IExportExcelService; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestI18nController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestI18nController.java index 40393c5..2d0fb87 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MessageUtils; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestSensitiveController.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestSensitiveController.java index eba0552..2719d74 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestSensitiveController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.intc.common.core.domain.R; +import com.intc.common.web.core.BaseController; +import com.intc.common.sensitive.annotation.Sensitive; +import com.intc.common.sensitive.core.SensitiveStrategy; import lombok.Data; -import org.dromara.common.sensitive.core.SensitiveService; +import com.intc.common.sensitive.core.SensitiveService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestTreeController.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestTreeController.java index 5c55205..8f9ac51 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/TestTreeController.java @@ -1,18 +1,18 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.service.ITestTreeService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.core.validate.QueryGroup; +import com.intc.common.web.core.BaseController; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.demo.domain.bo.TestTreeBo; +import com.intc.demo.domain.vo.TestTreeVo; +import com.intc.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/WebSocketController.java similarity index 78% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/WebSocketController.java index 65bf68e..7d63429 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/WebSocketController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.intc.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.intc.common.core.domain.R; +import com.intc.common.websocket.dto.WebSocketMessageDto; +import com.intc.common.websocket.utils.WebSocketUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/package-info.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/package-info.java new file mode 100644 index 0000000..4e3fd8c --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.intc.demo.controller; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/BoundedQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/BoundedQueueController.java index a3051b2..0714b19 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/BoundedQueueController.java @@ -1,9 +1,9 @@ -package org.dromara.demo.controller.queue; +package com.intc.demo.controller.queue; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.intc.common.core.domain.R; +import com.intc.common.redis.utils.QueueUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/DelayedQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/DelayedQueueController.java index 7c494e2..aa0219f 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/DelayedQueueController.java @@ -1,9 +1,9 @@ -package org.dromara.demo.controller.queue; +package com.intc.demo.controller.queue; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.intc.common.core.domain.R; +import com.intc.common.redis.utils.QueueUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityDemo.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityDemo.java index 43862a6..c12cc76 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityDemo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.controller.queue; +package com.intc.demo.controller.queue; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityQueueController.java index 2f2b737..2e2d47a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/controller/queue/PriorityQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package com.intc.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.intc.common.core.domain.R; +import com.intc.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemo.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemo.java index d3af0c9..5335e78 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ -package org.dromara.demo.domain; +package com.intc.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemoEncrypt.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemoEncrypt.java index bdcd596..bae520c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestDemoEncrypt.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain; +package com.intc.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enumd.AlgorithmType; +import com.intc.common.encrypt.annotation.EncryptField; +import com.intc.common.encrypt.enumd.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestTree.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestTree.java index fd68253..b872af3 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/TestTree.java @@ -1,10 +1,10 @@ -package org.dromara.demo.domain; +package com.intc.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoBo.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoBo.java index ef21980..a969b92 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.intc.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestDemo; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoImportVo.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoImportVo.java index dc8b35f..91b5f00 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.bo; +package com.intc.demo.domain.bo; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestTreeBo.java similarity index 82% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestTreeBo.java index 1bbac0e..9d91392 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/bo/TestTreeBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.intc.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestTree; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/package-info.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/package-info.java new file mode 100644 index 0000000..40e6988 --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.intc.demo.domain; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/ExportDemoVo.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/ExportDemoVo.java index b42ce76..9e51500 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/ExportDemoVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.vo; +package com.intc.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -7,13 +7,13 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.excel.convert.ExcelEnumConvert; +import com.intc.common.core.enums.UserStatus; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.annotation.ExcelEnumFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.common.excel.convert.ExcelEnumConvert; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestDemoVo.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestDemoVo.java index 642e0f7..7f59cca 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestDemoVo.java @@ -1,13 +1,13 @@ -package org.dromara.demo.domain.vo; +package com.intc.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.format.DateTimeFormat; -import org.dromara.common.excel.annotation.ExcelNotation; -import org.dromara.common.excel.annotation.ExcelRequired; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.demo.domain.TestDemo; +import com.intc.common.excel.annotation.ExcelNotation; +import com.intc.common.excel.annotation.ExcelRequired; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestTreeVo.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestTreeVo.java index ee2336a..87cab5b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/domain/vo/TestTreeVo.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain.vo; +package com.intc.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.demo.domain.TestTree; +import com.intc.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/listener/ExportDemoListener.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/listener/ExportDemoListener.java index de92760..db3ce9d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/listener/ExportDemoListener.java @@ -1,13 +1,13 @@ -package org.dromara.demo.listener; +package com.intc.demo.listener; import cn.hutool.core.util.NumberUtil; import cn.idev.excel.context.AnalysisContext; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.demo.domain.vo.ExportDemoVo; +import com.intc.common.core.utils.ValidatorUtils; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.excel.core.DefaultExcelListener; +import com.intc.common.excel.core.DropDownOptions; +import com.intc.demo.domain.vo.ExportDemoVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoEncryptMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoEncryptMapper.java index 601f97a..db4fd21 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoEncryptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.demo.mapper; +package com.intc.demo.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemoEncrypt; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.demo.domain.TestDemoEncrypt; /** * 测试加密功能 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoMapper.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoMapper.java index 2b82b9b..3e5d84b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestDemoMapper.java @@ -1,15 +1,15 @@ -package org.dromara.demo.mapper; +package com.intc.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.demo.domain.TestDemo; +import com.intc.demo.domain.vo.TestDemoVo; import java.io.Serializable; import java.util.Collection; diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestTreeMapper.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestTreeMapper.java new file mode 100644 index 0000000..9923e31 --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/TestTreeMapper.java @@ -0,0 +1,21 @@ +package com.intc.demo.mapper; + +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.demo.domain.TestTree; +import com.intc.demo.domain.vo.TestTreeVo; + +/** + * 测试树表Mapper接口 + * + * @author Lion Li + * @date 2021-07-26 + */ +@DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") +}) +public interface TestTreeMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/package-info.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/package-info.java new file mode 100644 index 0000000..2f8cae6 --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.intc.demo.mapper; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/IExportExcelService.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/IExportExcelService.java index ad2392b..0826994 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/IExportExcelService.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service; +package com.intc.demo.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestDemoService.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestDemoService.java index bca4192..e4ba4e8 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package org.dromara.demo.service; +package com.intc.demo.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.demo.domain.TestDemo; +import com.intc.demo.domain.bo.TestDemoBo; +import com.intc.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestTreeService.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestTreeService.java index 9155201..97e073b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/ITestTreeService.java @@ -1,7 +1,7 @@ -package org.dromara.demo.service; +package com.intc.demo.service; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; +import com.intc.demo.domain.bo.TestTreeBo; +import com.intc.demo.domain.vo.TestTreeVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/ExportExcelServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/ExportExcelServiceImpl.java index 2813cc2..2671431 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/ExportExcelServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service.impl; +package com.intc.demo.service.impl; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; @@ -6,14 +6,14 @@ import cn.idev.excel.write.metadata.WriteSheet; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.excel.utils.ExcelWriterWrapper; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.service.IExportExcelService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.common.excel.core.DropDownOptions; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.excel.utils.ExcelWriterWrapper; +import com.intc.demo.domain.vo.ExportDemoVo; +import com.intc.demo.service.IExportExcelService; import org.springframework.stereotype.Service; import java.io.IOException; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestDemoServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestDemoServiceImpl.java index 3cfde3a..c8205d8 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestDemoServiceImpl.java @@ -1,19 +1,19 @@ -package org.dromara.demo.service.impl; +package com.intc.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.mapper.TestDemoMapper; -import org.dromara.demo.service.ITestDemoService; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.demo.domain.TestDemo; +import com.intc.demo.domain.bo.TestDemoBo; +import com.intc.demo.domain.vo.TestDemoVo; +import com.intc.demo.mapper.TestDemoMapper; +import com.intc.demo.service.ITestDemoService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestTreeServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestTreeServiceImpl.java index e4e548b..ccbab40 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/TestTreeServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.demo.service.impl; +package com.intc.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.mapper.TestTreeMapper; -import org.dromara.demo.service.ITestTreeService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.demo.domain.TestTree; +import com.intc.demo.domain.bo.TestTreeBo; +import com.intc.demo.domain.vo.TestTreeVo; +import com.intc.demo.mapper.TestTreeMapper; +import com.intc.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/package-info.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/package-info.java new file mode 100644 index 0000000..7f0f285 --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.intc.demo.service.impl; diff --git a/intc-modules/intc-demo/src/main/java/com/intc/demo/service/package-info.java b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/package-info.java new file mode 100644 index 0000000..298241c --- /dev/null +++ b/intc-modules/intc-demo/src/main/java/com/intc/demo/service/package-info.java @@ -0,0 +1 @@ +package com.intc.demo.service; diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/intc-modules/intc-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to intc-modules/intc-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/intc-modules/intc-demo/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx rename to intc-modules/intc-demo/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/intc-modules/intc-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to intc-modules/intc-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/intc-modules/intc-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 61% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to intc-modules/intc-demo/src/main/resources/mapper/demo/TestDemoMapper.xml index dbf89a3..4248276 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/intc-modules/intc-demo/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/intc-modules/intc-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to intc-modules/intc-demo/src/main/resources/mapper/demo/TestTreeMapper.xml index d7975ec..963bee0 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/intc-modules/intc-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/intc-modules/intc-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md rename to intc-modules/intc-demo/src/main/resources/mapper/package-info.md diff --git a/intc-modules/intc-fishery/pom.xml b/intc-modules/intc-fishery/pom.xml new file mode 100644 index 0000000..b21cde4 --- /dev/null +++ b/intc-modules/intc-fishery/pom.xml @@ -0,0 +1,108 @@ + + + + com.intc + intc-modules + ${revision} + + 4.0.0 + + intc-fishery + + + 鱼测云模块 + + + + + + + com.intc + intc-common-core + + + + com.intc + intc-common-doc + + + + com.intc + intc-common-sms + + + + com.intc + intc-common-mail + + + + com.intc + intc-common-redis + + + + com.intc + intc-common-idempotent + + + + com.intc + intc-common-mybatis + + + + com.intc + intc-common-log + + + + com.intc + intc-common-excel + + + + com.intc + intc-common-security + + + + com.intc + intc-common-web + + + + com.intc + intc-common-ratelimiter + + + + com.intc + intc-common-translation + + + + com.intc + intc-common-sensitive + + + + com.intc + intc-common-encrypt + + + + com.intc + intc-common-tenant + + + + com.intc + intc-common-websocket + + + + + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/AquUserController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/AquUserController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java index 3d46479..8bf4cc0 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/AquUserController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/AquUserController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.AquUserVo; -import org.dromara.fishery.domain.bo.AquUserBo; -import org.dromara.fishery.service.IAquUserService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.AquUserVo; +import com.intc.fishery.domain.bo.AquUserBo; +import com.intc.fishery.service.IAquUserService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 养殖用户管理 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceBindRecordController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceBindRecordController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceBindRecordController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceBindRecordController.java index 6bf5b8b..14cf72e 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceBindRecordController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceBindRecordController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceBindRecordVo; -import org.dromara.fishery.domain.bo.DeviceBindRecordBo; -import org.dromara.fishery.service.IDeviceBindRecordService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceBindRecordVo; +import com.intc.fishery.domain.bo.DeviceBindRecordBo; +import com.intc.fishery.service.IDeviceBindRecordService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备绑定记录 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java index 1aa5370..94e6ff7 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceVo; -import org.dromara.fishery.domain.bo.DeviceBo; -import org.dromara.fishery.service.IDeviceService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceVo; +import com.intc.fishery.domain.bo.DeviceBo; +import com.intc.fishery.service.IDeviceService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备管理 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceCorrectRecordController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceCorrectRecordController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceCorrectRecordController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceCorrectRecordController.java index 8599b1c..6451867 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceCorrectRecordController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceCorrectRecordController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceCorrectRecordVo; -import org.dromara.fishery.domain.bo.DeviceCorrectRecordBo; -import org.dromara.fishery.service.IDeviceCorrectRecordService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceCorrectRecordVo; +import com.intc.fishery.domain.bo.DeviceCorrectRecordBo; +import com.intc.fishery.service.IDeviceCorrectRecordService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备校准记录 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceErrorCodeController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceErrorCodeController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceErrorCodeController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceErrorCodeController.java index 8a74d2b..2233389 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceErrorCodeController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceErrorCodeController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceErrorCodeVo; -import org.dromara.fishery.domain.bo.DeviceErrorCodeBo; -import org.dromara.fishery.service.IDeviceErrorCodeService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceErrorCodeVo; +import com.intc.fishery.domain.bo.DeviceErrorCodeBo; +import com.intc.fishery.service.IDeviceErrorCodeService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备故障码 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceSwitchController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceSwitchController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceSwitchController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceSwitchController.java index 3a2fdee..550ceec 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceSwitchController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceSwitchController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceSwitchVo; -import org.dromara.fishery.domain.bo.DeviceSwitchBo; -import org.dromara.fishery.service.IDeviceSwitchService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceSwitchVo; +import com.intc.fishery.domain.bo.DeviceSwitchBo; +import com.intc.fishery.service.IDeviceSwitchService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 测控一体机开关 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceThresholdController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceThresholdController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceThresholdController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceThresholdController.java index 55d7a76..6d6a278 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/DeviceThresholdController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceThresholdController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.DeviceThresholdVo; -import org.dromara.fishery.domain.bo.DeviceThresholdBo; -import org.dromara.fishery.service.IDeviceThresholdService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.DeviceThresholdVo; +import com.intc.fishery.domain.bo.DeviceThresholdBo; +import com.intc.fishery.service.IDeviceThresholdService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备阈值管理 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/FishController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/FishController.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/FishController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/FishController.java index 88ec94e..2158c34 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/FishController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/FishController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.FishVo; -import org.dromara.fishery.domain.bo.FishBo; -import org.dromara.fishery.service.IFishService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.FishVo; +import com.intc.fishery.domain.bo.FishBo; +import com.intc.fishery.service.IFishService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 鱼类管理 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayDeviceController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayDeviceController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayDeviceController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayDeviceController.java index 27df701..57f726c 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayDeviceController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayDeviceController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.PayDeviceVo; -import org.dromara.fishery.domain.bo.PayDeviceBo; -import org.dromara.fishery.service.IPayDeviceService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.PayDeviceVo; +import com.intc.fishery.domain.bo.PayDeviceBo; +import com.intc.fishery.service.IPayDeviceService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 设备充值记录 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayOrderController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayOrderController.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayOrderController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayOrderController.java index bfe6d03..12a2fb6 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PayOrderController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PayOrderController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.PayOrderVo; -import org.dromara.fishery.domain.bo.PayOrderBo; -import org.dromara.fishery.service.IPayOrderService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.PayOrderVo; +import com.intc.fishery.domain.bo.PayOrderBo; +import com.intc.fishery.service.IPayOrderService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 充值订单 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PondController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PondController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java index 61c424a..d0e2296 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/PondController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.PondVo; -import org.dromara.fishery.domain.bo.PondBo; -import org.dromara.fishery.service.IPondService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.PondVo; +import com.intc.fishery.domain.bo.PondBo; +import com.intc.fishery.service.IPondService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 塘口管理 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/UserRelationController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/UserRelationController.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/UserRelationController.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/UserRelationController.java index d9b55d0..3cff84d 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/controller/UserRelationController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/UserRelationController.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.controller; +package com.intc.fishery.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.fishery.domain.vo.UserRelationVo; -import org.dromara.fishery.domain.bo.UserRelationBo; -import org.dromara.fishery.service.IUserRelationService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.fishery.domain.vo.UserRelationVo; +import com.intc.fishery.domain.bo.UserRelationBo; +import com.intc.fishery.service.IUserRelationService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 养殖用户子账号 diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/AquUser.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/AquUser.java similarity index 94% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/AquUser.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/AquUser.java index 4208196..6db4164 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/AquUser.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/AquUser.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Device.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Device.java similarity index 96% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Device.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Device.java index 1b4e4ea..e12fc0b 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Device.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Device.java @@ -1,11 +1,10 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceBindRecord.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceBindRecord.java similarity index 90% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceBindRecord.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceBindRecord.java index c6f3f05..7943e9f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceBindRecord.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceBindRecord.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceCorrectRecord.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceCorrectRecord.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceCorrectRecord.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceCorrectRecord.java index 74ed9b4..df6b676 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceCorrectRecord.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceCorrectRecord.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceErrorCode.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceErrorCode.java similarity index 89% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceErrorCode.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceErrorCode.java index 94a5d28..77ff3a1 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceErrorCode.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceErrorCode.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceSwitch.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceSwitch.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceSwitch.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceSwitch.java index 1d264ec..0ad6602 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceSwitch.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceSwitch.java @@ -1,11 +1,10 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceThreshold.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceThreshold.java similarity index 90% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceThreshold.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceThreshold.java index 8c55a4e..dac4b8a 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/DeviceThreshold.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/DeviceThreshold.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Fish.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Fish.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Fish.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Fish.java index a6f9d1c..172c981 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Fish.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Fish.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayDevice.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayDevice.java similarity index 89% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayDevice.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayDevice.java index a2a426a..de6299a 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayDevice.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayDevice.java @@ -1,11 +1,10 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayOrder.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayOrder.java similarity index 93% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayOrder.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayOrder.java index 9d836d5..adeda4f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/PayOrder.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/PayOrder.java @@ -1,11 +1,10 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Pond.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Pond.java similarity index 87% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Pond.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Pond.java index 9f27e44..80cf41e 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/Pond.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Pond.java @@ -1,11 +1,10 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/UserRelation.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/UserRelation.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/UserRelation.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/UserRelation.java index bd47c3c..0dcb875 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/UserRelation.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/UserRelation.java @@ -1,6 +1,6 @@ -package org.dromara.fishery.domain; +package com.intc.fishery.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/AquUserBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/AquUserBo.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/AquUserBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/AquUserBo.java index aadfd37..aec1486 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/AquUserBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/AquUserBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.AquUser; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.AquUser; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBindRecordBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBindRecordBo.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBindRecordBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBindRecordBo.java index 1abc4cc..825a865 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBindRecordBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBindRecordBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.DeviceBindRecord; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.DeviceBindRecord; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBo.java similarity index 96% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBo.java index d82f851..af177aa 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceBo.java @@ -1,15 +1,14 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.Device; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.Device; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备管理业务对象 aqu_device diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceCorrectRecordBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceCorrectRecordBo.java similarity index 86% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceCorrectRecordBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceCorrectRecordBo.java index 2cd9147..76b0308 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceCorrectRecordBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceCorrectRecordBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.DeviceCorrectRecord; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.DeviceCorrectRecord; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceErrorCodeBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceErrorCodeBo.java similarity index 81% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceErrorCodeBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceErrorCodeBo.java index 9e83811..7e39e2f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceErrorCodeBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceErrorCodeBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.DeviceErrorCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.DeviceErrorCode; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceSwitchBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceSwitchBo.java similarity index 89% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceSwitchBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceSwitchBo.java index d978d35..b94e581 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceSwitchBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceSwitchBo.java @@ -1,15 +1,14 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.DeviceSwitch; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.DeviceSwitch; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 测控一体机开关业务对象 aqu_device_switch diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceThresholdBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceThresholdBo.java similarity index 83% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceThresholdBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceThresholdBo.java index f04c1ee..99d9afe 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/DeviceThresholdBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/DeviceThresholdBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.DeviceThreshold; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.DeviceThreshold; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/FishBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/FishBo.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/FishBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/FishBo.java index 4aa209a..817ad09 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/FishBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/FishBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.Fish; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.Fish; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayDeviceBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayDeviceBo.java similarity index 86% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayDeviceBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayDeviceBo.java index c94c317..ca16255 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayDeviceBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayDeviceBo.java @@ -1,15 +1,14 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.PayDevice; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.PayDevice; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备充值记录业务对象 aqu_pay_device diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayOrderBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayOrderBo.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayOrderBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayOrderBo.java index 79b9e18..dac7587 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PayOrderBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PayOrderBo.java @@ -1,15 +1,14 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.PayOrder; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.PayOrder; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 充值订单业务对象 aqu_pay_order diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PondBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PondBo.java similarity index 85% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PondBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PondBo.java index be8fc90..f745813 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/PondBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PondBo.java @@ -1,15 +1,14 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.Pond; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.Pond; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 塘口管理业务对象 aqu_pond diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/UserRelationBo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/UserRelationBo.java similarity index 79% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/UserRelationBo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/UserRelationBo.java index 730199e..fe771d0 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/bo/UserRelationBo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/UserRelationBo.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.domain.bo; +package com.intc.fishery.domain.bo; -import org.dromara.fishery.domain.UserRelation; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.fishery.domain.UserRelation; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/AquUserVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/AquUserVo.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/AquUserVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/AquUserVo.java index 37c7332..8033bd6 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/AquUserVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/AquUserVo.java @@ -1,10 +1,8 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; -import org.dromara.fishery.domain.AquUser; +import com.intc.fishery.domain.AquUser; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceBindRecordVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceBindRecordVo.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceBindRecordVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceBindRecordVo.java index 95347b8..b329f9c 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceBindRecordVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceBindRecordVo.java @@ -1,12 +1,12 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.fishery.domain.DeviceBindRecord; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.fishery.domain.DeviceBindRecord; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceCorrectRecordVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceCorrectRecordVo.java similarity index 89% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceCorrectRecordVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceCorrectRecordVo.java index 09ff73b..1ea9188 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceCorrectRecordVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceCorrectRecordVo.java @@ -1,13 +1,13 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.json.handler.DoubleSerializer; -import org.dromara.fishery.domain.DeviceCorrectRecord; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.common.json.handler.DoubleSerializer; +import com.intc.fishery.domain.DeviceCorrectRecord; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceErrorCodeVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceErrorCodeVo.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceErrorCodeVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceErrorCodeVo.java index 19b1a93..e6f9d8d 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceErrorCodeVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceErrorCodeVo.java @@ -1,10 +1,8 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; -import org.dromara.fishery.domain.DeviceErrorCode; +import com.intc.fishery.domain.DeviceErrorCode; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceSwitchVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceSwitchVo.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceSwitchVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceSwitchVo.java index dfc55f0..ac406ac 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceSwitchVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceSwitchVo.java @@ -1,21 +1,17 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; + import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.json.handler.DoubleSerializer; -import org.dromara.fishery.domain.DeviceSwitch; +import com.intc.common.json.handler.DoubleSerializer; +import com.intc.fishery.domain.DeviceSwitch; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - /** diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceThresholdVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceThresholdVo.java similarity index 85% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceThresholdVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceThresholdVo.java index a01dbdd..a0cc88d 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceThresholdVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceThresholdVo.java @@ -1,10 +1,8 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; -import org.dromara.fishery.domain.DeviceThreshold; +import com.intc.fishery.domain.DeviceThreshold; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java similarity index 96% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java index 54b4dfb..c3ec7c0 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/DeviceVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java @@ -1,13 +1,13 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.json.handler.DoubleSerializer; -import org.dromara.fishery.domain.Device; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.common.json.handler.DoubleSerializer; +import com.intc.fishery.domain.Device; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -336,7 +336,7 @@ public class DeviceVo implements Serializable { @ExcelProperty(value = "过期天数") private Long expiredDays; - + private Date createTime; private Date updateTime; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/FishVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/FishVo.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/FishVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/FishVo.java index 2c5c222..e556b4a 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/FishVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/FishVo.java @@ -1,10 +1,10 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; -import org.dromara.fishery.domain.Fish; +import com.intc.fishery.domain.Fish; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayDeviceVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayDeviceVo.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayDeviceVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayDeviceVo.java index 1418216..e5336c0 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayDeviceVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayDeviceVo.java @@ -1,12 +1,12 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.fishery.domain.PayDevice; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.fishery.domain.PayDevice; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayOrderVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayOrderVo.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayOrderVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayOrderVo.java index 5adcb43..04a26a7 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PayOrderVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PayOrderVo.java @@ -1,12 +1,12 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.fishery.domain.PayOrder; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.fishery.domain.PayOrder; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PondVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondVo.java similarity index 95% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PondVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondVo.java index f200406..457864f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/PondVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondVo.java @@ -1,10 +1,10 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; import java.io.Serial; import java.io.Serializable; import java.util.Date; -import org.dromara.fishery.domain.Pond; +import com.intc.fishery.domain.Pond; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/UserRelationVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/UserRelationVo.java similarity index 80% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/UserRelationVo.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/UserRelationVo.java index 38c8d46..6075c76 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/domain/vo/UserRelationVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/UserRelationVo.java @@ -1,17 +1,13 @@ -package org.dromara.fishery.domain.vo; +package com.intc.fishery.domain.vo; -import org.dromara.fishery.domain.UserRelation; +import com.intc.fishery.domain.UserRelation; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - /** diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/AquUserMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/AquUserMapper.java new file mode 100644 index 0000000..03c5032 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/AquUserMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.vo.AquUserVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 养殖用户管理Mapper接口 + * + * @author intc + * @date 2025-10-11 + */ +public interface AquUserMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceBindRecordMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceBindRecordMapper.java new file mode 100644 index 0000000..0c60bca --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceBindRecordMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; +import com.intc.fishery.domain.DeviceBindRecord; +import com.intc.fishery.domain.vo.DeviceBindRecordVo; + +/** + * 设备绑定记录Mapper接口 + * + * @author intc + * @date 2025-10-14 + */ +public interface DeviceBindRecordMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceCorrectRecordMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceCorrectRecordMapper.java new file mode 100644 index 0000000..e3657d6 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceCorrectRecordMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.DeviceCorrectRecord; +import com.intc.fishery.domain.vo.DeviceCorrectRecordVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; + +/** + * 设备校准记录Mapper接口 + * + * @author intc + * @date 2025-10-17 + */ +public interface DeviceCorrectRecordMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceErrorCodeMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceErrorCodeMapper.java new file mode 100644 index 0000000..3f06ae0 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceErrorCodeMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.DeviceErrorCode; +import com.intc.fishery.domain.vo.DeviceErrorCodeVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; + +/** + * 设备故障码Mapper接口 + * + * @author intc + * @date 2025-10-17 + */ +public interface DeviceErrorCodeMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceMapper.java new file mode 100644 index 0000000..e4e3c8d --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; +import com.intc.fishery.domain.Device; +import com.intc.fishery.domain.vo.DeviceVo; + +/** + * 设备管理Mapper接口 + * + * @author intc + * @date 2025-10-14 + */ +public interface DeviceMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceSwitchMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceSwitchMapper.java new file mode 100644 index 0000000..e5688bb --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceSwitchMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.DeviceSwitch; +import com.intc.fishery.domain.vo.DeviceSwitchVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; + +/** + * 测控一体机开关Mapper接口 + * + * @author intc + * @date 2025-10-17 + */ +public interface DeviceSwitchMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceThresholdMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceThresholdMapper.java new file mode 100644 index 0000000..7c691f3 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/DeviceThresholdMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.DeviceThreshold; +import com.intc.fishery.domain.vo.DeviceThresholdVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备阈值管理Mapper接口 + * + * @author intc + * @date 2025-10-11 + */ +public interface DeviceThresholdMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/FishMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/FishMapper.java new file mode 100644 index 0000000..9e63257 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/FishMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.Fish; +import com.intc.fishery.domain.vo.FishVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 鱼类管理Mapper接口 + * + * @author intc + * @date 2025-10-11 + */ +public interface FishMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayDeviceMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayDeviceMapper.java new file mode 100644 index 0000000..079d88d --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayDeviceMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; +import com.intc.fishery.domain.PayDevice; +import com.intc.fishery.domain.vo.PayDeviceVo; + +/** + * 设备充值记录Mapper接口 + * + * @author intc + * @date 2025-10-16 + */ +public interface PayDeviceMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayOrderMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayOrderMapper.java new file mode 100644 index 0000000..c55d8b5 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PayOrderMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; +import com.intc.fishery.domain.PayOrder; +import com.intc.fishery.domain.vo.PayOrderVo; + +/** + * 充值订单Mapper接口 + * + * @author intc + * @date 2025-10-17 + */ +public interface PayOrderMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PondMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PondMapper.java new file mode 100644 index 0000000..c3c7e13 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/PondMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlusJoin; +import com.intc.fishery.domain.Pond; +import com.intc.fishery.domain.vo.PondVo; + +/** + * 塘口管理Mapper接口 + * + * @author intc + * @date 2025-10-11 + */ +public interface PondMapper extends BaseMapperPlusJoin { + +} diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/UserRelationMapper.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/UserRelationMapper.java new file mode 100644 index 0000000..6f6387f --- /dev/null +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/mapper/UserRelationMapper.java @@ -0,0 +1,15 @@ +package com.intc.fishery.mapper; + +import com.intc.fishery.domain.UserRelation; +import com.intc.fishery.domain.vo.UserRelationVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 养殖用户子账号Mapper接口 + * + * @author intc + * @date 2025-10-17 + */ +public interface UserRelationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IAquUserService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IAquUserService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IAquUserService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IAquUserService.java index ccac27e..460dd07 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IAquUserService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IAquUserService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.AquUserVo; -import org.dromara.fishery.domain.bo.AquUserBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.AquUserVo; +import com.intc.fishery.domain.bo.AquUserBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceBindRecordService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceBindRecordService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceBindRecordService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceBindRecordService.java index 210d562..1a0bc07 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceBindRecordService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceBindRecordService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceBindRecordVo; -import org.dromara.fishery.domain.bo.DeviceBindRecordBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceBindRecordVo; +import com.intc.fishery.domain.bo.DeviceBindRecordBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceCorrectRecordService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceCorrectRecordService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceCorrectRecordService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceCorrectRecordService.java index 3fc34eb..6769ab8 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceCorrectRecordService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceCorrectRecordService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceCorrectRecordVo; -import org.dromara.fishery.domain.bo.DeviceCorrectRecordBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceCorrectRecordVo; +import com.intc.fishery.domain.bo.DeviceCorrectRecordBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceErrorCodeService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceErrorCodeService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceErrorCodeService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceErrorCodeService.java index e7d02ce..ef5ebda 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceErrorCodeService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceErrorCodeService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceErrorCodeVo; -import org.dromara.fishery.domain.bo.DeviceErrorCodeBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceErrorCodeVo; +import com.intc.fishery.domain.bo.DeviceErrorCodeBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceService.java index 6436ddf..d0c9aab 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceVo; -import org.dromara.fishery.domain.bo.DeviceBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceVo; +import com.intc.fishery.domain.bo.DeviceBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceSwitchService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceSwitchService.java similarity index 85% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceSwitchService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceSwitchService.java index 1767e8f..c0f0267 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceSwitchService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceSwitchService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceSwitchVo; -import org.dromara.fishery.domain.bo.DeviceSwitchBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceSwitchVo; +import com.intc.fishery.domain.bo.DeviceSwitchBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceThresholdService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceThresholdService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceThresholdService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceThresholdService.java index 63e40a3..d204539 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IDeviceThresholdService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IDeviceThresholdService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.DeviceThresholdVo; -import org.dromara.fishery.domain.bo.DeviceThresholdBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.DeviceThresholdVo; +import com.intc.fishery.domain.bo.DeviceThresholdBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IFishService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IFishService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IFishService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IFishService.java index 6205884..d8c0d0e 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IFishService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IFishService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.FishVo; -import org.dromara.fishery.domain.bo.FishBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.FishVo; +import com.intc.fishery.domain.bo.FishBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayDeviceService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayDeviceService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayDeviceService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayDeviceService.java index 5258e8b..73580c5 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayDeviceService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayDeviceService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.PayDeviceVo; -import org.dromara.fishery.domain.bo.PayDeviceBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.PayDeviceVo; +import com.intc.fishery.domain.bo.PayDeviceBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayOrderService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayOrderService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayOrderService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayOrderService.java index 786422f..fd6dbff 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPayOrderService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPayOrderService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.PayOrderVo; -import org.dromara.fishery.domain.bo.PayOrderBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.PayOrderVo; +import com.intc.fishery.domain.bo.PayOrderBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPondService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPondService.java similarity index 84% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPondService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPondService.java index 99bc45e..7280d44 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IPondService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IPondService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.PondVo; -import org.dromara.fishery.domain.bo.PondBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.PondVo; +import com.intc.fishery.domain.bo.PondBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IUserRelationService.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IUserRelationService.java similarity index 85% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IUserRelationService.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IUserRelationService.java index f96cb2e..a79f2e9 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/IUserRelationService.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/IUserRelationService.java @@ -1,9 +1,9 @@ -package org.dromara.fishery.service; +package com.intc.fishery.service; -import org.dromara.fishery.domain.vo.UserRelationVo; -import org.dromara.fishery.domain.bo.UserRelationBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.fishery.domain.vo.UserRelationVo; +import com.intc.fishery.domain.bo.UserRelationBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/AquUserServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/AquUserServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/AquUserServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/AquUserServiceImpl.java index c910b59..1b1f58f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/AquUserServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/AquUserServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.AquUserBo; -import org.dromara.fishery.domain.vo.AquUserVo; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.mapper.AquUserMapper; -import org.dromara.fishery.service.IAquUserService; +import com.intc.fishery.domain.bo.AquUserBo; +import com.intc.fishery.domain.vo.AquUserVo; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.mapper.AquUserMapper; +import com.intc.fishery.service.IAquUserService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java index 6ac73b8..0e8b4ee 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceBindRecordServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceBindRecordServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.bo.DeviceBindRecordBo; -import org.dromara.fishery.domain.vo.DeviceBindRecordVo; -import org.dromara.fishery.domain.DeviceBindRecord; -import org.dromara.fishery.mapper.DeviceBindRecordMapper; -import org.dromara.fishery.service.IDeviceBindRecordService; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.bo.DeviceBindRecordBo; +import com.intc.fishery.domain.vo.DeviceBindRecordVo; +import com.intc.fishery.domain.DeviceBindRecord; +import com.intc.fishery.mapper.DeviceBindRecordMapper; +import com.intc.fishery.service.IDeviceBindRecordService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceCorrectRecordServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceCorrectRecordServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java index 48751fe..315b462 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceCorrectRecordServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceCorrectRecordServiceImpl.java @@ -1,21 +1,21 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.DeviceCorrectRecordBo; -import org.dromara.fishery.domain.vo.DeviceCorrectRecordVo; -import org.dromara.fishery.domain.DeviceCorrectRecord; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.mapper.DeviceCorrectRecordMapper; -import org.dromara.fishery.service.IDeviceCorrectRecordService; +import com.intc.fishery.domain.bo.DeviceCorrectRecordBo; +import com.intc.fishery.domain.vo.DeviceCorrectRecordVo; +import com.intc.fishery.domain.DeviceCorrectRecord; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.Device; +import com.intc.fishery.mapper.DeviceCorrectRecordMapper; +import com.intc.fishery.service.IDeviceCorrectRecordService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceErrorCodeServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceErrorCodeServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceErrorCodeServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceErrorCodeServiceImpl.java index d43adf4..e084b4e 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceErrorCodeServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceErrorCodeServiceImpl.java @@ -1,22 +1,22 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.DeviceErrorCodeBo; -import org.dromara.fishery.domain.vo.DeviceErrorCodeVo; -import org.dromara.fishery.domain.DeviceErrorCode; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.DeviceSwitch; -import org.dromara.fishery.mapper.DeviceErrorCodeMapper; -import org.dromara.fishery.service.IDeviceErrorCodeService; +import com.intc.fishery.domain.bo.DeviceErrorCodeBo; +import com.intc.fishery.domain.vo.DeviceErrorCodeVo; +import com.intc.fishery.domain.DeviceErrorCode; +import com.intc.fishery.domain.Device; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.DeviceSwitch; +import com.intc.fishery.mapper.DeviceErrorCodeMapper; +import com.intc.fishery.service.IDeviceErrorCodeService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java index 186aed0..89314f3 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceServiceImpl.java @@ -1,25 +1,23 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.domain.Pond; -import org.dromara.fishery.domain.bo.DeviceBo; -import org.dromara.fishery.domain.vo.DeviceVo; -import org.dromara.fishery.mapper.DeviceMapper; -import org.dromara.fishery.service.IDeviceService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.Device; +import com.intc.fishery.domain.Pond; +import com.intc.fishery.domain.bo.DeviceBo; +import com.intc.fishery.domain.vo.DeviceVo; +import com.intc.fishery.mapper.DeviceMapper; +import com.intc.fishery.service.IDeviceService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -88,19 +86,19 @@ public class DeviceServiceImpl implements IDeviceService { private MPJLambdaWrapper buildQueryWrapper(DeviceBo bo) { Map params = bo.getParams(); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - + // Select main table fields wrapper.selectAll(Device.class); // Select joined table fields with Lambda mapping wrapper.selectAs(AquUser::getUserName, DeviceVo::getUserName) .selectAs(AquUser::getMobilePhone, DeviceVo::getMobilePhone); wrapper.selectAs(Pond::getPondName, DeviceVo::getPondName); - + // Left join with user table wrapper.leftJoin(AquUser.class, AquUser::getId, Device::getUserId); // Left join with pond table wrapper.leftJoin(Pond.class, Pond::getId, Device::getPondId); - + // 处理排序逼辑:如果expiredFlag为1,按过期时间倒序,否则按创建时间倒序 String expiredFlag = params != null ? (String) params.get("expiredFlag") : null; if ("1".equals(expiredFlag)) { @@ -109,7 +107,7 @@ public class DeviceServiceImpl implements IDeviceService { } else { wrapper.orderByDesc(Device::getCreateTime); } - + wrapper.eq(bo.getUserId() != null, Device::getUserId, bo.getUserId()); wrapper.eq(StringUtils.isNotBlank(bo.getSerialNum()), Device::getSerialNum, bo.getSerialNum()); wrapper.like(StringUtils.isNotBlank(bo.getDeviceName()), Device::getDeviceName, bo.getDeviceName()); @@ -147,7 +145,7 @@ public class DeviceServiceImpl implements IDeviceService { if (StringUtils.isNotBlank(pondKeyword)) { wrapper.like(Pond::getPondName, pondKeyword); } - + // 处理是否过期查询条件 String isExpiredStr = (String) params.get("isExpired"); if (StringUtils.isNotBlank(isExpiredStr)) { diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceSwitchServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceSwitchServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java index b378823..43124fe 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceSwitchServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java @@ -1,23 +1,23 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.DeviceSwitchBo; -import org.dromara.fishery.domain.vo.DeviceSwitchVo; -import org.dromara.fishery.domain.DeviceSwitch; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.domain.Pond; -import org.dromara.fishery.mapper.DeviceSwitchMapper; -import org.dromara.fishery.service.IDeviceSwitchService; +import com.intc.fishery.domain.bo.DeviceSwitchBo; +import com.intc.fishery.domain.vo.DeviceSwitchVo; +import com.intc.fishery.domain.DeviceSwitch; +import com.intc.fishery.domain.Device; +import com.intc.fishery.domain.Pond; +import com.intc.fishery.mapper.DeviceSwitchMapper; +import com.intc.fishery.service.IDeviceSwitchService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceThresholdServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceThresholdServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceThresholdServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceThresholdServiceImpl.java index aef36ab..7b8075c 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/DeviceThresholdServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceThresholdServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.DeviceThresholdBo; -import org.dromara.fishery.domain.vo.DeviceThresholdVo; -import org.dromara.fishery.domain.DeviceThreshold; -import org.dromara.fishery.mapper.DeviceThresholdMapper; -import org.dromara.fishery.service.IDeviceThresholdService; +import com.intc.fishery.domain.bo.DeviceThresholdBo; +import com.intc.fishery.domain.vo.DeviceThresholdVo; +import com.intc.fishery.domain.DeviceThreshold; +import com.intc.fishery.mapper.DeviceThresholdMapper; +import com.intc.fishery.service.IDeviceThresholdService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/FishServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/FishServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/FishServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/FishServiceImpl.java index c7965da..c200205 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/FishServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/FishServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.FishBo; -import org.dromara.fishery.domain.vo.FishVo; -import org.dromara.fishery.domain.Fish; -import org.dromara.fishery.mapper.FishMapper; -import org.dromara.fishery.service.IFishService; +import com.intc.fishery.domain.bo.FishBo; +import com.intc.fishery.domain.vo.FishVo; +import com.intc.fishery.domain.Fish; +import com.intc.fishery.mapper.FishMapper; +import com.intc.fishery.service.IFishService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayDeviceServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayDeviceServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayDeviceServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayDeviceServiceImpl.java index f7f162f..4c04c25 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayDeviceServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayDeviceServiceImpl.java @@ -1,23 +1,23 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.PayDeviceBo; -import org.dromara.fishery.domain.vo.PayDeviceVo; -import org.dromara.fishery.domain.PayDevice; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.mapper.PayDeviceMapper; -import org.dromara.fishery.mapper.DeviceMapper; -import org.dromara.fishery.service.IPayDeviceService; +import com.intc.fishery.domain.bo.PayDeviceBo; +import com.intc.fishery.domain.vo.PayDeviceVo; +import com.intc.fishery.domain.PayDevice; +import com.intc.fishery.domain.Device; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.mapper.PayDeviceMapper; +import com.intc.fishery.mapper.DeviceMapper; +import com.intc.fishery.service.IPayDeviceService; import java.time.LocalDate; import java.time.ZoneId; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayOrderServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayOrderServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayOrderServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayOrderServiceImpl.java index 5eae000..a276a66 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PayOrderServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PayOrderServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.PayOrderBo; -import org.dromara.fishery.domain.vo.PayOrderVo; -import org.dromara.fishery.domain.PayOrder; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.mapper.PayOrderMapper; -import org.dromara.fishery.service.IPayOrderService; +import com.intc.fishery.domain.bo.PayOrderBo; +import com.intc.fishery.domain.vo.PayOrderVo; +import com.intc.fishery.domain.PayOrder; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.mapper.PayOrderMapper; +import com.intc.fishery.service.IPayOrderService; import java.util.List; import java.util.Map; @@ -88,16 +88,16 @@ public class PayOrderServiceImpl implements IPayOrderService { private MPJLambdaWrapper buildJoinQueryWrapper(PayOrderBo bo) { Map params = bo.getParams(); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - + // Select all fields from main table wrapper.selectAll(PayOrder.class); // Select joined fields from AquUser table wrapper.selectAs(AquUser::getUserName, PayOrderVo::getUserName) .selectAs(AquUser::getMobilePhone, PayOrderVo::getMobilePhone); - + // Left join with AquUser table wrapper.leftJoin(AquUser.class, AquUser::getId, PayOrder::getUserId); - + // Build query conditions wrapper.orderByDesc(PayOrder::getCreateTime); wrapper.eq(bo.getUserId() != null, PayOrder::getUserId, bo.getUserId()); @@ -108,7 +108,7 @@ public class PayOrderServiceImpl implements IPayOrderService { wrapper.eq(StringUtils.isNotBlank(bo.getTransactionId()), PayOrder::getTransactionId, bo.getTransactionId()); wrapper.eq(bo.getOrderStatus() != null, PayOrder::getOrderStatus, bo.getOrderStatus()); wrapper.eq(bo.getProfitStatus() != null, PayOrder::getProfitStatus, bo.getProfitStatus()); - + // 处理扩展查询参数:用户关键词搜索(用户名或手机号模糊查询) if (params != null && !params.isEmpty()) { String userKeyword = (String) params.get("userKeyword"); @@ -118,7 +118,7 @@ public class PayOrderServiceImpl implements IPayOrderService { .like(AquUser::getMobilePhone, userKeyword)); } } - + return wrapper; } @@ -131,13 +131,13 @@ public class PayOrderServiceImpl implements IPayOrderService { if (vo == null) { return; } - + // 转换充值总金额 if (vo.getTotalAmount() != null) { double yuan = vo.getTotalAmount() / 100.0; vo.setTotalAmountYuan(Math.round(yuan * 100.0) / 100.0); } - + // 转换用户支付金额 if (vo.getPayerTotal() != null) { double yuan = vo.getPayerTotal() / 100.0; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PondServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PondServiceImpl.java index 5df6e85..d2a0e68 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/PondServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/PondServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; import java.util.Arrays; import java.util.Collection; @@ -6,22 +6,20 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.Fish; -import org.dromara.fishery.domain.Pond; -import org.dromara.fishery.domain.bo.PondBo; -import org.dromara.fishery.domain.vo.PondVo; -import org.dromara.fishery.mapper.FishMapper; -import org.dromara.fishery.mapper.PondMapper; -import org.dromara.fishery.service.IPondService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.fishery.domain.AquUser; +import com.intc.fishery.domain.Fish; +import com.intc.fishery.domain.Pond; +import com.intc.fishery.domain.bo.PondBo; +import com.intc.fishery.domain.vo.PondVo; +import com.intc.fishery.mapper.FishMapper; +import com.intc.fishery.mapper.PondMapper; +import com.intc.fishery.service.IPondService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -92,13 +90,13 @@ public class PondServiceImpl implements IPondService { private MPJLambdaWrapper buildQueryWrapper(PondBo bo) { Map params = bo.getParams(); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - + // Select main table fields wrapper.selectAll(Pond.class); // Select joined table fields with Lambda mapping wrapper.selectAs(AquUser::getUserName, PondVo::getUserName) .selectAs(AquUser::getMobilePhone, PondVo::getMobilePhone); - + // Left join with user table wrapper.leftJoin(AquUser.class, AquUser::getId, Pond::getUserId); @@ -138,7 +136,7 @@ public class PondServiceImpl implements IPondService { // 处理时间范围查询 Object startTimeObj = params.get("startTime"); Object endTimeObj = params.get("endTime"); - + String startTime = startTimeObj != null ? startTimeObj.toString() : null; String endTime = endTimeObj != null ? endTimeObj.toString() : null; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/UserRelationServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/UserRelationServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/UserRelationServiceImpl.java rename to intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/UserRelationServiceImpl.java index 97bfe72..4468119 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/service/impl/UserRelationServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/UserRelationServiceImpl.java @@ -1,20 +1,19 @@ -package org.dromara.fishery.service.impl; +package com.intc.fishery.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.fishery.domain.bo.UserRelationBo; -import org.dromara.fishery.domain.vo.UserRelationVo; -import org.dromara.fishery.domain.UserRelation; -import org.dromara.fishery.mapper.UserRelationMapper; -import org.dromara.fishery.service.IUserRelationService; +import com.intc.fishery.domain.bo.UserRelationBo; +import com.intc.fishery.domain.vo.UserRelationVo; +import com.intc.fishery.domain.UserRelation; +import com.intc.fishery.mapper.UserRelationMapper; +import com.intc.fishery.service.IUserRelationService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/excel/单列表.xlsx b/intc-modules/intc-fishery/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/excel/单列表.xlsx rename to intc-modules/intc-fishery/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/excel/多sheet列表.xlsx b/intc-modules/intc-fishery/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/excel/多sheet列表.xlsx rename to intc-modules/intc-fishery/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/excel/多列表.xlsx b/intc-modules/intc-fishery/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/excel/多列表.xlsx rename to intc-modules/intc-fishery/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml index 3736b9f..068207f 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/AquUserMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml new file mode 100644 index 0000000..f9c1ce7 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml index d4b3683..837b895 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceBindRecordMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml index e94ef19..d4dcba1 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml index fbe2eb6..e69cd82 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml index 91bfbbf..fb2ffd9 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml index 14ab5af..faac55a 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceSwitchMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/FishMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/FishMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/FishMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/FishMapper.xml index a50c0be..856cfbf 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/FishMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/FishMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml new file mode 100644 index 0000000..379ba5b --- /dev/null +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayDeviceMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml new file mode 100644 index 0000000..7098804 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PondMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PondMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PondMapper.xml rename to intc-modules/intc-fishery/src/main/resources/mapper/fishery/PondMapper.xml index 96ffd5f..d2b2d98 100644 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PondMapper.xml +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/PondMapper.xml @@ -2,5 +2,5 @@ - + diff --git a/intc-modules/intc-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml new file mode 100644 index 0000000..941cb78 --- /dev/null +++ b/intc-modules/intc-fishery/src/main/resources/mapper/fishery/UserRelationMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/package-info.md b/intc-modules/intc-fishery/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/package-info.md rename to intc-modules/intc-fishery/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/intc-modules/intc-generator/pom.xml similarity index 75% rename from ruoyi-modules/ruoyi-generator/pom.xml rename to intc-modules/intc-generator/pom.xml index fa5dc25..3802648 100644 --- a/ruoyi-modules/ruoyi-generator/pom.xml +++ b/intc-modules/intc-generator/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-modules + com.intc + intc-modules ${revision} 4.0.0 - ruoyi-generator + intc-generator generator 代码生成 @@ -18,33 +18,33 @@ - org.dromara - ruoyi-common-core + com.intc + intc-common-core - org.dromara - ruoyi-common-doc + com.intc + intc-common-doc - org.dromara - ruoyi-common-mybatis + com.intc + intc-common-mybatis - org.dromara - ruoyi-common-web + com.intc + intc-common-web - org.dromara - ruoyi-common-log + com.intc + intc-common-log - org.dromara - ruoyi-common-idempotent + com.intc + intc-common-idempotent diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/config/GenConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/config/GenConfig.java index b29f8c9..a0a8e5c 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package com.intc.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/config/MyBatisDataSourceMonitor.java similarity index 99% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/config/MyBatisDataSourceMonitor.java index 8c0f352..2d9cf76 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/config/MyBatisDataSourceMonitor.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package com.intc.generator.config; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/constant/GenConstants.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/constant/GenConstants.java index b9888fb..2ce558a 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/constant/GenConstants.java @@ -1,4 +1,4 @@ -package org.dromara.generator.constant; +package com.intc.generator.constant; /** * 代码生成通用常量 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/controller/GenController.java similarity index 91% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/controller/GenController.java index 99626a2..2a2844a 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package org.dromara.generator.controller; +package com.intc.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; @@ -6,17 +6,17 @@ import cn.hutool.core.io.IoUtil; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.service.IGenTableService; +import com.intc.common.core.domain.R; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.helper.DataBaseHelper; +import com.intc.common.web.core.BaseController; +import com.intc.generator.domain.GenTable; +import com.intc.generator.domain.GenTableColumn; +import com.intc.generator.service.IGenTableService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTable.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTable.java index f2d7257..c47ec8c 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTable.java @@ -1,12 +1,12 @@ -package org.dromara.generator.domain; +package com.intc.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.generator.constant.GenConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.generator.constant.GenConstants; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTableColumn.java index 6b2e429..ed4c170 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package org.dromara.generator.domain; +package com.intc.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableColumnMapper.java similarity index 65% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableColumnMapper.java index ed8ed20..6986c16 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableColumnMapper.java @@ -1,8 +1,8 @@ -package org.dromara.generator.mapper; +package com.intc.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTableColumn; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.generator.domain.GenTableColumn; /** * 业务字段 数据层 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableMapper.java similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableMapper.java index 1798b4b..7aa73ce 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package org.dromara.generator.mapper; +package com.intc.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTable; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.generator.domain.GenTable; import java.util.List; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/service/GenTableServiceImpl.java index c4c79b0..9dca162 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.generator.service; +package com.intc.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -19,23 +19,23 @@ import org.anyline.proxy.ServiceProxy; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.mapper.GenTableColumnMapper; -import org.dromara.generator.mapper.GenTableMapper; -import org.dromara.generator.util.GenUtils; -import org.dromara.generator.util.VelocityInitializer; -import org.dromara.generator.util.VelocityUtils; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.generator.constant.GenConstants; +import com.intc.generator.domain.GenTable; +import com.intc.generator.domain.GenTableColumn; +import com.intc.generator.mapper.GenTableColumnMapper; +import com.intc.generator.mapper.GenTableMapper; +import com.intc.generator.util.GenUtils; +import com.intc.generator.util.VelocityInitializer; +import com.intc.generator.util.VelocityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/service/IGenTableService.java similarity index 91% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/service/IGenTableService.java index b2c20c5..43af9b9 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ -package org.dromara.generator.service; +package com.intc.generator.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.generator.domain.GenTable; +import com.intc.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/GenUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/util/GenUtils.java index 996cf9b..71f8ab8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/GenUtils.java @@ -1,13 +1,13 @@ -package org.dromara.generator.util; +package com.intc.generator.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.GenConfig; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.intc.common.core.utils.StringUtils; +import com.intc.generator.config.GenConfig; +import com.intc.generator.constant.GenConstants; +import com.intc.generator.domain.GenTable; +import com.intc.generator.domain.GenTableColumn; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityInitializer.java similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityInitializer.java index 09e0121..a07611e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package org.dromara.generator.util; +package com.intc.generator.util; -import org.dromara.common.core.constant.Constants; +import com.intc.common.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java rename to intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityUtils.java index 44c5979..097a29a 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ b/intc-modules/intc-generator/src/main/java/com/intc/generator/util/VelocityUtils.java @@ -1,16 +1,16 @@ -package org.dromara.generator.util; +package com.intc.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; -import org.dromara.common.mybatis.enums.DataBaseType; -import org.dromara.generator.constant.GenConstants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.intc.common.mybatis.enums.DataBaseType; +import com.intc.generator.constant.GenConstants; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.helper.DataBaseHelper; +import com.intc.generator.domain.GenTable; +import com.intc.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.VelocityContext; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/intc-modules/intc-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml rename to intc-modules/intc-generator/src/main/resources/generator.yml diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 51% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index fc1c610..be1d3f2 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 78aa852..7b13f68 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/intc-modules/intc-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,15 +2,15 @@ - + - + - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/intc-modules/intc-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md rename to intc-modules/intc-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/bo.java.vm similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/bo.java.vm index 511d37c..f313c87 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/bo.java.vm @@ -1,9 +1,7 @@ package ${packageName}.domain.bo; import ${packageName}.domain.${ClassName}; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/controller.java.vm similarity index 87% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/controller.java.vm index 6438971..236be14 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/controller.java.vm @@ -8,20 +8,20 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +com.intc import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/domain.java.vm similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/domain.java.vm index 205fb73..5a8d0c4 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/domain.java.vm @@ -6,9 +6,8 @@ package ${packageName}.domain; #end #end #if($IsTenant==1) -import org.dromara.common.tenant.core.TenantEntity; +com.intc #else -import org.dromara.common.mybatis.core.domain.BaseEntity; #end import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/mapper.java.vm similarity index 82% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/mapper.java.vm index 0922401..5df7638 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/mapper.java.vm @@ -2,7 +2,7 @@ package ${packageName}.mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; /** * ${functionName}Mapper接口 diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/service.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/service.java.vm index 4db9030..0bb252b 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/service.java.vm @@ -3,8 +3,8 @@ package ${packageName}.service; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; #end import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/serviceImpl.java.vm index be6c3bf..c12eacf 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,10 +1,9 @@ package ${packageName}.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.common.core.utils.MapstructUtils; + #if($table.crud) +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/intc-modules/intc-generator/src/main/resources/vm/java/vo.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to intc-modules/intc-generator/src/main/resources/vm/java/vo.java.vm index 480394c..c2ee6ef 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/intc-modules/intc-generator/src/main/resources/vm/java/vo.java.vm @@ -6,8 +6,8 @@ import ${import}; import ${packageName}.domain.${ClassName}; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +com.intc +com.intc import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/intc-modules/intc-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to intc-modules/intc-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/intc-modules/intc-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to intc-modules/intc-generator/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/intc-modules/intc-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to intc-modules/intc-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/intc-modules/intc-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to intc-modules/intc-generator/src/main/resources/vm/sql/sqlserver/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/intc-modules/intc-generator/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to intc-modules/intc-generator/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/intc-modules/intc-generator/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm rename to intc-modules/intc-generator/src/main/resources/vm/ts/types.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/intc-modules/intc-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to intc-modules/intc-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/intc-modules/intc-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to intc-modules/intc-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/intc-modules/intc-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to intc-modules/intc-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/intc-modules/intc-job/pom.xml similarity index 65% rename from ruoyi-modules/ruoyi-job/pom.xml rename to intc-modules/intc-job/pom.xml index 2431a1c..964c5d8 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/intc-modules/intc-job/pom.xml @@ -3,13 +3,13 @@ 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"> - org.dromara - ruoyi-modules + com.intc + intc-modules ${revision} 4.0.0 jar - ruoyi-job + intc-job 任务调度 @@ -19,15 +19,15 @@ - org.dromara - ruoyi-common-json + com.intc + intc-common-json - org.dromara - ruoyi-common-job + com.intc + intc-common-job - + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java b/intc-modules/intc-job/src/main/java/com/intc/job/entity/BillDto.java similarity index 91% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java rename to intc-modules/intc-job/src/main/java/com/intc/job/entity/BillDto.java index 2661e34..7d956b7 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/entity/BillDto.java @@ -1,4 +1,4 @@ -package org.dromara.job.entity; +package com.intc.job.entity; import lombok.Data; diff --git a/intc-modules/intc-job/src/main/java/com/intc/job/package-info.java b/intc-modules/intc-job/src/main/java/com/intc/job/package-info.java new file mode 100644 index 0000000..c80b89a --- /dev/null +++ b/intc-modules/intc-job/src/main/java/com/intc/job/package-info.java @@ -0,0 +1 @@ +package com.intc.job; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/AlipayBillTask.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/AlipayBillTask.java index d5c3ea7..840c741 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/AlipayBillTask.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -6,8 +6,8 @@ import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.model.dto.ExecuteResult; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.intc.common.json.utils.JsonUtils; +import com.intc.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/SummaryBillTask.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/SummaryBillTask.java index 47d7305..4bffb34 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/SummaryBillTask.java @@ -1,12 +1,12 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.model.dto.ExecuteResult; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.intc.common.json.utils.JsonUtils; +import com.intc.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestAnnoJobExecutor.java similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestAnnoJobExecutor.java index aa3d99e..79f3589 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestAnnoJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestBroadcastJob.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestBroadcastJob.java index 9cb8309..e7ebf75 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestBroadcastJob.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.util.RandomUtil; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestClassJobExecutor.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestClassJobExecutor.java index 93da0a9..9caed79 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestClassJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapJobAnnotation.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapJobAnnotation.java index f58d772..b2f9987 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapJobAnnotation.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapReduceAnnotation1.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapReduceAnnotation1.java index f926016..3401305 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestMapReduceAnnotation1.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestStaticShardingJob.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestStaticShardingJob.java index 060fcd4..9fcb906 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/TestStaticShardingJob.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.convert.Convert; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/WechatBillTask.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/snailjob/WechatBillTask.java index e19a48e..816d63b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/snailjob/WechatBillTask.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.intc.job.snailjob; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -6,8 +6,8 @@ import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.model.dto.ExecuteResult; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.intc.common.json.utils.JsonUtils; +import com.intc.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/intc-modules/intc-system/pom.xml b/intc-modules/intc-system/pom.xml new file mode 100644 index 0000000..9de4b51 --- /dev/null +++ b/intc-modules/intc-system/pom.xml @@ -0,0 +1,105 @@ + + + + com.intc + intc-modules + ${revision} + + 4.0.0 + + intc-system + + + system系统模块 + + + + + + com.intc + intc-common-core + + + + com.intc + intc-common-doc + + + + com.intc + intc-common-mybatis + + + + com.intc + intc-common-translation + + + + + com.intc + intc-common-oss + + + + com.intc + intc-common-log + + + + + com.intc + intc-common-excel + + + + + com.intc + intc-common-sms + + + + com.intc + intc-common-tenant + + + + com.intc + intc-common-security + + + + com.intc + intc-common-web + + + + com.intc + intc-common-idempotent + + + + com.intc + intc-common-sensitive + + + + com.intc + intc-common-encrypt + + + + com.intc + intc-common-websocket + + + + com.intc + intc-common-sse + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/CacheController.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/CacheController.java index 4a82536..4cfa947 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/CacheController.java @@ -1,9 +1,9 @@ -package org.dromara.system.controller.monitor; +package com.intc.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.core.RedisConnectionUtils; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysLogininforController.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysLogininforController.java index 3787170..a4ba38a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysLogininforController.java @@ -1,22 +1,22 @@ -package org.dromara.system.controller.monitor; +package com.intc.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.service.ISysLogininforService; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysLogininforBo; +import com.intc.system.domain.vo.SysLogininforVo; +import com.intc.system.service.ISysLogininforService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysOperlogController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysOperlogController.java index d2e4c9e..d2f1e3d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysOperlogController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.monitor; +package com.intc.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.service.ISysOperLogService; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysOperLogBo; +import com.intc.system.domain.vo.SysOperLogVo; +import com.intc.system.service.ISysOperLogService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysUserOnlineController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysUserOnlineController.java index 0e6f171..ac2162d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/monitor/SysUserOnlineController.java @@ -1,22 +1,22 @@ -package org.dromara.system.controller.monitor; +package com.intc.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserOnline; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.domain.dto.UserOnlineDTO; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.SysUserOnline; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysClientController.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysClientController.java index eaed068..eb2e8c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysClientController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.service.ISysClientService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.web.core.BaseController; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.system.domain.bo.SysClientBo; +import com.intc.system.service.ISysClientService; +import com.intc.common.mybatis.core.page.TableDataInfo; /** * 客户端管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysConfigController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysConfigController.java index 2be7858..22c38d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysConfigController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.service.ISysConfigService; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysConfigBo; +import com.intc.system.domain.vo.SysConfigVo; +import com.intc.system.service.ISysConfigService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDeptController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDeptController.java index 3acb947..f97b43f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDeptController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.vo.SysDeptVo; +import com.intc.system.service.ISysDeptService; +import com.intc.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictDataController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictDataController.java index ae6d580..face2df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictDataController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysDictDataBo; +import com.intc.system.domain.vo.SysDictDataVo; +import com.intc.system.service.ISysDictDataService; +import com.intc.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictTypeController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictTypeController.java index d88e6ec..8e74b2c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysDictTypeController.java @@ -1,20 +1,20 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.service.ISysDictTypeService; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysDictTypeBo; +import com.intc.system.domain.vo.SysDictTypeVo; +import com.intc.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysMenuController.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysMenuController.java index d1b5b9b..ee6ee17 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysMenuController.java @@ -1,24 +1,24 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.tree.Tree; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.service.ISysMenuService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.bo.SysMenuBo; +import com.intc.system.domain.vo.RouterVo; +import com.intc.system.domain.vo.SysMenuVo; +import com.intc.system.service.ISysMenuService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysNoticeController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysNoticeController.java index 86abb9a..2885d19 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysNoticeController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.DictService; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.service.ISysNoticeService; +import com.intc.common.core.domain.R; +import com.intc.common.core.service.DictService; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.sse.utils.SseMessageUtils; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysNoticeBo; +import com.intc.system.domain.vo.SysNoticeVo; +import com.intc.system.service.ISysNoticeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssConfigController.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssConfigController.java index 2369980..8f7a43d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssConfigController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.service.ISysOssConfigService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.core.validate.QueryGroup; +import com.intc.common.web.core.BaseController; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysOssConfigBo; +import com.intc.system.domain.vo.SysOssConfigVo; +import com.intc.system.service.ISysOssConfigService; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssController.java index 81200c1..5389157 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysOssController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssUploadVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.service.ISysOssService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.QueryGroup; +import com.intc.common.web.core.BaseController; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysOssBo; +import com.intc.system.domain.vo.SysOssUploadVo; +import com.intc.system.domain.vo.SysOssVo; +import com.intc.system.service.ISysOssService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysPostController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysPostController.java index 0f1b80c..be1be2e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysPostController.java @@ -1,24 +1,24 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.bo.SysPostBo; +import com.intc.system.domain.vo.SysPostVo; +import com.intc.system.service.ISysDeptService; +import com.intc.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysProfileController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysProfileController.java index 9621cb2..ab406e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysProfileController.java @@ -1,27 +1,27 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.crypto.digest.BCrypt; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.MimeTypeUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; -import org.dromara.system.domain.bo.SysUserProfileBo; -import org.dromara.system.domain.vo.ProfileUserVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysOssService; -import org.dromara.system.service.ISysUserService; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.MimeTypeUtils; +import com.intc.common.encrypt.annotation.ApiEncrypt; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.helper.DataPermissionHelper; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.bo.SysUserPasswordBo; +import com.intc.system.domain.bo.SysUserProfileBo; +import com.intc.system.domain.vo.ProfileUserVo; +import com.intc.system.domain.vo.SysOssVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.service.ISysOssService; +import com.intc.system.service.ISysUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysRoleController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysRoleController.java index 755a9ec..5c40f2f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysRoleController.java @@ -1,26 +1,26 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import com.intc.common.core.domain.R; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.SysUserRole; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.bo.SysRoleBo; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.vo.SysRoleVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.service.ISysDeptService; +import com.intc.system.service.ISysRoleService; +import com.intc.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysSocialController.java similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysSocialController.java index b0281cf..48a1f04 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysSocialController.java @@ -1,11 +1,11 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.service.ISysSocialService; +import com.intc.common.core.domain.R; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.vo.SysSocialVo; +import com.intc.system.service.ISysSocialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantController.java index f79aa6d..f1e284d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -8,22 +8,22 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysTenantService; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.encrypt.annotation.ApiEncrypt; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.tenant.helper.TenantHelper; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysTenantBo; +import com.intc.system.domain.vo.SysTenantVo; +import com.intc.system.service.ISysTenantService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantPackageController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantPackageController.java index 0f724be..3869b29 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysTenantPackageController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.service.ISysTenantPackageService; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysTenantPackageBo; +import com.intc.system.domain.vo.SysTenantPackageVo; +import com.intc.system.service.ISysTenantPackageService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysUserController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysUserController.java index 2847fc2..3b9ccb2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/system/SysUserController.java @@ -1,37 +1,37 @@ -package org.dromara.system.controller.system; +package com.intc.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; +import com.intc.system.domain.vo.*; +import com.intc.system.service.*; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.*; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.encrypt.annotation.ApiEncrypt; +import com.intc.common.excel.core.ExcelResult; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.helper.DataPermissionHelper; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.tenant.helper.TenantHelper; +import com.intc.common.web.core.BaseController; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.bo.SysPostBo; +import com.intc.system.domain.bo.SysRoleBo; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.listener.SysUserImportListener; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysCache.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysCache.java index e398a20..d2e8891 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysCache.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.intc.system.domain; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysClient.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysClient.java index ee2475d..402ed1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysClient.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.intc.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java index 6fcb88f..abe3e7a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDept.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDept.java index d436a1c..ccc825f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import java.io.Serial; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictData.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictData.java index 9d83736..6f27f54 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictData.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.tenant.core.TenantEntity; /** * 字典数据表 sys_dict_data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictType.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictType.java index 955af85..17b6335 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysDictType.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysLogininfor.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysLogininfor.java index c57dc0a..e17bc7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysLogininfor.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java index 2df5596..920b952 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.domain.BaseEntity; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java index bfcc2bc..d041aca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOperLog.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOperLog.java index 41a8c59..3ed9724 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOperLog.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOss.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOss.java index 2285a5d..7d38714 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOss.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssConfig.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssConfig.java index 4b67d63..4022574 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssConfig.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; /** * 对象存储配置对象 sys_oss_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssExt.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssExt.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssExt.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssExt.java index 15a95e7..9c2bb52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssExt.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysOssExt.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java index 2c985da..c9995b9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRole.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRole.java index aa1b19a..1922d66 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRole.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java index ba77694..35d6705 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java index ba28f17..08f5023 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysSocial.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysSocial.java index 10f2936..9b5766e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysSocial.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenant.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenant.java index 9800c30..ad865e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenant.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenantPackage.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenantPackage.java index 5f58e3e..34d3259 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysTenantPackage.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; /** * 租户套餐对象 sys_tenant_package diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUser.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUser.java index 3712f80..132ac39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUser.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.tenant.core.TenantEntity; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java index ba30eb6..609ff72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java index 119c117..53fe748 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java index 0a50e80..7f63201 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.intc.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysClientBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysClientBo.java index e5f5ffa..40a3c6d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysClientBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.system.domain.SysClient; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysConfigBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysConfigBo.java index 257935d..70aa364 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysConfigBo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysConfig; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysConfig; /** * 参数配置业务对象 sys_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDeptBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDeptBo.java index 0d8ac84..af50a5a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDeptBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,8 +7,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDept; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysDept; /** * 部门业务对象 sys_dept diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictDataBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictDataBo.java index 042946c..e307817 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictDataBo.java @@ -1,13 +1,12 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictData; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysDictData; /** * 字典数据业务对象 sys_dict_data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictTypeBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictTypeBo.java index fcc1ac1..8babfa2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysDictTypeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,9 +6,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictType; +import com.intc.common.core.constant.RegexConstants; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysDictType; /** * 字典类型业务对象 sys_dict_type diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysLogininforBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysLogininforBo.java index 4646162..ba788af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysLogininforBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.system.domain.SysLogininfor; +import com.intc.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysMenuBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysMenuBo.java index fbaafaa..0fd0419 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysMenuBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; @@ -8,9 +8,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysMenu; +import com.intc.common.core.constant.RegexConstants; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysMenu; /** * 菜单权限业务对象 sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysNoticeBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysNoticeBo.java index cdcc575..03ecee9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysNoticeBo.java @@ -1,13 +1,13 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysNotice; +import com.intc.common.core.xss.Xss; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysNotice; /** * 通知公告业务对象 sys_notice diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOperLogBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOperLogBo.java index f16400a..eb30128 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOperLogBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; +import com.intc.common.log.event.OperLogEvent; +import com.intc.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssBo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssBo.java index ff624c9..cdcc367 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOss; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssConfigBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssConfigBo.java index 3dc4328..ce2de8f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysOssConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOssConfig; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysPostBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysPostBo.java index 09805cd..c0d9288 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysPostBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysPost; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysPost; /** * 岗位信息业务对象 sys_post diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysRoleBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysRoleBo.java index 5e3e602..d0ec85c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysRoleBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,9 +7,9 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysRole; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysRole; /** * 角色信息业务对象 sys_role diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysSocialBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysSocialBo.java index cede1e9..8f6d22d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysSocialBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.system.domain.SysSocial; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.tenant.core.TenantEntity; +import com.intc.system.domain.SysSocial; /** * 社会化关系业务对象 sys_social diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantBo.java index 3757f9a..44ee00e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantBo.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysTenant; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysTenant; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantPackageBo.java similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantPackageBo.java index b27a406..b7869c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysTenantPackageBo.java @@ -1,15 +1,15 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenantPackage; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; /** * 租户套餐业务对象 sys_tenant_package @@ -37,7 +37,7 @@ public class SysTenantPackageBo extends BaseEntity { /** * 关联菜单id */ - @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.joinComma(source.getMenuIds()))") + @AutoMapping(target = "menuIds", expression = "java(com.intc.common.core.utils.StringUtils.joinComma(source.getMenuIds()))") private Long[] menuIds; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserBo.java index 1472d24..58804e8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysUser; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.xss.Xss; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.system.domain.SysUser; /** * 用户信息业务对象 sys_user diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserPasswordBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserPasswordBo.java index 8615fcd..0c046fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserPasswordBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserProfileBo.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserProfileBo.java index 846dd79..a1efd9c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/bo/SysUserProfileBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.intc.system.domain.bo; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; @@ -6,11 +6,11 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.intc.common.core.constant.RegexConstants; +import com.intc.common.core.xss.Xss; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.sensitive.annotation.Sensitive; +import com.intc.common.sensitive.core.SensitiveStrategy; /** * 个人信息业务处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java index 840ddaf..0d7977a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/ProfileUserVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/ProfileUserVo.java index 70fc5d3..28cd2f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/ProfileUserVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java index d56e09d..0fdb940 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysClientVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysClientVo.java index 82b0f46..7a7b20d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysClientVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; -import org.dromara.system.domain.SysClient; +import com.intc.system.domain.SysClient; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysConfigVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysConfigVo.java index a35e132..ef0a3c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysConfigVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysConfig; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDeptVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDeptVo.java index c9f5a1f..845034e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDeptVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDept; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictDataVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictDataVo.java index d97c00d..860285f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictDataVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictData; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysDictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictTypeVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictTypeVo.java index 4b62226..4c6f297 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysDictTypeVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictType; +import com.intc.system.domain.SysDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysLogininforVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysLogininforVo.java index 3086aa7..795e1bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysLogininforVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import java.util.Date; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysLogininfor; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysMenuVo.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysMenuVo.java index 5214a33..b1635a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysMenuVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; -import org.dromara.system.domain.SysMenu; +import com.intc.system.domain.SysMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysNoticeVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysNoticeVo.java index afe7367..01bc42b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysNoticeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysNotice; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.system.domain.SysNotice; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOperLogVo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOperLogVo.java index 00b3344..488c1d5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOperLogVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysOperLog; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssConfigVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssConfigVo.java index a030722..b40881c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssConfigVo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.domain.SysOssConfig; +import com.intc.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssUploadVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssUploadVo.java index 11e0ff8..0897415 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssUploadVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssVo.java index fe05651..3879892 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysOssVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysOss; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysPostVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysPostVo.java index 50140b6..c77d9f6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysPostVo.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysPost; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysRoleVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysRoleVo.java index 1a205cc..52e395e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysRoleVo.java @@ -1,13 +1,13 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysRole; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysRole; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysSocialVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysSocialVo.java index 948dbcc..af9017c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysSocialVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.system.domain.SysSocial; +import com.intc.system.domain.SysSocial; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantPackageVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantPackageVo.java index ead9229..1be5836 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantPackageVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenantPackage; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantVo.java index 021c664..819f613 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysTenantVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import java.util.Date; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenant; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; +import com.intc.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserExportVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserExportVo.java index 913ab20..ebf54e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserExportVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.ReverseAutoMapping; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserImportVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserImportVo.java index d4e575c..7d19890 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserInfoVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserInfoVo.java index e41355d..700f1c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java index 86249d2..febfc9c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysUser; +import com.intc.common.sensitive.annotation.Sensitive; +import com.intc.common.sensitive.core.SensitiveStrategy; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.system.domain.SysUser; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/UserInfoVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/UserInfoVo.java index 48fa92a..0881009 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.intc.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/intc-modules/intc-system/src/main/java/com/intc/system/listener/SysUserImportListener.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to intc-modules/intc-system/src/main/java/com/intc/system/listener/SysUserImportListener.java index 66db5f5..f9455f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/listener/SysUserImportListener.java @@ -1,4 +1,4 @@ -package org.dromara.system.listener; +package com.intc.system.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,18 +8,18 @@ import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.event.AnalysisEventListener; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserImportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysUserService; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.ValidatorUtils; +import com.intc.common.excel.core.ExcelListener; +import com.intc.common.excel.core.ExcelResult; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.vo.SysUserImportVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.service.ISysConfigService; +import com.intc.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysClientMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysClientMapper.java new file mode 100644 index 0000000..2b74e0a --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysClientMapper.java @@ -0,0 +1,15 @@ +package com.intc.system.mapper; + +import com.intc.system.domain.SysClient; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +public interface SysClientMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..347865c --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysConfig; +import com.intc.system.domain.vo.SysConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java index 80a99cf..5f88d0b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java @@ -1,15 +1,15 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.vo.SysDeptVo; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.common.mybatis.helper.DataBaseHelper; +import com.intc.system.domain.SysDept; +import com.intc.system.domain.vo.SysDeptVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java index 7298db3..c2ac76d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java @@ -1,9 +1,9 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysDictData; +import com.intc.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..2df741d --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.system.domain.SysDictType; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.vo.SysDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..83875f7 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysLogininfor; +import com.intc.system.domain.vo.SysLogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +public interface SysLogininforMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java index 05e2546..047f6b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java @@ -1,12 +1,12 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.vo.SysMenuVo; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.vo.SysMenuVo; import java.util.HashSet; import java.util.List; diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..d228a47 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysNotice; +import com.intc.system.domain.vo.SysNoticeVo; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +public interface SysNoticeMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..3cce1a9 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysOperLog; +import com.intc.system.domain.vo.SysOperLogVo; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +public interface SysOperLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssConfigMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssConfigMapper.java index f93d34d..9caf17d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssConfigMapper.java @@ -1,8 +1,8 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.vo.SysOssConfigVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysOssConfig; +import com.intc.system.domain.vo.SysOssConfigVo; /** * 对象存储配置Mapper接口 diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssMapper.java new file mode 100644 index 0000000..e880170 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOssMapper.java @@ -0,0 +1,13 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysOss; +import com.intc.system.domain.vo.SysOssVo; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +public interface SysOssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java index d8d0315..0e9eced 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java @@ -1,13 +1,13 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.vo.SysPostVo; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysPost; +import com.intc.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java index 3de0bb6..de0f87f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleDept; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java index 9207805..2a551fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java @@ -1,15 +1,15 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.vo.SysRoleVo; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysRole; +import com.intc.system.domain.vo.SysRoleVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java index 8aa9dd3..a079765 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,8 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleMenu; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysRoleMenu; import java.util.List; diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysSocialMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysSocialMapper.java new file mode 100644 index 0000000..b15101d --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysSocialMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysSocial; +import com.intc.system.domain.vo.SysSocialVo; + +/** + * 社会化关系Mapper接口 + * + * @author thiszhc + */ +public interface SysSocialMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantMapper.java new file mode 100644 index 0000000..cb0d074 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.system.domain.SysTenant; +import com.intc.system.domain.vo.SysTenantVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 租户Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantMapper extends BaseMapperPlus { + +} diff --git a/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantPackageMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantPackageMapper.java new file mode 100644 index 0000000..e279310 --- /dev/null +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysTenantPackageMapper.java @@ -0,0 +1,14 @@ +package com.intc.system.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysTenantPackage; +import com.intc.system.domain.vo.SysTenantPackageVo; + +/** + * 租户套餐Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantPackageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java index 2cfd3db..200e56a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java @@ -1,16 +1,16 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.intc.common.mybatis.annotation.DataColumn; +import com.intc.common.mybatis.annotation.DataPermission; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysUser; +import com.intc.system.domain.vo.SysUserExportVo; +import com.intc.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java index 07c1371..a22a895 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserPost; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java index 4c1c8b9..135f2d8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package org.dromara.system.mapper; +package com.intc.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserRole; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.system.domain.SysUserRole; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/intc-modules/intc-system/src/main/java/com/intc/system/runner/SystemApplicationRunner.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java rename to intc-modules/intc-system/src/main/java/com/intc/system/runner/SystemApplicationRunner.java index 27dad7d..6c6c151 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/runner/SystemApplicationRunner.java @@ -1,6 +1,6 @@ -package org.dromara.system.runner; +package com.intc.system.runner; -import org.dromara.system.service.ISysOssConfigService; +import com.intc.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysClientService.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysClientService.java index 546c3f3..fc5c1b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysClientService.java @@ -1,10 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.system.domain.bo.SysClientBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java index a101643..8b556f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysConfigBo; +import com.intc.system.domain.vo.SysConfigVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDataScopeService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDataScopeService.java index 3f252f7..2477857 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDataScopeService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.intc.system.service; /** * 通用 数据权限 服务 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java index 1397443..a4dc759 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.intc.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.vo.SysDeptVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java index fdabd31..22c5034 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysDictDataBo; +import com.intc.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java index e3a04de..5c25608 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysDictTypeBo; +import com.intc.system.domain.vo.SysDictDataVo; +import com.intc.system.domain.vo.SysDictTypeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java index 1bc1ea9..f3ebd70 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysLogininforBo; +import com.intc.system.domain.vo.SysLogininforVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java index f972691..2eb2715 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.intc.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.bo.SysMenuBo; +import com.intc.system.domain.vo.RouterVo; +import com.intc.system.domain.vo.SysMenuVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java index 8482cd0..97b1c46 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysNoticeBo; +import com.intc.system.domain.vo.SysNoticeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java index e8b340c..ba87ab4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysOperLogBo; +import com.intc.system.domain.vo.SysOperLogVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssConfigService.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssConfigService.java index 2f6dfc9..d95ec07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysOssConfigBo; +import com.intc.system.domain.vo.SysOssConfigVo; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssService.java index 057c068..4239b13 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOssService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysOssBo; +import com.intc.system.domain.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java index 0116df5..c596057 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.intc.system.service; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java index 1caaab2..fee771b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysPostBo; +import com.intc.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java index abbfc79..281ef23 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysUserRole; +import com.intc.system.domain.bo.SysRoleBo; +import com.intc.system.domain.vo.SysRoleVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysSocialService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysSocialService.java index cc7016e..95e01a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysSocialService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; +import com.intc.system.domain.bo.SysSocialBo; +import com.intc.system.domain.vo.SysSocialVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantPackageService.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantPackageService.java index d060b68..6d00c1b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantPackageService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysTenantPackageBo; +import com.intc.system.domain.vo.SysTenantPackageVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantService.java index f697829..6fd756a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysTenantService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.intc.system.domain.vo.SysTenantVo; +import com.intc.system.domain.bo.SysTenantBo; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java index 1fe5545..75a020a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.intc.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.vo.SysUserExportVo; +import com.intc.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysClientServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysClientServiceImpl.java index 112dfb0..550d416 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.crypto.SecureUtil; @@ -8,16 +8,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.mapper.SysClientMapper; -import org.dromara.system.service.ISysClientService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysClient; +import com.intc.system.domain.bo.SysClientBo; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.system.mapper.SysClientMapper; +import com.intc.system.service.ISysClientService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java index 83ecd5c..3b7642f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; @@ -6,23 +6,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.mapper.SysConfigMapper; -import org.dromara.system.service.ISysConfigService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.ConfigService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.common.tenant.helper.TenantHelper; +import com.intc.system.domain.SysConfig; +import com.intc.system.domain.bo.SysConfigBo; +import com.intc.system.domain.vo.SysConfigVo; +import com.intc.system.mapper.SysConfigMapper; +import com.intc.system.service.ISysConfigService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDataScopeServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDataScopeServiceImpl.java index e300802..94ebae8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDataScopeServiceImpl.java @@ -1,16 +1,16 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.service.ISysDataScopeService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.utils.StreamUtils; +import com.intc.system.domain.SysRoleDept; +import com.intc.system.mapper.SysDeptMapper; +import com.intc.system.mapper.SysRoleDeptMapper; +import com.intc.system.service.ISysDataScopeService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java index 4e6db15..5de05df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -9,27 +9,27 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.intc.common.core.utils.*; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.DeptDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysDeptService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.dto.DeptDTO; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.DeptService; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.helper.DataBaseHelper; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.SysDept; +import com.intc.system.domain.SysRole; +import com.intc.system.domain.SysUser; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.vo.SysDeptVo; +import com.intc.system.mapper.SysDeptMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.mapper.SysUserMapper; +import com.intc.system.service.ISysDeptService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java index cb82e49..b9a2048 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java @@ -1,22 +1,22 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.service.ISysDictDataService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.system.domain.SysDictData; +import com.intc.system.domain.bo.SysDictDataBo; +import com.intc.system.domain.vo.SysDictDataVo; +import com.intc.system.mapper.SysDictDataMapper; +import com.intc.system.service.ISysDictDataService; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java index e72438e..0524a57 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -8,26 +8,26 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.DictDataDTO; -import org.dromara.common.core.domain.dto.DictTypeDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.SysDictType; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysDictTypeMapper; -import org.dromara.system.service.ISysDictTypeService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.domain.dto.DictDataDTO; +import com.intc.common.core.domain.dto.DictTypeDTO; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.system.domain.SysDictData; +import com.intc.system.domain.SysDictType; +import com.intc.system.domain.bo.SysDictTypeBo; +import com.intc.system.domain.vo.SysDictDataVo; +import com.intc.system.domain.vo.SysDictTypeVo; +import com.intc.system.mapper.SysDictDataMapper; +import com.intc.system.mapper.SysDictTypeMapper; +import com.intc.system.service.ISysDictTypeService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java index c388d99..6727536 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; @@ -8,22 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.mapper.SysLogininforMapper; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysLogininforService; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.AddressUtils; +import com.intc.common.log.event.LogininforEvent; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.SysLogininfor; +import com.intc.system.domain.bo.SysLogininforBo; +import com.intc.system.domain.vo.SysClientVo; +import com.intc.system.domain.vo.SysLogininforVo; +import com.intc.system.mapper.SysLogininforMapper; +import com.intc.system.service.ISysClientService; +import com.intc.system.service.ISysLogininforService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java index 6d4ab42..987288b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -6,26 +6,26 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MetaVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.mapper.SysMenuMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysMenuService; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.TreeBuildUtils; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.SysRole; +import com.intc.system.domain.SysRoleMenu; +import com.intc.system.domain.SysTenantPackage; +import com.intc.system.domain.bo.SysMenuBo; +import com.intc.system.domain.vo.MetaVo; +import com.intc.system.domain.vo.RouterVo; +import com.intc.system.domain.vo.SysMenuVo; +import com.intc.system.mapper.SysMenuMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.mapper.SysRoleMenuMapper; +import com.intc.system.mapper.SysTenantPackageMapper; +import com.intc.system.service.ISysMenuService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java index aa4135f..8ce6ec9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java @@ -1,22 +1,22 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysNoticeMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysNoticeService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysNotice; +import com.intc.system.domain.SysUser; +import com.intc.system.domain.bo.SysNoticeBo; +import com.intc.system.domain.vo.SysNoticeVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.mapper.SysNoticeMapper; +import com.intc.system.mapper.SysUserMapper; +import com.intc.system.service.ISysNoticeService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java index 9399c90..641bfa5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.mapper.SysOperLogMapper; -import org.dromara.system.service.ISysOperLogService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.AddressUtils; +import com.intc.common.log.event.OperLogEvent; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysOperLog; +import com.intc.system.domain.bo.SysOperLogBo; +import com.intc.system.domain.vo.SysOperLogVo; +import com.intc.system.mapper.SysOperLogMapper; +import com.intc.system.service.ISysOperLogService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssConfigServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssConfigServiceImpl.java index 539c1fc..36d04e1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,22 +8,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.mapper.SysOssConfigMapper; -import org.dromara.system.service.ISysOssConfigService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.ObjectUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.oss.constant.OssConstant; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.common.redis.utils.RedisUtils; +import com.intc.system.domain.SysOssConfig; +import com.intc.system.domain.bo.SysOssConfigBo; +import com.intc.system.domain.vo.SysOssConfigVo; +import com.intc.system.mapper.SysOssConfigMapper; +import com.intc.system.service.ISysOssConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssServiceImpl.java index 7b5ba2a..40a33db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOssServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; @@ -8,28 +8,28 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enums.AccessPolicyType; -import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.SysOssExt; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.mapper.SysOssMapper; -import org.dromara.system.service.ISysOssService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.domain.dto.OssDTO; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.OssService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.oss.core.OssClient; +import com.intc.common.oss.entity.UploadResult; +import com.intc.common.oss.enums.AccessPolicyType; +import com.intc.common.oss.factory.OssFactory; +import com.intc.system.domain.SysOss; +import com.intc.system.domain.SysOssExt; +import com.intc.system.domain.bo.SysOssBo; +import com.intc.system.domain.vo.SysOssVo; +import com.intc.system.mapper.SysOssMapper; +import com.intc.system.service.ISysOssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java index 4bf6974..8615ff5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java @@ -1,12 +1,12 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.service.PermissionService; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysMenuService; -import org.dromara.system.service.ISysPermissionService; -import org.dromara.system.service.ISysRoleService; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.service.PermissionService; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.service.ISysMenuService; +import com.intc.system.service.ISysPermissionService; +import com.intc.system.service.ISysRoleService; import org.springframework.stereotype.Service; import java.util.HashSet; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java index d80437b..fd42f70 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,22 +6,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.PostService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysPostMapper; -import org.dromara.system.mapper.SysUserPostMapper; -import org.dromara.system.service.ISysPostService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.PostService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysPost; +import com.intc.system.domain.SysUserPost; +import com.intc.system.domain.bo.SysPostBo; +import com.intc.system.domain.vo.SysPostVo; +import com.intc.system.mapper.SysDeptMapper; +import com.intc.system.mapper.SysPostMapper; +import com.intc.system.mapper.SysUserPostMapper; +import com.intc.system.service.ISysPostService; import org.springframework.stereotype.Service; import java.util.Collections; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java index 3136b1e..0992dbc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -11,29 +11,29 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.RoleService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysRoleService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.constant.TenantConstants; +import com.intc.common.core.domain.model.LoginUser; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.RoleService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.SysRole; +import com.intc.system.domain.SysRoleDept; +import com.intc.system.domain.SysRoleMenu; +import com.intc.system.domain.SysUserRole; +import com.intc.system.domain.bo.SysRoleBo; +import com.intc.system.domain.vo.SysRoleVo; +import com.intc.system.mapper.SysRoleDeptMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.mapper.SysRoleMenuMapper; +import com.intc.system.mapper.SysUserRoleMapper; +import com.intc.system.service.ISysRoleService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSensitiveServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSensitiveServiceImpl.java index 8a0d45e..d299e3a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSensitiveServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.tenant.helper.TenantHelper; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.common.sensitive.core.SensitiveService; +import com.intc.common.tenant.helper.TenantHelper; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSocialServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSocialServiceImpl.java index 9c54cbc..c826a27 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysSocialServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.mapper.SysSocialMapper; -import org.dromara.system.service.ISysSocialService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.system.domain.SysSocial; +import com.intc.system.domain.bo.SysSocialBo; +import com.intc.system.domain.vo.SysSocialVo; +import com.intc.system.mapper.SysSocialMapper; +import com.intc.system.service.ISysSocialService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTaskAssigneeServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTaskAssigneeServiceImpl.java index 7b31f7b..82c33a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -1,25 +1,25 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.service.TaskAssigneeService; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.dto.TaskAssigneeDTO; +import com.intc.common.core.domain.model.TaskAssigneeBody; +import com.intc.common.core.service.TaskAssigneeService; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.bo.SysDeptBo; +import com.intc.system.domain.bo.SysPostBo; +import com.intc.system.domain.bo.SysRoleBo; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.vo.SysDeptVo; +import com.intc.system.domain.vo.SysPostVo; +import com.intc.system.domain.vo.SysRoleVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.service.ISysDeptService; +import com.intc.system.service.ISysPostService; +import com.intc.system.service.ISysRoleService; +import com.intc.system.service.ISysUserService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantPackageServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantPackageServiceImpl.java index baefdf7..f72e5a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,19 +6,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.mapper.SysTenantMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysTenantPackageService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.system.domain.SysTenant; +import com.intc.system.domain.SysTenantPackage; +import com.intc.system.domain.bo.SysTenantPackageBo; +import com.intc.system.domain.vo.SysTenantPackageVo; +import com.intc.system.mapper.SysTenantMapper; +import com.intc.system.mapper.SysTenantPackageMapper; +import com.intc.system.service.ISysTenantPackageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantServiceImpl.java index 4442157..ce34a1f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysTenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -9,27 +9,27 @@ import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.intc.system.domain.*; +import com.intc.system.mapper.*; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -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.exception.ServiceException; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysTenantService; +import com.intc.common.core.constant.CacheNames; +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.exception.ServiceException; +import com.intc.common.core.service.WorkflowService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.redis.utils.CacheUtils; +import com.intc.common.tenant.core.TenantEntity; +import com.intc.common.tenant.helper.TenantHelper; +import com.intc.system.domain.bo.SysTenantBo; +import com.intc.system.domain.vo.SysTenantVo; +import com.intc.system.service.ISysTenantService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java index 888e092..4f61c1f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.intc.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,27 +11,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.intc.common.core.utils.*; +import com.intc.system.mapper.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysUserService; +import com.intc.common.core.constant.CacheNames; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.UserService; +import com.intc.common.core.service.UserService; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.system.domain.SysUser; +import com.intc.system.domain.SysUserPost; +import com.intc.system.domain.SysUserRole; +import com.intc.system.domain.bo.SysUserBo; +import com.intc.system.domain.vo.SysPostVo; +import com.intc.system.domain.vo.SysRoleVo; +import com.intc.system.domain.vo.SysUserExportVo; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.service.ISysUserService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/intc-modules/intc-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md rename to intc-modules/intc-system/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysClientMapper.xml index fd150ad..6d7e8e8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..1e9546b --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml index 928ad27..fddea77 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..872b6de --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..bfb0077 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml index e542a10..1c75929 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml index 9e78302..d0d772b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..8b7bc85 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..18bce9e --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysOssConfigMapper.xml index 8c2c080..812473f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysOssConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysOssMapper.xml index d9b25bd..c0d340e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysOssMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml index a753500..78d4bd2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..b895e81 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml index 7f69e01..2d71646 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..1b01a12 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysSocialMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysSocialMapper.xml index baa4b59..4e7ca1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysSocialMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysTenantMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysTenantMapper.xml index 0d96e13..9264f78 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml new file mode 100644 index 0000000..82c89e5 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml index 475c659..cbadbab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,12 +2,12 @@ - + - + - + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..da1f9c8 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..01b8a70 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/intc-modules/intc-tdengine/pom.xml b/intc-modules/intc-tdengine/pom.xml new file mode 100644 index 0000000..b48b6d7 --- /dev/null +++ b/intc-modules/intc-tdengine/pom.xml @@ -0,0 +1,112 @@ + + + + com.intc + intc-modules + ${revision} + + 4.0.0 + + intc-tdengine + + + TD数据模块 + + + + + + + com.intc + intc-common-core + + + + com.intc + intc-common-doc + + + + com.intc + intc-common-sms + + + + com.intc + intc-common-mail + + + + com.intc + intc-common-redis + + + + com.intc + intc-common-idempotent + + + + com.intc + intc-common-mybatis + + + + com.intc + intc-common-log + + + + com.intc + intc-common-excel + + + + com.intc + intc-common-security + + + + com.intc + intc-common-web + + + + com.intc + intc-common-ratelimiter + + + + com.intc + intc-common-translation + + + + com.intc + intc-common-sensitive + + + + com.intc + intc-common-encrypt + + + + com.intc + intc-common-tenant + + + + com.intc + intc-common-websocket + + + com.taosdata.jdbc + taos-jdbcdriver + 2.0.40 + + + + diff --git a/ruoyi-modules/ruoyi-tdengine/src/main/resources/mapper/package-info.md b/intc-modules/intc-tdengine/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-tdengine/src/main/resources/mapper/package-info.md rename to intc-modules/intc-tdengine/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/intc-modules/intc-workflow/pom.xml similarity index 51% rename from ruoyi-modules/ruoyi-workflow/pom.xml rename to intc-modules/intc-workflow/pom.xml index d195faf..482360d 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/intc-modules/intc-workflow/pom.xml @@ -3,14 +3,14 @@ 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"> - org.dromara - ruoyi-modules + com.intc + intc-modules ${revision} ../pom.xml 4.0.0 jar - ruoyi-workflow + intc-workflow 工作流模块 @@ -19,56 +19,56 @@ - org.dromara - ruoyi-common-sse + com.intc + intc-common-sse - org.dromara - ruoyi-common-doc + com.intc + intc-common-doc - org.dromara - ruoyi-common-mail + com.intc + intc-common-mail - org.dromara - ruoyi-common-sms + com.intc + intc-common-sms - org.dromara - ruoyi-common-mybatis + com.intc + intc-common-mybatis - org.dromara - ruoyi-common-web + com.intc + intc-common-web - org.dromara - ruoyi-common-log + com.intc + intc-common-log - org.dromara - ruoyi-common-idempotent + com.intc + intc-common-idempotent - org.dromara - ruoyi-common-excel + com.intc + intc-common-excel - org.dromara - ruoyi-common-translation + com.intc + intc-common-translation - org.dromara - ruoyi-common-tenant + com.intc + intc-common-tenant - org.dromara - ruoyi-common-security + com.intc + intc-common-security org.dromara.warm diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/ConditionalOnEnable.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/ConditionalOnEnable.java index e844398..75697bd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/ConditionalOnEnable.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common; +package com.intc.workflow.common; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/constant/FlowConstant.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/constant/FlowConstant.java index cacb2a2..ef83ab2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/constant/FlowConstant.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.constant; +package com.intc.workflow.common.constant; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/ButtonPermissionEnum.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/ButtonPermissionEnum.java index 598cd05..81f4a87 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/ButtonPermissionEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/CopySettingEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/CopySettingEnum.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/CopySettingEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/CopySettingEnum.java index a74af3b..889e7f2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/CopySettingEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/CopySettingEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/MessageTypeEnum.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/MessageTypeEnum.java index 0fe5cfe..8c80479 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/MessageTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/NodeExtEnum.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/NodeExtEnum.java index 9926a8e..aadf25b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/NodeExtEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; /** * 节点扩展属性枚举 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeEnum.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeEnum.java index fff2688..62f725a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeEnum.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeType.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeType.java index eed1b91..9a3eb15 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskAssigneeType.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskStatusEnum.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskStatusEnum.java index c7bced8..96cf85d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/VariablesEnum.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/VariablesEnum.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/VariablesEnum.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/VariablesEnum.java index dbd54ed..22fb469 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/VariablesEnum.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/common/enums/VariablesEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.intc.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/config/WarmFlowConfig.java similarity index 65% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/config/WarmFlowConfig.java index 08f1808..e771aa2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/config/WarmFlowConfig.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.config; +package com.intc.workflow.config; -import org.dromara.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.ConditionalOnEnable; import org.springframework.context.annotation.Configuration; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwCategoryController.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwCategoryController.java index 3007921..99fff81 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwCategoryController.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; -import org.dromara.workflow.service.IFlwCategoryService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.web.core.BaseController; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.domain.bo.FlowCategoryBo; +import com.intc.workflow.domain.vo.FlowCategoryVo; +import com.intc.workflow.service.IFlwCategoryService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwDefinitionController.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwDefinitionController.java index 10d9de8..721560b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwDefinitionController.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.intc.common.core.domain.R; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; -import org.dromara.workflow.service.IFlwDefinitionService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.vo.FlowDefinitionVo; +import com.intc.workflow.service.IFlwDefinitionService; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwInstanceController.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwInstanceController.java index c798dc5..6f5c1f3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwInstanceController.java @@ -1,21 +1,21 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.intc.common.core.domain.R; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; import org.dromara.warm.flow.core.service.InsService; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.bo.FlowVariableBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; -import org.dromara.workflow.service.IFlwInstanceService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.bo.FlowCancelBo; +import com.intc.workflow.domain.bo.FlowInstanceBo; +import com.intc.workflow.domain.bo.FlowInvalidBo; +import com.intc.workflow.domain.bo.FlowVariableBo; +import com.intc.workflow.domain.vo.FlowInstanceVo; +import com.intc.workflow.service.IFlwInstanceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwSpelController.java similarity index 76% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwSpelController.java index 212b659..c94bb43 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwSpelController.java @@ -1,22 +1,22 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.FlowSpelBo; -import org.dromara.workflow.domain.vo.FlowSpelVo; -import org.dromara.workflow.service.IFlwSpelService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.bo.FlowSpelBo; +import com.intc.workflow.domain.vo.FlowSpelVo; +import com.intc.workflow.service.IFlwSpelService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwTaskController.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwTaskController.java index 4370ff8..9688102 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/FlwTaskController.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; +import com.intc.workflow.domain.bo.*; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.intc.common.core.domain.R; +import com.intc.common.core.domain.dto.StartProcessReturnDTO; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowNode; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; -import org.dromara.workflow.service.IFlwTaskService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.vo.FlowHisTaskVo; +import com.intc.workflow.domain.vo.FlowTaskVo; +import com.intc.workflow.service.IFlwTaskService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/TestLeaveController.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/TestLeaveController.java index 39bb41f..4539028 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/controller/TestLeaveController.java @@ -1,24 +1,24 @@ -package org.dromara.workflow.controller; +package com.intc.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.service.ITestLeaveService; +import com.intc.common.core.domain.R; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.excel.utils.ExcelUtil; +import com.intc.common.idempotent.annotation.RepeatSubmit; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.web.core.BaseController; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.bo.TestLeaveBo; +import com.intc.workflow.domain.vo.TestLeaveVo; +import com.intc.workflow.service.ITestLeaveService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowCategory.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowCategory.java index 28918f1..dc4365b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowCategory.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain; +package com.intc.workflow.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import java.io.Serial; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowInstanceBizExt.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowInstanceBizExt.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowInstanceBizExt.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowInstanceBizExt.java index 932b038..9302405 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowInstanceBizExt.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowInstanceBizExt.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain; +package com.intc.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.intc.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowSpel.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowSpel.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowSpel.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowSpel.java index be74ccb..2659600 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowSpel.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/FlowSpel.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain; +package com.intc.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/TestLeave.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/TestLeave.java index b54873c..5913346 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/TestLeave.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain; +package com.intc.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/BackProcessBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/BackProcessBo.java index 654bf08..6ffe628 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/BackProcessBo.java @@ -1,9 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/CompleteTaskBo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/CompleteTaskBo.java index e246293..7a7dc86 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/CompleteTaskBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCancelBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCancelBo.java index 31742ea..0cdf9af 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCancelBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCategoryBo.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCategoryBo.java index fd626eb..67fa890 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCategoryBo.java @@ -1,14 +1,14 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.FlowCategory; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.workflow.domain.FlowCategory; /** * 流程分类业务对象 wf_category diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCopyBo.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCopyBo.java index a45e521..035be4d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowCopyBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInstanceBo.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInstanceBo.java index fb1fe61..7bee9e7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInstanceBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInvalidBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInvalidBo.java index 297bd00..b551462 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowInvalidBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowNextNodeBo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowNextNodeBo.java index 12f0653..6926ff7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowNextNodeBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowSpelBo.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowSpelBo.java index ebad8ea..1b56ca3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowSpelBo.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.workflow.domain.FlowSpel; +import com.intc.workflow.domain.FlowSpel; /** * 流程spel达式定义业务对象 flow_spel diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTaskBo.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTaskBo.java index 64dd082..6bb7f6c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTaskBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTerminationBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTerminationBo.java index 897fc21..f0ea17d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowTerminationBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowUrgeTaskBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowUrgeTaskBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowUrgeTaskBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowUrgeTaskBo.java index 8e51b12..1868844 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowUrgeTaskBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowUrgeTaskBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowVariableBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowVariableBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowVariableBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowVariableBo.java index 9361299..d12b838 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowVariableBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/FlowVariableBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.intc.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/StartProcessBo.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/StartProcessBo.java index b31f4fa..3dc75db 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/StartProcessBo.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import cn.hutool.core.util.ObjectUtil; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.workflow.domain.FlowInstanceBizExt; +import com.intc.common.core.validate.AddGroup; +import com.intc.workflow.domain.FlowInstanceBizExt; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TaskOperationBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TaskOperationBo.java index 4348e31..5246e83 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TaskOperationBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TestLeaveBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TestLeaveBo.java index 2463569..ce96752 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/bo/TestLeaveBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.intc.workflow.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.TestLeave; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.workflow.domain.TestLeave; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/ButtonPermissionVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/ButtonPermissionVo.java index 7175e5e..a74c727 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/ButtonPermissionVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCategoryVo.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCategoryVo.java index c5427a5..51c0545 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCategoryVo.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.FlowCategory; +import com.intc.common.translation.annotation.Translation; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.domain.FlowCategory; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCopyVo.java similarity index 76% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCopyVo.java index 67ef9e2..440c0f3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowCopyVo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowDefinitionVo.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowDefinitionVo.java index aef7573..4fa2ed4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowDefinitionVo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.workflow.common.constant.FlowConstant; +import com.intc.common.translation.annotation.Translation; +import com.intc.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowHisTaskVo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowHisTaskVo.java index ee0fd63..890b290 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowHisTaskVo.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; import org.dromara.warm.flow.core.enums.CooperateType; -import org.dromara.workflow.common.constant.FlowConstant; +import com.intc.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowInstanceVo.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowInstanceVo.java index fce6725..ee0781b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowInstanceVo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.workflow.common.constant.FlowConstant; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; +import com.intc.workflow.common.constant.FlowConstant; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowSpelVo.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowSpelVo.java index 24f1437..feba0da 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowSpelVo.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.intc.common.excel.annotation.ExcelDictFormat; +import com.intc.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.FlowSpel; +import com.intc.workflow.domain.FlowSpel; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowTaskVo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowTaskVo.java index 25a7d85..fdace7d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/FlowTaskVo.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.intc.common.translation.annotation.Translation; +import com.intc.common.translation.constant.TransConstant; import org.dromara.warm.flow.core.entity.User; -import org.dromara.workflow.common.constant.FlowConstant; +import com.intc.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/NodeExtVo.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/NodeExtVo.java index 5fb3380..33cd437 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/NodeExtVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/TestLeaveVo.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/TestLeaveVo.java index 2f34158..3f3cc2b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/domain/vo/TestLeaveVo.java @@ -1,11 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.intc.workflow.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.TestLeave; +import com.intc.workflow.domain.TestLeave; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/FlowProcessEventHandler.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/FlowProcessEventHandler.java index 91b608c..2656bfa 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/FlowProcessEventHandler.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.handler; +package com.intc.workflow.handler; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.domain.event.ProcessDeleteEvent; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.tenant.helper.TenantHelper; +import com.intc.common.core.domain.event.ProcessTaskEvent; +import com.intc.common.core.domain.event.ProcessDeleteEvent; +import com.intc.common.core.domain.event.ProcessEvent; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.tenant.helper.TenantHelper; import org.dromara.warm.flow.core.entity.Instance; -import org.dromara.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.ConditionalOnEnable; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/WorkflowPermissionHandler.java similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/WorkflowPermissionHandler.java index e908a20..1e43176 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/handler/WorkflowPermissionHandler.java @@ -1,17 +1,17 @@ -package org.dromara.workflow.handler; +package com.intc.workflow.handler; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.handler.PermissionHandler; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.service.IFlwTaskAssigneeService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.service.IFlwTaskAssigneeService; import org.springframework.stereotype.Component; import java.util.Collections; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/listener/WorkflowGlobalListener.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/listener/WorkflowGlobalListener.java index 2390bb2..1b35a4c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/listener/WorkflowGlobalListener.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.listener; +package com.intc.workflow.listener; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -7,10 +7,10 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.enums.BusinessStatusEnum; +import com.intc.common.core.service.UserService; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.Definition; @@ -18,16 +18,16 @@ import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.core.listener.GlobalListener; import org.dromara.warm.flow.core.listener.ListenerVariable; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.bo.FlowCopyBo; -import org.dromara.workflow.domain.vo.NodeExtVo; -import org.dromara.workflow.handler.FlowProcessEventHandler; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwNodeExtService; -import org.dromara.workflow.service.IFlwTaskService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.common.enums.TaskStatusEnum; +import com.intc.workflow.domain.bo.FlowCopyBo; +import com.intc.workflow.domain.vo.NodeExtVo; +import com.intc.workflow.handler.FlowProcessEventHandler; +import com.intc.workflow.service.IFlwCommonService; +import com.intc.workflow.service.IFlwInstanceService; +import com.intc.workflow.service.IFlwNodeExtService; +import com.intc.workflow.service.IFlwTaskService; import org.springframework.stereotype.Component; import java.util.HashMap; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwCategoryMapper.java similarity index 77% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwCategoryMapper.java index 7199d5c..96b2700 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwCategoryMapper.java @@ -1,12 +1,10 @@ -package org.dromara.workflow.mapper; +package com.intc.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.vo.FlowCategoryVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.common.mybatis.helper.DataBaseHelper; +import com.intc.workflow.domain.FlowCategory; +import com.intc.workflow.domain.vo.FlowCategoryVo; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceBizExtMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceBizExtMapper.java index e11613c..5abf0c5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceBizExtMapper.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.mapper; +package com.intc.workflow.mapper; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.FlowInstanceBizExt; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.workflow.domain.FlowInstanceBizExt; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceMapper.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceMapper.java index 92809c8..0d792b7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwInstanceMapper.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.mapper; +package com.intc.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; +import com.intc.workflow.domain.bo.FlowInstanceBo; +import com.intc.workflow.domain.vo.FlowInstanceVo; /** * 实例信息Mapper接口 diff --git a/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwSpelMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwSpelMapper.java new file mode 100644 index 0000000..61671e8 --- /dev/null +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwSpelMapper.java @@ -0,0 +1,15 @@ +package com.intc.workflow.mapper; + +import com.intc.workflow.domain.FlowSpel; +import com.intc.workflow.domain.vo.FlowSpelVo; +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 流程spel达式定义Mapper接口 + * + * @author Michelle.Chung + * @date 2025-07-04 + */ +public interface FlwSpelMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwTaskMapper.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwTaskMapper.java index 0d0422d..53d442d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/FlwTaskMapper.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.mapper; +package com.intc.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.workflow.domain.bo.FlowTaskBo; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; +import com.intc.workflow.domain.bo.FlowTaskBo; +import com.intc.workflow.domain.vo.FlowHisTaskVo; +import com.intc.workflow.domain.vo.FlowTaskVo; /** diff --git a/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/TestLeaveMapper.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/TestLeaveMapper.java new file mode 100644 index 0000000..2a62c27 --- /dev/null +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/mapper/TestLeaveMapper.java @@ -0,0 +1,15 @@ +package com.intc.workflow.mapper; + +import com.intc.common.mybatis.core.mapper.BaseMapperPlus; +import com.intc.workflow.domain.TestLeave; +import com.intc.workflow.domain.vo.TestLeaveVo; + +/** + * 请假Mapper接口 + * + * @author may + * @date 2023-07-21 + */ +public interface TestLeaveMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/rule/SpelRuleComponent.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/rule/SpelRuleComponent.java index 7498db5..c79292f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/rule/SpelRuleComponent.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.rule; +package com.intc.workflow.rule; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.workflow.common.ConditionalOnEnable; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.DeptService; +import com.intc.workflow.common.ConditionalOnEnable; import org.springframework.stereotype.Component; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCategoryService.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCategoryService.java index f66882b..4b1e490 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCategoryService.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; +import com.intc.workflow.domain.bo.FlowCategoryBo; +import com.intc.workflow.domain.vo.FlowCategoryVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCommonService.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCommonService.java index f809f47..569a67c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwCommonService.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.core.domain.dto.UserDTO; +import com.intc.common.core.domain.dto.UserDTO; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwDefinitionService.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwDefinitionService.java index 54743b7..ece8799 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwDefinitionService.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; +import com.intc.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwInstanceService.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwInstanceService.java index 54ffe97..989095d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwInstanceService.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; import org.dromara.warm.flow.orm.entity.FlowInstance; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.bo.FlowVariableBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; +import com.intc.workflow.domain.bo.FlowCancelBo; +import com.intc.workflow.domain.bo.FlowInstanceBo; +import com.intc.workflow.domain.bo.FlowInvalidBo; +import com.intc.workflow.domain.bo.FlowVariableBo; +import com.intc.workflow.domain.vo.FlowInstanceVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwNodeExtService.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwNodeExtService.java index 2ccc6a7..abf96a7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwNodeExtService.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.workflow.domain.vo.NodeExtVo; +import com.intc.workflow.domain.vo.NodeExtVo; /** * 流程节点扩展属性 服务层 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwSpelService.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwSpelService.java index 0278168..1179cf1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwSpelService.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.FlowSpelBo; -import org.dromara.workflow.domain.vo.FlowSpelVo; +import com.intc.common.core.domain.dto.TaskAssigneeDTO; +import com.intc.common.core.domain.model.TaskAssigneeBody; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.workflow.domain.bo.FlowSpelBo; +import com.intc.workflow.domain.vo.FlowSpelVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskAssigneeService.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskAssigneeService.java index 830abaf..21205cf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskAssigneeService.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.core.domain.dto.UserDTO; +import com.intc.common.core.domain.dto.UserDTO; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskService.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskService.java index f9dc45e..f3ee97b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/IFlwTaskService.java @@ -1,17 +1,17 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.core.domain.dto.StartProcessReturnDTO; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.workflow.domain.bo.*; +import com.intc.workflow.domain.vo.FlowHisTaskVo; +import com.intc.workflow.domain.vo.FlowTaskVo; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.orm.entity.FlowHisTask; import org.dromara.warm.flow.orm.entity.FlowNode; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/ITestLeaveService.java similarity index 75% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/ITestLeaveService.java index 748a2b1..f842ada 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/ITestLeaveService.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.service; +package com.intc.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.workflow.domain.bo.TestLeaveBo; +import com.intc.workflow.domain.vo.TestLeaveVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/CategoryNameTranslationImpl.java similarity index 65% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/CategoryNameTranslationImpl.java index 883a967..c19a27a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/CategoryNameTranslationImpl.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.service.IFlwCategoryService; +import com.intc.common.translation.annotation.TranslationType; +import com.intc.common.translation.core.TranslationInterface; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.service.IFlwCategoryService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCategoryServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCategoryServiceImpl.java index 1e2f6c2..5926a70 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -6,21 +6,21 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.intc.common.core.utils.*; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.helper.DataBaseHelper; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.mybatis.helper.DataBaseHelper; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.warm.flow.ui.service.CategoryService; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.service.IFlwCategoryService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.domain.FlowCategory; +import com.intc.workflow.domain.bo.FlowCategoryBo; +import com.intc.workflow.domain.vo.FlowCategoryVo; +import com.intc.workflow.mapper.FlwCategoryMapper; +import com.intc.workflow.service.IFlwCategoryService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwChartExtServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwChartExtServiceImpl.java index cb82cbe..4b0fb56 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwChartExtServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.service.DeptService; +import com.intc.common.core.service.DictService; +import com.intc.common.core.service.UserService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.dto.NodeJson; import org.dromara.warm.flow.core.dto.PromptContent; @@ -22,8 +22,8 @@ import org.dromara.warm.flow.core.utils.MapUtil; import org.dromara.warm.flow.orm.entity.FlowHisTask; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.ui.service.ChartExtService; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCommonServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCommonServiceImpl.java index 8f8d61e..60ce582 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwCommonServiceImpl.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.sse.dto.SseMessageDto; -import org.dromara.common.sse.utils.SseMessageUtils; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mail.utils.MailUtils; +import com.intc.common.sse.dto.SseMessageDto; +import com.intc.common.sse.utils.SseMessageUtils; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.MessageTypeEnum; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwTaskService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.enums.MessageTypeEnum; +import com.intc.workflow.service.IFlwCommonService; +import com.intc.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwDefinitionServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwDefinitionServiceImpl.java index d57ddbe..da9e738 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; @@ -28,13 +28,13 @@ import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; import org.dromara.warm.flow.orm.mapper.FlowSkipMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwDefinitionService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.domain.FlowCategory; +import com.intc.workflow.domain.vo.FlowDefinitionVo; +import com.intc.workflow.mapper.FlwCategoryMapper; +import com.intc.workflow.service.IFlwCommonService; +import com.intc.workflow.service.IFlwDefinitionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.dromara.common.core.constant.TenantConstants.DEFAULT_TENANT_ID; +import static com.intc.common.core.constant.TenantConstants.DEFAULT_TENANT_ID; /** * 流程定义 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwInstanceServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwInstanceServiceImpl.java index d5737ee..506b55e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwInstanceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; +import com.intc.common.core.enums.BusinessStatusEnum; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.constant.ExceptionCons; import org.dromara.warm.flow.core.dto.FlowParams; @@ -34,19 +34,19 @@ import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.warm.flow.orm.entity.FlowTask; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.bo.FlowVariableBo; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; -import org.dromara.workflow.handler.FlowProcessEventHandler; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwInstanceMapper; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwTaskService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.enums.TaskStatusEnum; +import com.intc.workflow.domain.bo.FlowCancelBo; +import com.intc.workflow.domain.bo.FlowInstanceBo; +import com.intc.workflow.domain.bo.FlowInvalidBo; +import com.intc.workflow.domain.bo.FlowVariableBo; +import com.intc.workflow.domain.vo.FlowHisTaskVo; +import com.intc.workflow.domain.vo.FlowInstanceVo; +import com.intc.workflow.handler.FlowProcessEventHandler; +import com.intc.workflow.mapper.FlwCategoryMapper; +import com.intc.workflow.mapper.FlwInstanceMapper; +import com.intc.workflow.service.IFlwInstanceService; +import com.intc.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwNodeExtServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwNodeExtServiceImpl.java index b5f4c6d..e2e6d81 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwNodeExtServiceImpl.java @@ -1,24 +1,24 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.DictTypeDTO; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.intc.common.core.domain.dto.DictTypeDTO; +import com.intc.common.core.service.DictService; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.json.utils.JsonUtils; import org.dromara.warm.flow.ui.service.NodeExtService; import org.dromara.warm.flow.ui.vo.NodeExt; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.ButtonPermissionEnum; -import org.dromara.workflow.common.enums.CopySettingEnum; -import org.dromara.workflow.common.enums.NodeExtEnum; -import org.dromara.workflow.common.enums.VariablesEnum; -import org.dromara.workflow.domain.vo.ButtonPermissionVo; -import org.dromara.workflow.domain.vo.NodeExtVo; -import org.dromara.workflow.service.IFlwNodeExtService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.enums.ButtonPermissionEnum; +import com.intc.workflow.common.enums.CopySettingEnum; +import com.intc.workflow.common.enums.NodeExtEnum; +import com.intc.workflow.common.enums.VariablesEnum; +import com.intc.workflow.domain.vo.ButtonPermissionVo; +import com.intc.workflow.domain.vo.NodeExtVo; +import com.intc.workflow.service.IFlwNodeExtService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwSpelServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwSpelServiceImpl.java index e06b314..b849054 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwSpelServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,20 +6,20 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.FlowSpel; -import org.dromara.workflow.domain.bo.FlowSpelBo; -import org.dromara.workflow.domain.vo.FlowSpelVo; -import org.dromara.workflow.mapper.FlwSpelMapper; -import org.dromara.workflow.service.IFlwSpelService; +import com.intc.common.core.constant.SystemConstants; +import com.intc.common.core.domain.dto.TaskAssigneeDTO; +import com.intc.common.core.domain.model.TaskAssigneeBody; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.FlowSpel; +import com.intc.workflow.domain.bo.FlowSpelBo; +import com.intc.workflow.domain.vo.FlowSpelVo; +import com.intc.workflow.mapper.FlwSpelMapper; +import com.intc.workflow.service.IFlwSpelService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskAssigneeServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index 9e9c091..f7ee261 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,27 +6,27 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Pair; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; +import com.intc.common.core.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.DeptDTO; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.enums.FormatsType; -import org.dromara.common.core.service.*; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.dto.DeptDTO; +import com.intc.common.core.domain.dto.TaskAssigneeDTO; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.domain.model.TaskAssigneeBody; +import com.intc.common.core.enums.FormatsType; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; import org.dromara.warm.flow.ui.dto.HandlerFunDto; import org.dromara.warm.flow.ui.dto.HandlerQuery; import org.dromara.warm.flow.ui.dto.TreeFunDto; import org.dromara.warm.flow.ui.service.HandlerSelectService; import org.dromara.warm.flow.ui.vo.HandlerFeedBackVo; import org.dromara.warm.flow.ui.vo.HandlerSelectVo; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.TaskAssigneeEnum; -import org.dromara.workflow.service.IFlwSpelService; -import org.dromara.workflow.service.IFlwTaskAssigneeService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.enums.TaskAssigneeEnum; +import com.intc.workflow.service.IFlwSpelService; +import com.intc.workflow.service.IFlwTaskAssigneeService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskServiceImpl.java index 81807b5..11e9381 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/FlwTaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,22 +10,39 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.intc.common.core.domain.dto.StartProcessReturnDTO; +import com.intc.common.core.domain.dto.UserDTO; +import com.intc.common.core.enums.BusinessStatusEnum; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.UserService; +import com.intc.common.core.utils.StreamUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ValidatorUtils; +import com.intc.common.core.validate.AddGroup; +import com.intc.common.core.validate.EditGroup; +import com.intc.common.json.utils.JsonUtils; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.common.satoken.utils.LoginHelper; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.constant.FlowConstant; +import com.intc.workflow.common.enums.TaskAssigneeType; +import com.intc.workflow.common.enums.TaskStatusEnum; +import com.intc.workflow.domain.FlowInstanceBizExt; +import com.intc.workflow.domain.bo.*; +import com.intc.workflow.domain.vo.FlowCopyVo; +import com.intc.workflow.domain.vo.FlowHisTaskVo; +import com.intc.workflow.domain.vo.FlowTaskVo; +import com.intc.workflow.domain.vo.NodeExtVo; +import com.intc.workflow.mapper.FlwCategoryMapper; +import com.intc.workflow.mapper.FlwInstanceBizExtMapper; +import com.intc.workflow.mapper.FlwTaskMapper; +import com.intc.workflow.service.IFlwCommonService; +import com.intc.workflow.service.IFlwNodeExtService; +import com.intc.workflow.service.IFlwTaskAssigneeService; +import com.intc.workflow.service.IFlwTaskService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.*; @@ -40,30 +57,13 @@ import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.TaskAssigneeType; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.FlowInstanceBizExt; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowCopyVo; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; -import org.dromara.workflow.domain.vo.NodeExtVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwInstanceBizExtMapper; -import org.dromara.workflow.mapper.FlwTaskMapper; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwNodeExtService; -import org.dromara.workflow.service.IFlwTaskAssigneeService; -import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; -import static org.dromara.workflow.common.constant.FlowConstant.*; +import static com.intc.workflow.common.constant.FlowConstant.*; /** * 任务 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/TestLeaveServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/TestLeaveServiceImpl.java index 5f2246f..5747b02 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/TestLeaveServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -10,24 +10,24 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.StartProcessDTO; -import org.dromara.common.core.domain.event.ProcessDeleteEvent; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.TestLeave; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.mapper.TestLeaveMapper; -import org.dromara.workflow.service.ITestLeaveService; +import com.intc.common.core.domain.dto.StartProcessDTO; +import com.intc.common.core.domain.event.ProcessDeleteEvent; +import com.intc.common.core.domain.event.ProcessEvent; +import com.intc.common.core.domain.event.ProcessTaskEvent; +import com.intc.common.core.enums.BusinessStatusEnum; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.WorkflowService; +import com.intc.common.core.utils.MapstructUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.mybatis.core.domain.BaseEntity; +import com.intc.common.mybatis.core.page.PageQuery; +import com.intc.common.mybatis.core.page.TableDataInfo; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.domain.TestLeave; +import com.intc.workflow.domain.bo.TestLeaveBo; +import com.intc.workflow.domain.vo.TestLeaveVo; +import com.intc.workflow.mapper.TestLeaveMapper; +import com.intc.workflow.service.ITestLeaveService; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/WorkflowServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java rename to intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/WorkflowServiceImpl.java index 6ef0c3e..cf808ff 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/intc-modules/intc-workflow/src/main/java/com/intc/workflow/service/impl/WorkflowServiceImpl.java @@ -1,22 +1,22 @@ -package org.dromara.workflow.service.impl; +package com.intc.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.dto.CompleteTaskDTO; -import org.dromara.common.core.domain.dto.StartProcessDTO; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.StringUtils; +import com.intc.common.core.domain.dto.CompleteTaskDTO; +import com.intc.common.core.domain.dto.StartProcessDTO; +import com.intc.common.core.domain.dto.StartProcessReturnDTO; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.service.WorkflowService; +import com.intc.common.core.utils.StringUtils; import org.dromara.warm.flow.orm.entity.FlowInstance; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.MessageTypeEnum; -import org.dromara.workflow.domain.bo.CompleteTaskBo; -import org.dromara.workflow.domain.bo.StartProcessBo; -import org.dromara.workflow.service.IFlwDefinitionService; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwTaskService; +import com.intc.workflow.common.ConditionalOnEnable; +import com.intc.workflow.common.enums.MessageTypeEnum; +import com.intc.workflow.domain.bo.CompleteTaskBo; +import com.intc.workflow.domain.bo.StartProcessBo; +import com.intc.workflow.service.IFlwDefinitionService; +import com.intc.workflow.service.IFlwInstanceService; +import com.intc.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/intc-modules/intc-workflow/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md rename to intc-modules/intc-workflow/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml rename to intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml index 10c948d..6f2ff22 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml +++ b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml rename to intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml index 79cf4c5..8db4ed5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml +++ b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml rename to intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml index 0ae7adb..f13fe2e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml +++ b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml rename to intc-modules/intc-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml index d52f6b0..624e795 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml +++ b/intc-modules/intc-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/pom.xml b/intc-modules/pom.xml similarity index 56% rename from ruoyi-modules/pom.xml rename to intc-modules/pom.xml index c42af1b..16d96f8 100644 --- a/ruoyi-modules/pom.xml +++ b/intc-modules/pom.xml @@ -3,23 +3,23 @@ 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"> - ruoyi-vue-plus - org.dromara + intc-vue-plus + com.intc ${revision} 4.0.0 - ruoyi-demo - ruoyi-generator - ruoyi-job - ruoyi-system - ruoyi-workflow - ruoyi-fishery - ruoyi-tdengine + intc-demo + intc-generator + intc-job + intc-system + intc-workflow + intc-fishery + intc-tdengine - ruoyi-modules + intc-modules pom diff --git a/pom.xml b/pom.xml index 35506da..3a6ce82 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-vue-plus + com.intc + intc-vue-plus ${revision} - RuoYi-Vue-Plus + intc-vue-plus https://gitee.com/dromara/RuoYi-Vue-Plus - Dromara RuoYi-Vue-Plus多租户管理系统 + intc-vue-plus多租户管理系统 5.5.0 @@ -123,8 +123,8 @@ - org.dromara - ruoyi-common-bom + com.intc + intc-common-bom ${revision} pom import @@ -334,33 +334,33 @@ - org.dromara - ruoyi-system + com.intc + intc-system ${revision} - org.dromara - ruoyi-job + com.intc + intc-job ${revision} - org.dromara - ruoyi-generator + com.intc + intc-generator ${revision} - org.dromara - ruoyi-demo + com.intc + intc-demo ${revision} - org.dromara - ruoyi-workflow + com.intc + intc-workflow ${revision} @@ -368,10 +368,10 @@ - ruoyi-admin - ruoyi-common - ruoyi-extend - ruoyi-modules + intc-admin + intc-common + intc-extend + intc-modules pom diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index 2930fd0..0000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - - - ruoyi-common-bom - ruoyi-common-social - ruoyi-common-core - ruoyi-common-doc - ruoyi-common-excel - ruoyi-common-idempotent - ruoyi-common-job - ruoyi-common-log - ruoyi-common-mail - ruoyi-common-mybatis - ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-redis - ruoyi-common-satoken - ruoyi-common-security - ruoyi-common-sms - ruoyi-common-web - ruoyi-common-translation - ruoyi-common-sensitive - ruoyi-common-json - ruoyi-common-encrypt - ruoyi-common-tenant - ruoyi-common-websocket - ruoyi-common-sse - - - ruoyi-common - pom - - - common 通用模块 - - - diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5c3db08..0000000 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,4 +0,0 @@ -org.dromara.common.core.config.ApplicationConfig -org.dromara.common.core.config.ThreadPoolConfig -org.dromara.common.core.config.ValidatorConfig -org.dromara.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fe11e76..0000000 --- a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 132cf29..0000000 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -org.dromara.common.encrypt.config.EncryptorAutoConfiguration -org.dromara.common.encrypt.config.ApiDecryptAutoConfiguration - diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f2fa958..0000000 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3aa1881..0000000 --- a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1625397..0000000 --- a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6893020..0000000 --- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ef0cf11..0000000 --- a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index cc625da..0000000 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3b95432..0000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0475b19..0000000 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.dromara.common.redis.config.RedisConfig -org.dromara.common.redis.config.CacheConfig diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6dd284f..0000000 --- a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6def724..0000000 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.dromara.common.security.handler.AllUrlHandler -org.dromara.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5919ce3..0000000 --- a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fc544a0..0000000 --- a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.social.config.SocialAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b809713..0000000 --- a/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.sse.config.SseAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f837191..0000000 --- a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.tenant.config.TenantConfig diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ad40205..0000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,6 +0,0 @@ -org.dromara.common.translation.config.TranslationConfig -org.dromara.common.translation.core.impl.DeptNameTranslationImpl -org.dromara.common.translation.core.impl.DictTypeTranslationImpl -org.dromara.common.translation.core.impl.OssUrlTranslationImpl -org.dromara.common.translation.core.impl.UserNameTranslationImpl -org.dromara.common.translation.core.impl.NicknameTranslationImpl diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fc10a36..0000000 --- a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -org.dromara.common.web.config.CaptchaConfig -org.dromara.common.web.config.FilterConfig -org.dromara.common.web.config.I18nConfig -org.dromara.common.web.config.ResourcesConfig -org.dromara.common.web.config.UndertowConfig diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c3a7305..0000000 --- a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.websocket.config.WebSocketConfig diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml deleted file mode 100644 index 119fe61..0000000 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-demo - - - demo模块 - - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-redis - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-translation - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-websocket - - - - - diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java deleted file mode 100644 index 16c30f8..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.controller; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java deleted file mode 100644 index cb7d83f..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.domain; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java deleted file mode 100644 index e5f4c44..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.demo.mapper; - -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.vo.TestTreeVo; - -/** - * 测试树表Mapper接口 - * - * @author Lion Li - * @date 2021-07-26 - */ -@DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") -}) -public interface TestTreeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java deleted file mode 100644 index ff1c4df..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.mapper; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java deleted file mode 100644 index 7011984..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service.impl; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java deleted file mode 100644 index 16727ff..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service; diff --git a/ruoyi-modules/ruoyi-fishery/pom.xml b/ruoyi-modules/ruoyi-fishery/pom.xml deleted file mode 100644 index e9af1c1..0000000 --- a/ruoyi-modules/ruoyi-fishery/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-fishery - - - 鱼测云模块 - - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-redis - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-translation - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-websocket - - - - - diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/AquUserMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/AquUserMapper.java deleted file mode 100644 index c31d2b0..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/AquUserMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.AquUser; -import org.dromara.fishery.domain.vo.AquUserVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 养殖用户管理Mapper接口 - * - * @author intc - * @date 2025-10-11 - */ -public interface AquUserMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java deleted file mode 100644 index 10f1501..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceBindRecordMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.DeviceBindRecord; -import org.dromara.fishery.domain.vo.DeviceBindRecordVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 设备绑定记录Mapper接口 - * - * @author intc - * @date 2025-10-14 - */ -public interface DeviceBindRecordMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceCorrectRecordMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceCorrectRecordMapper.java deleted file mode 100644 index 748d29b..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceCorrectRecordMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.DeviceCorrectRecord; -import org.dromara.fishery.domain.vo.DeviceCorrectRecordVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; - -/** - * 设备校准记录Mapper接口 - * - * @author intc - * @date 2025-10-17 - */ -public interface DeviceCorrectRecordMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceErrorCodeMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceErrorCodeMapper.java deleted file mode 100644 index 3362c9d..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceErrorCodeMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.DeviceErrorCode; -import org.dromara.fishery.domain.vo.DeviceErrorCodeVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; - -/** - * 设备故障码Mapper接口 - * - * @author intc - * @date 2025-10-17 - */ -public interface DeviceErrorCodeMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java deleted file mode 100644 index cfca543..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.Device; -import org.dromara.fishery.domain.vo.DeviceVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 设备管理Mapper接口 - * - * @author intc - * @date 2025-10-14 - */ -public interface DeviceMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceSwitchMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceSwitchMapper.java deleted file mode 100644 index 1289936..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceSwitchMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.DeviceSwitch; -import org.dromara.fishery.domain.vo.DeviceSwitchVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; - -/** - * 测控一体机开关Mapper接口 - * - * @author intc - * @date 2025-10-17 - */ -public interface DeviceSwitchMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceThresholdMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceThresholdMapper.java deleted file mode 100644 index c532a92..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/DeviceThresholdMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.DeviceThreshold; -import org.dromara.fishery.domain.vo.DeviceThresholdVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 设备阈值管理Mapper接口 - * - * @author intc - * @date 2025-10-11 - */ -public interface DeviceThresholdMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/FishMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/FishMapper.java deleted file mode 100644 index 2ebebe7..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/FishMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.Fish; -import org.dromara.fishery.domain.vo.FishVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 鱼类管理Mapper接口 - * - * @author intc - * @date 2025-10-11 - */ -public interface FishMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayDeviceMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayDeviceMapper.java deleted file mode 100644 index 8020dca..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayDeviceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.PayDevice; -import org.dromara.fishery.domain.vo.PayDeviceVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 设备充值记录Mapper接口 - * - * @author intc - * @date 2025-10-16 - */ -public interface PayDeviceMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayOrderMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayOrderMapper.java deleted file mode 100644 index 2e7437a..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PayOrderMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.PayOrder; -import org.dromara.fishery.domain.vo.PayOrderVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 充值订单Mapper接口 - * - * @author intc - * @date 2025-10-17 - */ -public interface PayOrderMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java deleted file mode 100644 index 7ff563f..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/PondMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlusJoin; -import org.dromara.fishery.domain.Pond; -import org.dromara.fishery.domain.vo.PondVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 塘口管理Mapper接口 - * - * @author intc - * @date 2025-10-11 - */ -public interface PondMapper extends BaseMapperPlusJoin { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/UserRelationMapper.java b/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/UserRelationMapper.java deleted file mode 100644 index 248ffd5..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/java/org/dromara/fishery/mapper/UserRelationMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.fishery.mapper; - -import org.dromara.fishery.domain.UserRelation; -import org.dromara.fishery.domain.vo.UserRelationVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 养殖用户子账号Mapper接口 - * - * @author intc - * @date 2025-10-17 - */ -public interface UserRelationMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml b/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml deleted file mode 100644 index a89c6e6..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceCorrectRecordMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml b/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml deleted file mode 100644 index 68a770b..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceErrorCodeMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml b/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml deleted file mode 100644 index 6faa778..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/DeviceThresholdMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml b/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml deleted file mode 100644 index be21ffb..0000000 --- a/ruoyi-modules/ruoyi-fishery/src/main/resources/mapper/fishery/PayOrderMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java deleted file mode 100644 index 2f118b0..0000000 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.job; diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml deleted file mode 100644 index 0fc6d55..0000000 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-system - - - system系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-sse - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java deleted file mode 100644 index 15bcfb4..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 授权管理Mapper接口 - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -public interface SysClientMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java deleted file mode 100644 index 0eaaee8..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.vo.SysConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 9a9bdd5..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysDictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysDictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java deleted file mode 100644 index 85edd1d..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.vo.SysLogininforVo; - -/** - * 系统访问日志情况信息 数据层 - * - * @author Lion Li - */ -public interface SysLogininforMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java deleted file mode 100644 index 1e27b77..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.vo.SysNoticeVo; - -/** - * 通知公告表 数据层 - * - * @author Lion Li - */ -public interface SysNoticeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java deleted file mode 100644 index 5d20404..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.vo.SysOperLogVo; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java deleted file mode 100644 index 3da621d..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.vo.SysOssVo; - -/** - * 文件上传 数据层 - * - * @author Lion Li - */ -public interface SysOssMapper extends BaseMapperPlus { -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java deleted file mode 100644 index b942061..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.vo.SysSocialVo; - -/** - * 社会化关系Mapper接口 - * - * @author thiszhc - */ -public interface SysSocialMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java deleted file mode 100644 index 7e1167a..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java deleted file mode 100644 index 10ca170..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.vo.SysTenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantPackageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml deleted file mode 100644 index 6bcce51..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml deleted file mode 100644 index 6975da4..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index c64b551..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml deleted file mode 100644 index 43f494d..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml deleted file mode 100644 index 5ef14ee..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml deleted file mode 100644 index 1705bb2..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml deleted file mode 100644 index f01dc5e..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml deleted file mode 100644 index e9f2496..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml deleted file mode 100644 index 6f7cedf..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-tdengine/pom.xml b/ruoyi-modules/ruoyi-tdengine/pom.xml deleted file mode 100644 index ff4cf65..0000000 --- a/ruoyi-modules/ruoyi-tdengine/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-tdengine - - - TD数据模块 - - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-redis - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-translation - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-websocket - - - com.taosdata.jdbc - taos-jdbcdriver - 2.0.40 - - - - diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java deleted file mode 100644 index d320495..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.FlowSpel; -import org.dromara.workflow.domain.vo.FlowSpelVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 流程spel达式定义Mapper接口 - * - * @author Michelle.Chung - * @date 2025-07-04 - */ -public interface FlwSpelMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java deleted file mode 100644 index cd1edba..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.TestLeave; -import org.dromara.workflow.domain.vo.TestLeaveVo; - -/** - * 请假Mapper接口 - * - * @author may - * @date 2023-07-21 - */ -public interface TestLeaveMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml deleted file mode 100644 index c2cc9c7..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceBizExtMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -