diff --git a/.gitignore b/.gitignore index 0721066..f6d6ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /youfool-devops.iml /.idea/ *-backup-*.chnr.json -.back_devops \ No newline at end of file +.back_devops +.smarttomcat \ No newline at end of file diff --git a/pom.xml b/pom.xml index 37bad34..f2efe92 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.chinaweal.youfool - youfool-devops + youfool-devops-gd 1.0.0-SNAPSHOT war - youfool-devops + youfool-devops-gd https://www.chinaweal.com.cn org.springframework.boot @@ -69,17 +69,11 @@ hutool-all 5.3.7 - + - com.oracle.ojdbc - ojdbc8 - 19.3.0.0 - - - - cn.easyproject - orai18n - 12.1.0.2.0 + org.postgresql + postgresql + 42.7.4 junit @@ -146,6 +140,7 @@ + devops-api org.springframework.boot diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 42012ac..961f1f1 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,13 +7,13 @@ logging: spring: datasource: youfool: - url: jdbc:oracle:thin:@172.22.80.186:1521:chinaweal - username: devops - password: 123456 + url: jdbc:postgresql://172.22.80.157:5432/devops_gd + username: devops_gd + password: ChinaWeal@2024 devops: - url: jdbc:oracle:thin:@172.22.80.186:1521:chinaweal - username: devops - password: 123456 + url: jdbc:postgresql://172.22.80.157:5432/devops_gd + username: devops_gd + password: ChinaWeal@2024 file: devopsDir: D:\chinaweal\gitea-code\youfool-project\youfool-devops\upload diff --git a/src/main/resources/application-fs146prod.yml b/src/main/resources/application-fs146prod.yml deleted file mode 100644 index 315eba9..0000000 --- a/src/main/resources/application-fs146prod.yml +++ /dev/null @@ -1,34 +0,0 @@ -logging: - level: - dao: info - youfool.dao: info - com.chinaweal.youfool.framework.springboot.log: debug - com.chinaweal.youfool.devops: info - filePath: D:\apache-tomcat-8.5.53_9088-devops\logs -spring: - datasource: - youfool: - url: jdbc:oracle:thin:@19.130.241.145:1521:FSAMRDATA - username: devops - password: Supper#2020 - devops: - url: jdbc:oracle:thin:@19.130.241.145:1521:FSAMRDATA - username: devops - password: Supper#2020 - -file: - devopsDir: D:\apache-tomcat-8.5.53_9088-devops\webapps\upload - -business: - fsLoginUrl: http://19.130.241.146:9888/tzrysb/user/loginDevops - sdLoginUrl: http://19.202.179.137:9888/tzrysb/user/loginDevops - fsUserInfoUrl: http://19.130.241.146:9888/tzrysb/user/searchUserDevops - sdUserInfoUrl: http://19.202.179.137:9888/tzrysb/user/searchUserDevops - -#运维通报机器人 -noticeWebhookKeys: 2eacc126-74d2-4360-a88e-369c83aed8cf,94106362-31b8-4dc1-b1ea-239196095aa5,bad2a6aa-9cc8-4f82-9e46-aff9f13a2efb -#数据账号密码过期机器人 -dbWebhookKeys: 45d1bda2-c0b9-45c3-b640-be77f7a0726d,2eacc126-74d2-4360-a88e-369c83aed8cf,3dcb2f2c-cdf1-43a0-b765-882676aa7f41,7fa4ae32-9721-4175-a812-962ad38c6e3b - -swagger: - enable: false diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..bb4ce08 --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,34 @@ +logging: + level: + dao: info + youfool.dao: info + com.chinaweal.youfool.framework.springboot.log: debug + com.chinaweal.youfool.devops: info + filePath: ..\logs +spring: + datasource: + youfool: + url: jdbc:postgresql://172.22.80.157:5432/devops_gd + username: devops_gd + password: ChinaWeal@2024 + devops: + url: jdbc:postgresql://172.22.80.157:5432/devops_gd + username: devops_gd + password: ChinaWeal@2024 + +file: + devopsDir: ..\webapps\upload + +business: + fsLoginUrl: http://121.8.152.130:9888/tzrysb/user/loginDevops + sdLoginUrl: http://121.8.152.130:9888/tzrysb/user/loginDevops + fsUserInfoUrl: http://121.8.152.130:9888/tzrysb/user/searchUserDevops + sdUserInfoUrl: http://121.8.152.130:9888/tzrysb/user/searchUserDevops + +#运维通报机器人 +noticeWebhookKeys: 2eacc126-74d2-4360-a88e-369c83aed8cf,94106362-31b8-4dc1-b1ea-239196095aa5,bad2a6aa-9cc8-4f82-9e46-aff9f13a2efb +#数据账号密码过期机器人 +dbWebhookKeys: 45d1bda2-c0b9-45c3-b640-be77f7a0726d,2eacc126-74d2-4360-a88e-369c83aed8cf,3dcb2f2c-cdf1-43a0-b765-882676aa7f41,7fa4ae32-9721-4175-a812-962ad38c6e3b + +swagger: + enable: false diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 96875ad..c1ce637 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ logging: root: info spring: profiles: - active: fs146prod + active: prod application: name: youfoo-devops datasource: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index e862ae2..67fe253 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -98,7 +98,7 @@ - +