diff --git a/application/src/main/resources/application-test.yml b/application/src/main/resources/application-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..023d5dc518384c7918e799ca6fe8eba1639447ac --- /dev/null +++ b/application/src/main/resources/application-test.yml @@ -0,0 +1,58 @@ +spring: + profiles: + #激活开发环境 + active: test + messages: + basename: i18n/Messages,i18n/Pages + # 通过connectProperties属性来打开mergeSql功能;慢SQL记录 + + main: + allow-bean-definition-overriding: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 +logging: + config: classpath:log4j2.yml +swagger: + enabled: true + base-package: com.dr.code.diff.controller +##日志配置 +#logging: +# config: classpath:log4j2.yml +#shiro: +# loginUrl: /view/sys/user/login +# successUrl: /view/sys/index +# unauthorizedUrl: /view/sys/unauthorized +# sessionManager: +# sessionIdUrlRewritingEnabled: false +git: + userName: report_user + password: ttyc2020 + local: + base: + dir: /data/server-coverage/app/project + ssh: + priKey: +svn: + userName: admin + password: 123456 + local: + base: + dir: D:\svn-test +maven: + home: /usr/local/apache-maven-3.6.3 + +server: + port: 8085 + servlet: + session: + timeout: 3600 +#jenkins: +# url: http://192.168.80.128:8081 +# userName: admin +# password: 1 +--- +server: + port: 8085 +spring: + profiles: test \ No newline at end of file diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index d39c19884f5265ac8e700d542102a9ba8b557667..440434a2d56fbbd4b5947bbe6379f1903abab228 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: profiles: #激活开发环境 - active: dev + active: test messages: basename: i18n/Messages,i18n/Pages # 通过connectProperties属性来打开mergeSql功能;慢SQL记录 @@ -26,13 +26,13 @@ swagger: # sessionManager: # sessionIdUrlRewritingEnabled: false git: - userName: admin - password: 123456! + userName: report_user + password: ttyc2020 local: base: - dir: /Users/rayduan/app + dir: /Users/songguo77/jacoco/code-diff ssh: - priKey: /Users/rayduan/.ssh/id_rsa + priKey: /Users/songguo77/.ssh/id_rsa.pub svn: userName: admin password: 123456 @@ -40,7 +40,8 @@ svn: base: dir: D:\svn-test maven: - home: /usr/local/app/apache-maven-3.8.3 + home: /Users/songguo77/Downloads/soft/apache-maven-3.5.4 + server: port: 8085 servlet: @@ -52,6 +53,9 @@ server: # password: 1 --- server: - port: 8084 + port: 8085 spring: profiles: test + + + diff --git a/application/src/main/resources/bootstrap.yml b/application/src/main/resources/bootstrap.yml index d37ffb2e647de6be255bdd2c3ad77c135e3b6b13..e2ad48026a04bd36d95646f15cc2f3d498c1810a 100644 --- a/application/src/main/resources/bootstrap.yml +++ b/application/src/main/resources/bootstrap.yml @@ -1,7 +1,8 @@ server: port: 8081 log: - path: /Users/rayduan/logs + #本地日志目录,服务器上指定日志目录 + path: /Users/songguo77/logs management: endpoint: shutdown: diff --git a/application/src/main/resources/log4j2.yml b/application/src/main/resources/log4j2.yml index 5aa8876dddbec0ff8400b4716cdbf4957eb6ff6c..fd332b2d74044ab80f99ce901ffab60481f84cbc 100644 --- a/application/src/main/resources/log4j2.yml +++ b/application/src/main/resources/log4j2.yml @@ -12,7 +12,7 @@ Configuration: - name: log.sql.level value: trace - name: log.path - value: /Users/rayduan/logs + value: /Users/songguo77/logs Appenders: Console: #输出到控制台 name: CONSOLE