♻️ Refactoring code. 适配 springboot 3.2 + spring cloud 2023

pig-mesh · Dec 7, 2023 · fd36d64 · fd36d64
1 parent bfeff99
commit fd36d64
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -41,10 +41,10 @@
 
 | 依赖                          | 版本         |
 |-----------------------------|------------|
-| Spring Boot                 | 3.1.5      |
-| Spring Cloud                | 2022.0.4   |
+| Spring Boot                 | 3.2.0      |
+| Spring Cloud                | 2023.0.0   |
 | Spring Cloud Alibaba        | 2022.0.0.0 |
-| Spring Authorization Server | 1.1.3      |
+| Spring Authorization Server | 1.2.0      |
 | Mybatis Plus                | 3.5.4      |
 | hutool                      | 5.8.22     |
 

diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
@@ -15,11 +15,11 @@
 
     <properties>
         <pig.common.version>${project.version}</pig.common.version>
-        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring-boot.version>3.2.0</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <log4j2.version>2.17.1</log4j2.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <git.commit.plugin>4.9.9</git.commit.plugin>
         <spring.checkstyle.plugin>0.0.39</spring.checkstyle.plugin>
         <fastjson.version>1.2.83</fastjson.version>
@@ -165,8 +165,8 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis-spring</artifactId>
                 <version>${mybatis-spring.version}</version>
             </dependency>
             <!--hutool bom 工具类-->

diff --git a/...mon-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelFeign.java b/...mon-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelFeign.java
@@ -72,7 +72,7 @@ public PigSentinelFeign.Builder contract(Contract contract) {
 		}
 
 		@Override
-		public Feign build() {
+		public Feign internalBuild() {
 			super.invocationHandlerFactory(new InvocationHandlerFactory() {
 				@Override
 				public InvocationHandler create(Target target, Map<Method, MethodHandler> dispatch) {
@@ -107,7 +107,7 @@ private Object getFromContext(String name, String type, Class<?> fallbackType, C
 					Object fallbackInstance = feignClientFactory.getInstance(name, fallbackType);
 					if (fallbackInstance == null) {
 						throw new IllegalStateException(String
-							.format("No %s instance of type %s found for feign client %s", type, fallbackType, name));
+								.format("No %s instance of type %s found for feign client %s", type, fallbackType, name));
 					}
 
 					if (!targetType.isAssignableFrom(fallbackType)) {
@@ -120,7 +120,7 @@ private Object getFromContext(String name, String type, Class<?> fallbackType, C
 			});
 
 			super.contract(new SentinelContractHolder(contract));
-			return super.build();
+			return super.internalBuild();
 		}
 
 		private Object getFieldValue(Object instance, String fieldName) {
@@ -138,7 +138,7 @@ private Object getFieldValue(Object instance, String fieldName) {
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			this.applicationContext = applicationContext;
-			this.feignClientFactory = (FeignClientFactory) this.applicationContext.getBean(FeignClientFactory.class);
+			this.feignClientFactory = this.applicationContext.getBean(FeignClientFactory.class);
 		}
 
 	}

diff --git a/...ual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigInitQuartzJob.java b/...ual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigInitQuartzJob.java
@@ -23,6 +23,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Scheduler;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -34,30 +35,26 @@
 @Slf4j
 @Configuration
 @AllArgsConstructor
-public class PigInitQuartzJob {
-
-	private final SysJobService sysJobService;
-
-	private final TaskUtil taskUtil;
-
-	private final Scheduler scheduler;
-
-	@Bean
-	public void customize() {
-		sysJobService.list().forEach(sysjob -> {
-			if (PigQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.removeJob(sysjob, scheduler);
-			}
-			else if (PigQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.resumeJob(sysjob, scheduler);
-			}
-			else if (PigQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
-				taskUtil.pauseJob(sysjob, scheduler);
-			}
-			else {
-				taskUtil.removeJob(sysjob, scheduler);
-			}
-		});
-	}
-
+public class PigInitQuartzJob implements InitializingBean {
+
+    private final SysJobService sysJobService;
+
+    private final TaskUtil taskUtil;
+
+    private final Scheduler scheduler;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        sysJobService.list().forEach(sysjob -> {
+            if (PigQuartzEnum.JOB_STATUS_RELEASE.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.removeJob(sysjob, scheduler);
+            } else if (PigQuartzEnum.JOB_STATUS_RUNNING.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.resumeJob(sysjob, scheduler);
+            } else if (PigQuartzEnum.JOB_STATUS_NOT_RUNNING.getType().equals(sysjob.getJobStatus())) {
+                taskUtil.pauseJob(sysjob, scheduler);
+            } else {
+                taskUtil.removeJob(sysjob, scheduler);
+            }
+        });
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -27,14 +27,14 @@
     <url>https://www.pig4cloud.com</url>
 
     <properties>
-        <spring-boot.version>3.1.6</spring-boot.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-boot.version>3.2.0</spring-boot.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <spring-boot-admin.version>3.1.8</spring-boot-admin.version>
-        <spring.authorization.version>1.1.3</spring.authorization.version>
+        <spring.authorization.version>1.2.0</spring.authorization.version>
         <screw.version>0.0.3</screw.version>
         <captcha.version>2.2.3</captcha.version>
         <aws.version>1.12.261</aws.version>