Merge remote-tracking branch 'origin/master'

centers/AuthCenter/AuthClient/src/main/java/com/github/microservice/auth/client/content/ResultContent.java

@@ -38,6 +38,9 @@ public class ResultContent<T> {
     @Setter
     private ResultException exception;
 
+    @Getter
+    @Setter
+    private Integer code = 200;
 
     /**
      * 获取内容
@@ -64,4 +67,33 @@ public class ResultContent<T> {
         return build(content == null ? ResultState.Fail : ResultState.Success, content);
     }
 
+    public static <T> ResultContent buildFail(String msg) {
+        return ResultContent.builder().state(ResultState.Fail).code(500).msg(msg).build();
+    }
+
+    public static <T> ResultContent buildFail(String msg, Integer code) {
+        return ResultContent.builder().state(ResultState.Fail).code(code).msg(msg).build();
+    }
+
+    public static <T> ResultContent buildSuccess(String msg) {
+        return build(ResultState.Success, msg);
+    }
+
+    public static <T> ResultContent buildSuccess(T content) {
+        return build(ResultState.Success, content);
+    }
+
+    public static <T> ResultContent buildSuccess() {
+        return build(ResultState.Success, ResultState.Success.getRemark());
+    }
+
+    public boolean isSuccess()
+    {
+        return ResultState.Success.equals(this.state);
+    }
+
+    public boolean isFailed()
+    {
+        return !ResultState.Success.equals(this.state);
+    }
 }

super/MSConfigure/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.3.4</version>
+        <version>3.4.0</version>
         <relativePath/>
     </parent>
 
@@ -31,24 +31,24 @@
         <!-- spring boot  -->
         <spring-boot.version>3.3.4</spring-boot.version>
         <!-- spring mvc -->
-        <spring-mvc.version>6.1.13</spring-mvc.version>
+        <spring-mvc.version>6.2.0</spring-mvc.version>
 <!--        <spring-integration-core.version>6.3.4</spring-integration-core.version>-->
 
         <!-- spring cloud -->
-        <spring-cloud-dependencies.version>2023.0.3</spring-cloud-dependencies.version>
-        <spring-cloud.version>4.1.4</spring-cloud.version>
-        <spring-cloud-starter-stream.version>4.1.3</spring-cloud-starter-stream.version>
-        <spring-cloud-bus.version>4.1.2</spring-cloud-bus.version>
-        <spring-cloud-starter-config.version>4.1.3</spring-cloud-starter-config.version>
-        <spring-cloud-starter-consul-discovery.version>4.1.2</spring-cloud-starter-consul-discovery.version>
-        <spring-cloud-gateway.version>4.1.5</spring-cloud-gateway.version>
+        <spring-cloud-dependencies.version>2024.0.0</spring-cloud-dependencies.version>
+        <spring-cloud.version>4.2.0</spring-cloud.version>
+        <spring-cloud-starter-stream.version>4.2.0</spring-cloud-starter-stream.version>
+        <spring-cloud-bus.version>4.2.0</spring-cloud-bus.version>
+        <spring-cloud-starter-config.version>4.2.0</spring-cloud-starter-config.version>
+        <spring-cloud-starter-consul-discovery.version>4.2.0</spring-cloud-starter-consul-discovery.version>
+        <spring-cloud-gateway.version>4.2.0</spring-cloud-gateway.version>
 
         <netflix-hystrix.version>2.2.10.RELEASE</netflix-hystrix.version>
         <netflix-ribbon.version>2.2.10.RELEASE</netflix-ribbon.version>
 
         <!-- jpa -->
-        <spring-boot-starter-data-jpa.version>3.3.4</spring-boot-starter-data-jpa.version>
-        <spring-data-jpa.version>3.3.4</spring-data-jpa.version>
+        <spring-boot-starter-data-jpa.version>3.4.0</spring-boot-starter-data-jpa.version>
+        <spring-data-jpa.version>3.4.0</spring-data-jpa.version>
 
         <!-- 其他库 -->
         <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>