From aec1395ea8769280bd749fe9a495041e34a664ab Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 24 Dec 2021 12:54:02 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E8=B0=83=E6=95=B4properties=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/Application.java        | 5 ++++-
 .../resources/{application.properties => base.properties}    | 0
 backend/src/main/resources/logback.xml                       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename backend/src/main/resources/{application.properties => base.properties} (100%)

diff --git a/backend/src/main/java/io/metersphere/Application.java b/backend/src/main/java/io/metersphere/Application.java
index 60c4737f32..1df24d8f79 100644
--- a/backend/src/main/java/io/metersphere/Application.java
+++ b/backend/src/main/java/io/metersphere/Application.java
@@ -23,7 +23,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         JmeterProperties.class
 })
 @EnableScheduling
-@PropertySource(value = {"file:/opt/metersphere/conf/metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
+@PropertySource(value = {
+        "classpath:/base.properties",
+        "file:/opt/metersphere/conf/metersphere.properties",
+}, encoding = "UTF-8", ignoreResourceNotFound = true)
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/base.properties
similarity index 100%
rename from backend/src/main/resources/application.properties
rename to backend/src/main/resources/base.properties
diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml
index 5d6e43631c..e171d6760d 100644
--- a/backend/src/main/resources/logback.xml
+++ b/backend/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-    <property resource="application.properties"/>
+    <property resource="base.properties"/>
     <property file="/opt/metersphere/conf/metersphere.properties"/>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>