From e36ba58361cd8d920d459cccbca00249e8846837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B9=A6=E6=96=87?= Date: Wed, 22 Mar 2023 17:32:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 50 +++++++++++++++++++ .../src/main/resources/application.yml | 22 ++++---- 2 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 application/src/main/resources/application-test.yml diff --git a/application/src/main/resources/application-test.yml b/application/src/main/resources/application-test.yml new file mode 100644 index 00000000..aaa79e04 --- /dev/null +++ b/application/src/main/resources/application-test.yml @@ -0,0 +1,50 @@ +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: + +server: + port: 8085 + servlet: + session: + timeout: 3600 +#jenkins: +# url: http://192.168.80.128:8081 +# userName: admin +# password: 1 +--- +server: + port: 8084 +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 d39c1988..ba8369e9 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -26,21 +26,14 @@ 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 -svn: - userName: admin - password: 123456 - local: - base: - dir: D:\svn-test -maven: - home: /usr/local/app/apache-maven-3.8.3 + priKey: /Users/songguo77/.ssh/id_rsa.pub + server: port: 8085 servlet: @@ -54,4 +47,7 @@ server: server: port: 8084 spring: - profiles: test + profiles: dev + + + -- Gitee From 0a6865829c1fdbd27f7c88c901d11f146c8115e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B9=A6=E6=96=87?= Date: Wed, 22 Mar 2023 19:08:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application-test.yml | 10 +++++++++- application/src/main/resources/application.yml | 10 +++++++++- application/src/main/resources/bootstrap.yml | 2 +- application/src/main/resources/log4j2.yml | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/application/src/main/resources/application-test.yml b/application/src/main/resources/application-test.yml index aaa79e04..023d5dc5 100644 --- a/application/src/main/resources/application-test.yml +++ b/application/src/main/resources/application-test.yml @@ -33,6 +33,14 @@ git: 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 @@ -45,6 +53,6 @@ server: # password: 1 --- server: - port: 8084 + 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 ba8369e9..5d073037 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -33,6 +33,14 @@ git: dir: /Users/songguo77/jacoco/code-diff ssh: priKey: /Users/songguo77/.ssh/id_rsa.pub +svn: + userName: admin + password: 123456 + local: + base: + dir: D:\svn-test +maven: + home: /Users/songguo77/Downloads/soft/apache-maven-3.5.4 server: port: 8085 @@ -45,7 +53,7 @@ server: # password: 1 --- server: - port: 8084 + port: 8085 spring: profiles: dev diff --git a/application/src/main/resources/bootstrap.yml b/application/src/main/resources/bootstrap.yml index d37ffb2e..3fb45411 100644 --- a/application/src/main/resources/bootstrap.yml +++ b/application/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ 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 5aa8876d..fd332b2d 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 -- Gitee From c04553ae5540114d6d715120f0571cf4b7dbf787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B9=A6=E6=96=87?= Date: Mon, 27 Mar 2023 10:31:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/application/src/main/resources/bootstrap.yml b/application/src/main/resources/bootstrap.yml index 3fb45411..e2ad4802 100644 --- a/application/src/main/resources/bootstrap.yml +++ b/application/src/main/resources/bootstrap.yml @@ -1,6 +1,7 @@ server: port: 8081 log: + #本地日志目录，服务器上指定日志目录 path: /Users/songguo77/logs management: endpoint: -- Gitee From 49d24a84083f7f4420894ef7907ea67464545830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E4=B9=A6=E6=96=87?= Date: Mon, 27 Mar 2023 14:03:22 +0800 Subject: [PATCH 4/4] add test --- application/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 5d073037..440434a2 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记录 @@ -55,7 +55,7 @@ server: server: port: 8085 spring: - profiles: dev + profiles: test -- Gitee