From 147794e17ee75a0d66e5200d8c3fc7f849c7ffc0 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 25 Jun 2022 11:22:00 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dboot=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml                        | 7 +++++++
 .../pigx/common/core/constant/ServiceNameConstants.java    | 5 +++++
 .../pigx/common/file/oss/OssAutoConfiguration.java         | 1 +
 .../pig4cloud/pigx/common/file/oss/http/OssEndpoint.java   | 2 ++
 .../pigx/common/xss/PigxXssAutoConfiguration.java          | 1 +
 5 files changed, 16 insertions(+)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 3764e81af..0c264a002 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -39,6 +39,7 @@
 		<seata.version>1.4.2</seata.version>
 		<asm.version>7.1</asm.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <jaxb.version>2.3.5</jaxb.version>
         <javaformat.plugin.version>0.0.23</javaformat.plugin.version>
         <docker.plugin.version>0.33.0</docker.plugin.version>
         <cloud.plugin.version>1.0.0</cloud.plugin.version>
@@ -260,6 +261,12 @@
                 <artifactId>groovy</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
+            <!--   java17 support-->
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
             <!--稳定版本，替代spring security bom内置-->
             <dependency>
                 <groupId>org.springframework.security.oauth</groupId>
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstants.java
index ff006a16a..cf1747e88 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstants.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstants.java
@@ -25,6 +25,11 @@ package com.pig4cloud.pigx.common.core.constant;
  */
 public interface ServiceNameConstants {
 
+	/**
+	 * BASE 路径
+	 */
+	String BASE_URL = "http://127.0.0.1:${server.port}${server.servlet.context-path}";
+
 	/**
 	 * 认证中心
 	 */
diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssAutoConfiguration.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssAutoConfiguration.java
index 47d9ba465..1f4abcda0 100755
--- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssAutoConfiguration.java
+++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssAutoConfiguration.java
@@ -47,6 +47,7 @@ public class OssAutoConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	@ConditionalOnProperty(name = "file.oss.info", havingValue = "true")
 	public OssEndpoint ossEndpoint(OssTemplate template) {
 		return new OssEndpoint(template);
diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/http/OssEndpoint.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/http/OssEndpoint.java
index 9f51d9865..554ec743c 100755
--- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/http/OssEndpoint.java
+++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/http/OssEndpoint.java
@@ -24,6 +24,7 @@ import com.pig4cloud.pigx.common.file.oss.service.OssTemplate;
 import lombok.AllArgsConstructor;
 import lombok.Cleanup;
 import lombok.SneakyThrows;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,6 +45,7 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/oss")
+@ConditionalOnProperty(name = "file.oss.info", havingValue = "true")
 public class OssEndpoint {
 
 	private final OssTemplate template;
diff --git a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/PigxXssAutoConfiguration.java b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/PigxXssAutoConfiguration.java
index 2e7f56b25..eeaebfee0 100644
--- a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/PigxXssAutoConfiguration.java
+++ b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/PigxXssAutoConfiguration.java
@@ -51,6 +51,7 @@ public class PigxXssAutoConfiguration implements WebMvcConfigurer {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public FormXssClean formXssClean(PigxXssProperties properties, XssCleaner xssCleaner) {
 		return new FormXssClean(properties, xssCleaner);
 	}