Pārlūkot izejas kodu

将配置文件放回 jar 包中, 不再从外部指定

reghao 2 gadi atpakaļ
vecāks
revīzija
b183b7f976

+ 1 - 1
manager/bin/start.sh

@@ -3,4 +3,4 @@
 app_dir=`pwd`
 app_name='devops-manager.jar'
 # 加载 application.yml 和 application-test.yml 两个配置文件, 分别位于 classpath 和文件系统路径
-java -jar ${app_dir}"/"${app_name} --spring.config.location=classpath:/application.yml,file:${app_dir}/application-test.yml >/dev/null 2>&1 &
+java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &

+ 1 - 0
manager/pom.xml

@@ -191,6 +191,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>application.yml</include>
+                    <include>application-${profile.active}.yml</include>
                     <include>logback-spring.xml</include>
                     <include>git.properties</include>
                     <!-- 前端静态资源 -->

+ 1 - 6
manager/bin/application-dev.yml → manager/src/main/resources/application-dev.yml

@@ -4,9 +4,4 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/reghao_devops_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: dev
-    password: Dev@123456
-#  redis:
-#    database: 0
-#    host: localhost
-#    port: 6379
-#    password: Dev@123456
+    password: Dev@123456

+ 0 - 0
manager/bin/application-test.yml → manager/src/main/resources/application-test.yml