1、依赖升级：springboot 2.7.18 -> 3.4.5，springcloud 2021.x -> 2024.x ，其余包同步yudao升级；2、微服务配置简化；

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/oauth2/EsTest.java

@@ -5,7 +5,7 @@ import com.cf.imes.framework.test.core.ut.BaseMockitoUnitTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.util.HashMap;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java

@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImplTest.java

@@ -23,9 +23,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
+import jakarta.annotation.Resource;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
 import static com.cf.imes.framework.test.core.util.AssertUtils.assertPojoEquals;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dept/DeptServiceImplTest.java

@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.dept.DeptMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dept/PostServiceImplTest.java

@@ -11,7 +11,7 @@ import com.cf.imes.module.system.dal.mysql.dept.PostMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dict/DictDataServiceImplTest.java

@@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.function.Consumer;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/dict/DictTypeServiceImplTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.function.Consumer;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/errorcode/ErrorCodeServiceTest.java

@@ -14,7 +14,7 @@ import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.function.Consumer;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/logger/LoginLogServiceImplTest.java

@@ -9,7 +9,7 @@ import com.cf.imes.module.system.dal.mysql.logger.LoginLogMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static com.cf.imes.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static com.cf.imes.framework.common.util.date.LocalDateTimeUtils.buildTime;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/logger/OperateLogServiceImplTest.java

@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collections;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/machine/MachineServiceImplTest.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static com.cf.imes.framework.test.core.util.RandomUtils.randomPojo;
 import static org.junit.jupiter.api.Assertions.assertThrows;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/mail/MailAccountServiceImplTest.java

@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 import static com.cf.imes.framework.common.util.object.ObjectUtils.cloneIgnoreId;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/mail/MailLogServiceImplTest.java

@@ -13,7 +13,7 @@ import com.cf.imes.module.system.enums.mail.MailSendStatusEnum;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Map;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/mail/MailTemplateServiceImplTest.java

@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.mail.MailTemplateMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/notice/NoticeServiceImplTest.java

@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.notice.NoticeMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static com.cf.imes.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static com.cf.imes.framework.test.core.util.AssertUtils.assertPojoEquals;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/notify/NotifyMessageServiceImplTest.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.DbType;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/notify/NotifyTemplateServiceImplTest.java

@@ -10,7 +10,7 @@ import com.cf.imes.module.system.dal.mysql.notify.NotifyTemplateMapper;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java

@@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/oauth2/OAuth2ClientServiceImplTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collections;
 
 import static com.cf.imes.framework.common.util.object.ObjectUtils.cloneIgnoreId;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/oauth2/OAuth2CodeServiceImplTest.java

@@ -10,7 +10,7 @@ import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImplTest.java

@@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 
 import static com.cf.imes.framework.common.util.object.ObjectUtils.cloneIgnoreId;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/organ/TenantPackageServiceImplTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import static com.cf.imes.framework.test.core.util.RandomUtils.*;
 import static com.cf.imes.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/organ/TenantServiceImplTest.java

@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Collections;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/permission/MenuServiceImplTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/permission/PermissionServiceTest.java

@@ -21,7 +21,7 @@ import org.mockito.MockedStatic;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/permission/RoleServiceImplTest.java

@@ -15,7 +15,7 @@ import org.mockito.MockedStatic;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java

@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import com.cf.imes.framework.test.core.ut.BaseDbUnitTest;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/ProcessServiceImplTest.java

@@ -6,7 +6,7 @@ import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUser
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import com.cf.imes.framework.test.core.ut.BaseDbUnitTest;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java

@@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Arrays;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsChannelServiceTest.java

@@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 import static com.cf.imes.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImplTest.java

@@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.Duration;
 import java.time.LocalDateTime;
 

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsLogServiceImplTest.java

@@ -15,7 +15,7 @@ import com.cf.imes.module.system.enums.sms.SmsTemplateTypeEnum;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.function.Consumer;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/sms/SmsTemplateServiceImplTest.java

@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/social/SocialClientServiceImplTest.java

@@ -15,13 +15,14 @@ import com.cf.imes.module.system.dal.mysql.social.SocialClientMapper;
 import com.cf.imes.module.system.enums.social.SocialTypeEnum;
 import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
-import com.xingyuv.jushauth.config.AuthConfig;
-import com.xingyuv.jushauth.model.AuthResponse;
-import com.xingyuv.jushauth.model.AuthUser;
-import com.xingyuv.jushauth.request.AuthDefaultRequest;
-import com.xingyuv.jushauth.request.AuthRequest;
-import com.xingyuv.jushauth.utils.AuthStateUtils;
-import com.xingyuv.justauth.AuthRequestFactory;
+import com.cf.imes.module.system.framework.justauth.core.AuthRequestFactory;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.utils.AuthStateUtils;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -31,7 +32,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import static com.cf.imes.framework.test.core.util.RandomUtils.*;
 import static cn.hutool.core.util.RandomUtil.randomEle;
 import static com.cf.imes.framework.common.util.object.ObjectUtils.cloneIgnoreId;
@@ -102,7 +103,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest {
         when(authRequestFactory.get(eq("WECHAT_MP"))).thenReturn(authRequest);
         // mock 方法（AuthResponse）
         AuthUser authUser = randomPojo(AuthUser.class);
-        AuthResponse<?> authResponse = new AuthResponse<>(2000, null, authUser);
+        AuthResponse<AuthUser> authResponse = new AuthResponse<>(2000, null, authUser);
         when(authRequest.login(argThat(authCallback -> {
             assertEquals(code, authCallback.getCode());
             assertEquals(state, authCallback.getState());
@@ -126,7 +127,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest {
         AuthRequest authRequest = mock(AuthRequest.class);
         when(authRequestFactory.get(eq("WECHAT_MP"))).thenReturn(authRequest);
         // mock 方法（AuthResponse）
-        AuthResponse<?> authResponse = new AuthResponse<>(0, "模拟失败", null);
+        AuthResponse<AuthUser> authResponse = new AuthResponse<>(0, "模拟失败", null);
         when(authRequest.login(argThat(authCallback -> {
             assertEquals(code, authCallback.getCode());
             assertEquals(state, authCallback.getState());

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/social/SocialUserServiceImplTest.java

@@ -11,12 +11,12 @@ import com.cf.imes.module.system.dal.dataobject.social.SocialUserDO;
 import com.cf.imes.module.system.dal.mysql.social.SocialUserBindMapper;
 import com.cf.imes.module.system.dal.mysql.social.SocialUserMapper;
 import com.cf.imes.module.system.enums.social.SocialTypeEnum;
-import com.xingyuv.jushauth.model.AuthUser;
+import me.zhyd.oauth.model.AuthUser;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java

@@ -32,7 +32,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import static com.cf.imes.framework.test.core.util.RandomUtils.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.util.Collection;
 import java.util.List;