From 673b7c3b04374f1821475f60675e01db8e3b5d26 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 10 Dec 2025 12:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.44=20=20=201)=20=E6=94=AF=E6=8C=81=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=9C=E7=A8=8B=E5=85=A5=E5=8F=A3HTTPS=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=9A=84=E9=85=8D=E7=BD=AE=E8=A7=84=E5=88=99=EF=BC=88?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=EF=BC=89=20=20=20?= =?UTF-8?q?2)=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E5=8A=A0=E8=BD=BD=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=9A=84Bug=20=20=203=EF=BC=89=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=AE=A1=E7=90=86-=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=9D=A1=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6keepalive=E9=80=89?= =?UTF-8?q?=E9=A1=B9=20=20=204)=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=9B=BE=E6=A0=87=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=20bug=20=20=205)=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA=20html=20?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=B3=BB=E5=88=97bug=20=20=206=EF=BC=89?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95=E6=A0=91=E5=BD=A2=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=88=86=E9=9A=94=E7=AC=A6=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=20bug=20=20=207)=20=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=8F=82=E6=95=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA=20bug=20=20=208)?= =?UTF-8?q?=20=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E=E7=89=B9=E5=BE=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=99=A8=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=20bug=20=20=209)=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=AE=BE=E7=BD=AE=E4=B8=AD=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=20bug=20=20=2010=EF=BC=89=E6=9B=B4=E6=96=B0=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E5=BC=95=E6=93=8E=E7=A4=BA=E4=BE=8B=20=20=2011)=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=BA=94=E7=94=A8=E7=9A=84=20home=20=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=97=B6=EF=BC=8C=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E5=8C=85=E5=90=AB?= =?UTF-8?q?"=E7=82=B9"=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 前端核心框架发布: 8.2.140 1) 修复首页办理中、已完成列表右上角查看全部的路由跳转bug --- app.platform/build.gradle | 2 ++ gradle.properties | 4 +++- .../springboot/BeforeEnvironmentProcessor.java | 7 ++++--- io.sc.platform.springcloud.openfeign/build.gradle | 6 ++++++ .../autoconfigure/OpenFeignAutoConfiguration.java | 15 +++++++++++++++ .../springcloud/openfeign/example/Sample.java | 14 ++++++++++++++ .../src/main/resources/META-INF/spring.factories | 3 +++ settings.gradle | 1 + 8 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 io.sc.platform.springcloud.openfeign/build.gradle create mode 100644 io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/autoconfigure/OpenFeignAutoConfiguration.java create mode 100644 io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/example/Sample.java create mode 100644 io.sc.platform.springcloud.openfeign/src/main/resources/META-INF/spring.factories diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 8b8c9052..f841c3a2 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -53,6 +53,8 @@ dependencies { // 风险预警分析 //project(":wra.report"), //project(":wra.report.frontend"), + + project(":io.sc.platform.springcloud.openfeign"), ) } diff --git a/gradle.properties b/gradle.properties index 8606b0ed..593dc12f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -90,9 +90,11 @@ reflections_version=0.10.2 schemacrawler_version=16.21.4 shadow_gradle_plugin_version=8.3.1 spring_boot_version=2.7.18 +spring_cloud_version=2021.0.8 spring_cloud_alibaba_version=2021.0.4.0 spring_cloud_context_version=3.1.4 -spring_cloud_version=2021.0.8 +spring_cloud_openfeign_version=3.1.9 +spring_cloud_loadbalancer_version=3.1.9 spring_security_oauth2_authorization_server_version=0.4.5 spring_statemachine_version=3.2.1 truelicense_version=4.0.3 diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java index ae1d89fe..e69e606f 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/springboot/BeforeEnvironmentProcessor.java @@ -123,11 +123,12 @@ public class BeforeEnvironmentProcessor implements EnvironmentPostProcessor, Ord } // 从启动命令行参数获取----------------------------------------------------------------------- - // 通过在启动应用的命令上加上 --xxxxxxxxxxx.home.dir=xxx/xxxx/xxx/ + // 通过在启动应用的命令上加上 --XXX_XXXX_XXXX_HOME_DIR=xxx/xxxx/xxx/ // ----------- - // 表示应用的启动类所在包的全路径名称,例如: app.platform + // 表示应用的启动类所在包的全路径名称,例如: APP_PLATFORM String packageName =Environment.getInstance().getApplicationName(); - homeDir =environment.getProperty(packageName + ".home.dir"); + String envVarKey =packageName.toUpperCase().replace('.','_') + "_HOME_DIR"; + homeDir =environment.getProperty(envVarKey); if(StringUtils.hasText(homeDir)){ return homeDir; } diff --git a/io.sc.platform.springcloud.openfeign/build.gradle b/io.sc.platform.springcloud.openfeign/build.gradle new file mode 100644 index 00000000..00871f40 --- /dev/null +++ b/io.sc.platform.springcloud.openfeign/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api( + "org.springframework.cloud:spring-cloud-starter-openfeign:${spring_cloud_openfeign_version}", + "org.springframework.cloud:spring-cloud-starter-loadbalancer:${spring_cloud_loadbalancer_version}", + ) +} diff --git a/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/autoconfigure/OpenFeignAutoConfiguration.java b/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/autoconfigure/OpenFeignAutoConfiguration.java new file mode 100644 index 00000000..7fe33687 --- /dev/null +++ b/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/autoconfigure/OpenFeignAutoConfiguration.java @@ -0,0 +1,15 @@ +package io.sc.platform.springcloud.openfeign.autoconfigure; + +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +/** + * Openfeign 自动配置, 为平台提供微服务间调用能力. + * + * @author wangshaoping, wspsc@163.com + */ +@Configuration(proxyBeanMethods = false) +@EnableFeignClients(basePackages = "io.sc.platform.springcloud.openfeign.example") +public class OpenFeignAutoConfiguration { + +} diff --git a/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/example/Sample.java b/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/example/Sample.java new file mode 100644 index 00000000..35d198de --- /dev/null +++ b/io.sc.platform.springcloud.openfeign/src/main/java/io/sc/platform/springcloud/openfeign/example/Sample.java @@ -0,0 +1,14 @@ +package io.sc.platform.springcloud.openfeign.example; + +import org.bouncycastle.util.Store; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import java.util.List; + +@FeignClient("openfeignSample") +public interface Sample { + @RequestMapping(name = "user", value = "/api/system/user", method = RequestMethod.GET) + public List getUsers(); +} diff --git a/io.sc.platform.springcloud.openfeign/src/main/resources/META-INF/spring.factories b/io.sc.platform.springcloud.openfeign/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..ed27f303 --- /dev/null +++ b/io.sc.platform.springcloud.openfeign/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# Auto Configuration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.sc.platform.springcloud.openfeign.autoconfigure.OpenFeignAutoConfiguration \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 2f3f6875..91516937 100755 --- a/settings.gradle +++ b/settings.gradle @@ -72,6 +72,7 @@ include ':io.sc.platform.scheduler.manager.frontend' include ':io.sc.platform.security' include ':io.sc.platform.security.loginform' include ':io.sc.platform.springcloud.nacos' +include ':io.sc.platform.springcloud.openfeign' include ':io.sc.platform.springcloud.sentinel' include ':io.sc.platform.system' include ':io.sc.platform.system.api'