فهرست منبع

更新配置, 只使用 dev 和 test 环境

reghao 2 سال پیش
والد
کامیت
b80b8d6785

+ 0 - 5
agent/src/main/resources/git.properties

@@ -1,5 +0,0 @@
-repo=http://git.reghao.cn/reghao/devops.git
-                                    branch=master
-                                    commitId=1f9010c
-                                    commitTime=2022-05-11 15:54:24
-                                    buildTime=2023-04-12 05:14:40

+ 0 - 10
manager/bin/application-prod.yml

@@ -1,10 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://192.168.0.77:3306/iquizoo_devops_tdb_2?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-    username: azy_test
-    password: Azy@123456
-#  redis:
-#    database: 0
-#    host: localhost
-#    port: 6379
-#    password: Dev@123456

+ 1 - 6
manager/bin/application-test.yml

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

+ 2 - 2
manager/bin/start.sh

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

+ 2 - 2
manager/pom.xml

@@ -184,9 +184,9 @@
             </activation>
         </profile>
         <profile>
-            <id>prod</id>
+            <id>test</id>
             <properties>
-                <profile.active>prod</profile.active>
+                <profile.active>test</profile.active>
             </properties>
         </profile>
     </profiles>

+ 0 - 5
manager/src/main/resources/git.properties

@@ -1,5 +0,0 @@
-repo=http://git.reghao.cn/reghao/devops.git
-                                    branch=master
-                                    commitId=1f9010c
-                                    commitTime=2022-05-11 15:54:24
-                                    buildTime=2023-04-12 05:14:31

+ 0 - 7
manager/src/main/resources/logback-spring.xml

@@ -60,11 +60,4 @@
             <appender-ref ref="fileErrorLog"/>
         </root>
     </springProfile>
-
-    <springProfile name="prod">
-        <root level="info">
-            <appender-ref ref="fileInfoLog"/>
-            <appender-ref ref="fileErrorLog"/>
-        </root>
-    </springProfile>
 </configuration>