From b253ddd53f9073f944983dff1e6800abff1413e2 Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期三, 03 七月 2024 11:24:35 +0800 Subject: [PATCH] some debug --- /dev/null | 1 pms-parent/pms-web-report/src/main/resources/log4j2.yml | 73 ++++++++++++++++++++++++++++++++++++ pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.jar | 0 pms-parent/pms-web-report/src/main/resources/application.yml | 14 +++++++ pms-parent/pms-global/src/main/resources/application-global.yml | 3 + pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.properties | 21 +--------- pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/PmsReportApplication.java | 6 +++ 7 files changed, 98 insertions(+), 20 deletions(-) diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml index fc0bb2f..f4e1add 100644 --- a/pms-parent/pms-global/src/main/resources/application-global.yml +++ b/pms-parent/pms-global/src/main/resources/application-global.yml @@ -72,6 +72,9 @@ station: webPort: 12349 idSuffix: 6 + report: + webPort: 12350 + idSuffix: 7 file: idSuffix: 99 file1: diff --git a/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.jar b/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e --- /dev/null +++ b/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.jar Binary files differ diff --git a/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.properties b/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.properties index 8f96f52..bdca1ae 100644 --- a/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.properties +++ b/pms-parent/pms-web-report/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,2 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 -distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/PmsReportApplication.java b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/PmsReportApplication.java index 789eb66..5efafca 100644 --- a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/PmsReportApplication.java +++ b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/PmsReportApplication.java @@ -1,9 +1,15 @@ package com.dy.pmsReport; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.EnableAspectJAutoProxy; @SpringBootApplication +@EnableAspectJAutoProxy +@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsReport"}) +@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"}) public class PmsReportApplication { public static void main(String[] args) { diff --git a/pms-parent/pms-web-report/src/main/resources/application.properties b/pms-parent/pms-web-report/src/main/resources/application.properties deleted file mode 100644 index 1f66e7f..0000000 --- a/pms-parent/pms-web-report/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=pms-web-report diff --git a/pms-parent/pms-web-report/src/main/resources/application.yml b/pms-parent/pms-web-report/src/main/resources/application.yml new file mode 100644 index 0000000..c35c2be --- /dev/null +++ b/pms-parent/pms-web-report/src/main/resources/application.yml @@ -0,0 +1,14 @@ +spring: + profiles: + include: global, database + +#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080 +server: + port: ${pms.report.webPort} + servlet: + context-path: /report #web璁块棶涓婁笅鏂囪矾寰� + context-parameters: + #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99 + idSuffix: ${pms.report.idSuffix} + #ConfigListener涓簲鐢� + #configFileNames: config-global.xml,config-demo.xml diff --git a/pms-parent/pms-web-report/src/main/resources/log4j2.yml b/pms-parent/pms-web-report/src/main/resources/log4j2.yml new file mode 100644 index 0000000..c107762 --- /dev/null +++ b/pms-parent/pms-web-report/src/main/resources/log4j2.yml @@ -0,0 +1,73 @@ +Configuration: + #status锛岃繖涓敤浜庤缃甽og4j2鑷韩鍐呴儴鐨勪俊鎭緭鍑猴紝鍙互涓嶈缃紝褰撹缃垚trace鏃讹紝浣犱細鐪嬪埌log4j2鍐呴儴鍚勭璇︾粏杈撳嚭锛涘彲浠ヨ缃垚Off(鍏抽棴)鎴朎rror(鍙緭鍑洪敊璇俊鎭�) + status: Error + + Properties: # 瀹氫箟鍏ㄥ眬鍙橀噺 + Property: + #鏃ュ織鏂囦欢瀛樺偍鐨勭洰褰� + - name: log.path + value: ./logs + #鏃ュ織鏂囦欢瀛樺偍鍚嶇О + - name: project.name + value: pmsReport + + #瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�. + Appenders: + #杈撳嚭鍒版帶鍒跺彴 + Console: + #Appender鍛藉悕 + name: CONSOLE + target: SYSTEM_OUT + ThresholdFilter: + level: debug #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭 + onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭 + onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑� + #鏃ュ織鍐呭鏍峰紡 + PatternLayout: + #%n-鎹㈣ + #%m-鏃ュ織鍐呭锛岃緭鍑轰唬鐮佷腑鎸囧畾鐨勬棩蹇椾俊鎭� + #%p-杈撳嚭浼樺厛绾э紝鍗矰EBUG,INFO,WARN,ERROR,FATAL + #%r-绋嬪簭鍚姩鍒扮幇鍦ㄧ殑姣鏁� + #%%- 杈撳嚭涓�涓�"%" 瀛楃 + #%t-褰撳墠绾跨▼鍚� + #%d-鏃ユ湡鍜屾椂闂�, 甯哥敤鐨勬牸寮忔湁%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS} + #%l-鍚�%F%L%C%M + #%F-java婧愭枃浠跺悕 + #%L-java婧愮爜琛屾暟 + #%C-java绫诲悕,%C{1}杈撳嚭鏈�鍚庝竴涓厓绱� + #%M-java鏂规硶鍚� + pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n" + # 杈撳嚭鍒版枃浠讹紝瓒呰繃10MB褰掓。 + RollingFile: + - name: ROLLING_FILE + ignoreExceptions: false + fileName: ${log.path}/${project.name}.log + filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz" + ThresholdFilter: + level: error #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭 + onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭 + onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑� + #鏃ュ織鍐呭鏍峰紡 + PatternLayout: + pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n" + Policies: + SizeBasedTriggeringPolicy: + size: "10 MB" + DefaultRolloverStrategy: + max: 1000 + + Loggers: + Root: + level: info #鏃ュ織杈撳嚭绾у埆锛屽叡鏈�8涓骇鍒紝鎸夌収浠庝綆鍒伴珮涓猴細all < trace < debug < info < warn < error < fatal < off + AppenderRef: #Root鐨勫瓙鑺傜偣锛岀敤鏉ユ寚瀹氳鏃ュ織杈撳嚭鍒板摢涓狝ppender. + - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 + - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 + # 涓哄寘閰嶇疆鐗规畩鐨凩og绾у埆锛屾柟渚胯皟璇曪紝 + # 涓嶅彈Loggers.Root.level闄愬埗 + #Logger: + # - name: com.dy.pmsGlobal.daoPr + # additivity: false #鍘婚櫎閲嶅鐨刲og + # level: debug #杈撳嚭鏃ュ織绾у埆 + # AppenderRef: + # - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 + # - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 -- Gitblit v1.8.0