Skip to content

Commit

Permalink
20240717
Browse files Browse the repository at this point in the history
  • Loading branch information
ldcsaa committed Jul 17, 2024
1 parent 2eef1e8 commit 539c8ba
Show file tree
Hide file tree
Showing 462 changed files with 3,852 additions and 738 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.classpath
.project
.flattened-pom.xml
.factorypath
.settings
/target
2 changes: 2 additions & 0 deletions hp-demo/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.classpath
.project
.flattened-pom.xml
.factorypath
.settings
/target
/bin/
1 change: 1 addition & 0 deletions hp-demo/hp-demo-bff-basic/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.classpath
.project
.flattened-pom.xml
.factorypath
.settings
/target
5 changes: 2 additions & 3 deletions hp-demo/hp-demo-bff-basic/src/main/resources/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ management:
jmx.exposure.exclude: "*"
web.base-path: /__admin
web.exposure.include: "*"
metrics:
export.influx.enabled: false
tags.application: ${hp.soa.web.app.name}
influx.metrics.export.enabled: false
metrics.tags.application: ${hp.soa.web.app.name}

## Spring-Doc 配置
springdoc:
Expand Down
11 changes: 7 additions & 4 deletions hp-demo/hp-demo-bff-basic/src/main/resources/log4j2-gelf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,23 @@

<Properties>
<Property name="base.package">${project.groupId}</Property>
<Property name="project.name">${project.artifactId}</Property>
<Property name="app.name">${sys:hp.soa.web.app.name:-${project.name}}</Property>
<Property name="app.version">${project.version}</Property>
<Property name="log.type">${sys:hpsoa.log4j.logType:-hp-soa}</Property>
<Property name="log.level">${sys:hpsoa.log4j.logLevel:-DEBUG}</Property>
<Property name="log.includeLocation">${sys:hpsoa.log4j.includeLcation:-true}</Property>
<Property name="gelf.host">${sys:hpsoa.log4j.gelf.host:-udp:localhost}</Property>
<Property name="gelf.port">${sys:hpsoa.log4j.gelf.port:-12201}</Property>
<Property name="gelf.maxMsgSize">${sys:hpsoa.log4j.gelf.maxMsgSize:-8192}</Property>
<Property name="timestamp.pattern">%d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}{GMT+0}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}</Property>
<Property name="logfile.max.size">${sys:hpsoa.log4j.logfile.maxSize:-100 MB}</Property>
<Property name="logfile.max.count">${sys:hpsoa.log4j.logfile.maxCount:-10}</Property>
<Property name="logfile.immediateFlush">${sys:hpsoa.log4j.logfile.immediateFlush:-false}</Property>
<Property name="logfile.serviceLogFileName">${sys:hpsoa.log4j.logfile.serviceLogFileName:-service}</Property>
<Property name="logfile.monitorLogFileName">${sys:hpsoa.log4j.logfile.monitorLogFileName:-monitor}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.suffix">%d{yyyy-MM-dd}-%i.log.gz</Property>
<Property name="logfile.stacktrace.filters">${sys:hpsoa.log4j.logfile.stacktrace.filters:-org.springframework.security.web,org.apache.catalina,org.apache.coyote,org.apache.tomcat,org.hibernate,org.apache.el,org.apache.cxf,org.junit,junit.framework,org.jboss,org.h2,org.eclipse,org.richfaces,java.lang.reflect,java.base/java.lang.reflect,jdk.internal.reflect,java.base/jdk.internal.reflect,com.sun,javax.servlet,jakarta.servlet,io.netty.handler.codec,org.apache.dubbo.rpc.cluster.filter,org.springframework.security.web,org.springframework.web.servlet.DispatcherServlet,org.springframework.web.filter.OncePerRequestFilter,org.springframework.aop.framework.ReflectiveMethodInvocation,org.springframework.aop.framework.CglibAopProxy}</Property>
<Property name="logfile.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%t] %C{1.1.1.*}#%M\(L:%L\) -&gt; %m%n%xEx{filters(${logfile.stacktrace.filters})}</Property>
Expand Down Expand Up @@ -64,7 +67,7 @@
<Field name="source_host" pattern="%host{simple}"/>
<Field name="source_ip" pattern="%host{address}"/>
<Field name="log_type" literal="${log.type}" />
<Field name="@version" literal="${project.version}" />
<Field name="@version" literal="${app.version}" />
<DynamicMdcFields regex="mdc.*"/>
<DynamicMdcFields regex="(mdc|MDC)fields"/>
</Gelf>
Expand All @@ -84,7 +87,7 @@
<Field name="source_host" pattern="%host{simple}"/>
<Field name="source_ip" pattern="%host{address}"/>
<Field name="log_type" literal="${log.type}" />
<Field name="@version" literal="${project.version}" />
<Field name="@version" literal="${app.version}" />
<DynamicMdcFields regex="mdc.*"/>
<DynamicMdcFields regex="(mdc|MDC)fields"/>
</Gelf>
Expand Down
11 changes: 7 additions & 4 deletions hp-demo/hp-demo-bff-basic/src/main/resources/log4j2-json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@

<Properties>
<Property name="base.package">${project.groupId}</Property>
<Property name="project.name">${project.artifactId}</Property>
<Property name="app.name">${sys:hp.soa.web.app.name:-${project.name}}</Property>
<Property name="app.version">${project.version}</Property>
<Property name="log.type">${sys:hpsoa.log4j.logType:-hp-soa}</Property>
<Property name="log.level">${sys:hpsoa.log4j.logLevel:-DEBUG}</Property>
<Property name="log.includeLocation">${sys:hpsoa.log4j.includeLcation:-true}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}</Property>
<Property name="logfile.max.size">${sys:hpsoa.log4j.logfile.maxSize:-100 MB}</Property>
<Property name="logfile.max.count">${sys:hpsoa.log4j.logfile.maxCount:-10}</Property>
<Property name="logfile.immediateFlush">${sys:hpsoa.log4j.logfile.immediateFlush:-false}</Property>
<Property name="logfile.serviceLogFileName">${sys:hpsoa.log4j.logfile.serviceLogFileName:-service}</Property>
<Property name="logfile.monitorLogFileName">${sys:hpsoa.log4j.logfile.monitorLogFileName:-monitor}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.suffix">%d{yyyy-MM-dd}-%i.log.gz</Property>
<Property name="logfile.stacktrace.filters">${sys:hpsoa.log4j.logfile.stacktrace.filters:-org.springframework.security.web,org.apache.catalina,org.apache.coyote,org.apache.tomcat,org.hibernate,org.apache.el,org.apache.cxf,org.junit,junit.framework,org.jboss,org.h2,org.eclipse,org.richfaces,java.lang.reflect,java.base/java.lang.reflect,jdk.internal.reflect,java.base/jdk.internal.reflect,com.sun,javax.servlet,jakarta.servlet,io.netty.handler.codec,org.apache.dubbo.rpc.cluster.filter,org.springframework.security.web,org.springframework.web.servlet.DispatcherServlet,org.springframework.web.filter.OncePerRequestFilter,org.springframework.aop.framework.ReflectiveMethodInvocation,org.springframework.aop.framework.CglibAopProxy}</Property>
<Property name="logfile.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%t] %C{1.1.1.*}#%M\(L:%L\) -&gt; %m%n%xEx{filters(${logfile.stacktrace.filters})}</Property>
Expand All @@ -32,7 +35,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-MONITOR"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
<Policies>
<TimeBasedTriggeringPolicy/>
Expand All @@ -45,7 +48,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-SERVICE"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
<Policies>
<TimeBasedTriggeringPolicy/>
Expand Down
11 changes: 7 additions & 4 deletions hp-demo/hp-demo-bff-basic/src/main/resources/log4j2-kafka.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

<Properties>
<Property name="base.package">${project.groupId}</Property>
<Property name="project.name">${project.artifactId}</Property>
<Property name="app.name">${sys:hp.soa.web.app.name:-${project.name}}</Property>
<Property name="app.version">${project.version}</Property>
<Property name="log.type">${sys:hpsoa.log4j.logType:-hp-soa}</Property>
<Property name="log.level">${sys:hpsoa.log4j.logLevel:-DEBUG}</Property>
<Property name="log.includeLocation">${sys:hpsoa.log4j.includeLcation:-true}</Property>
Expand All @@ -14,13 +17,13 @@
<Property name="kafka.ignoreExceptions">${sys:hpsoa.log4j.kafka.ignoreExceptions:-true}</Property>
<Property name="kafka.syncSend">${sys:hpsoa.log4j.kafka.syncSend:-false}</Property>
<Property name="kafka.max.block.ms">${sys:hpsoa.log4j.kafka.max.block.ms:-5000}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}</Property>
<Property name="logfile.max.size">${sys:hpsoa.log4j.logfile.maxSize:-100 MB}</Property>
<Property name="logfile.max.count">${sys:hpsoa.log4j.logfile.maxCount:-10}</Property>
<Property name="logfile.immediateFlush">${sys:hpsoa.log4j.logfile.immediateFlush:-false}</Property>
<Property name="logfile.serviceLogFileName">${sys:hpsoa.log4j.logfile.serviceLogFileName:-service}</Property>
<Property name="logfile.monitorLogFileName">${sys:hpsoa.log4j.logfile.monitorLogFileName:-monitor}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.suffix">%d{yyyy-MM-dd}-%i.log.gz</Property>
<Property name="logfile.stacktrace.filters">${sys:hpsoa.log4j.logfile.stacktrace.filters:-org.springframework.security.web,org.apache.catalina,org.apache.coyote,org.apache.tomcat,org.hibernate,org.apache.el,org.apache.cxf,org.junit,junit.framework,org.jboss,org.h2,org.eclipse,org.richfaces,java.lang.reflect,java.base/java.lang.reflect,jdk.internal.reflect,java.base/jdk.internal.reflect,com.sun,javax.servlet,jakarta.servlet,io.netty.handler.codec,org.apache.dubbo.rpc.cluster.filter,org.springframework.security.web,org.springframework.web.servlet.DispatcherServlet,org.springframework.web.filter.OncePerRequestFilter,org.springframework.aop.framework.ReflectiveMethodInvocation,org.springframework.aop.framework.CglibAopProxy}</Property>
<Property name="logfile.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%t] %C{1.1.1.*}#%M\(L:%L\) -&gt; %m%n%xEx{filters(${logfile.stacktrace.filters})}</Property>
Expand Down Expand Up @@ -64,7 +67,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-MONITOR"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
</kafka>

Expand All @@ -78,7 +81,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-SERVICE"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
</kafka>
</Appenders>
Expand Down
11 changes: 7 additions & 4 deletions hp-demo/hp-demo-bff-basic/src/main/resources/log4j2-redis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

<Properties>
<Property name="base.package">${project.groupId}</Property>
<Property name="project.name">${project.artifactId}</Property>
<Property name="app.name">${sys:hp.soa.web.app.name:-${project.name}}</Property>
<Property name="app.version">${project.version}</Property>
<Property name="log.type">${sys:hpsoa.log4j.logType:-hp-soa}</Property>
<Property name="log.level">${sys:hpsoa.log4j.logLevel:-DEBUG}</Property>
<Property name="log.includeLocation">${sys:hpsoa.log4j.includeLcation:-true}</Property>
Expand All @@ -19,13 +22,13 @@
<Property name="redis.throttler.maxEventCountPerSecond">${sys:hpsoa.log4j.redis.throttler.maxEventCountPerSecond:-0}</Property>
<Property name="redis.throttler.maxByteCountPerSecond">${sys:hpsoa.log4j.redis.throttler.maxByteCountPerSecond:-0}</Property>
<Property name="redis.throttler.maxErrorCountPerSecond">${sys:hpsoa.log4j.redis.throttler.maxErrorCountPerSecond:-0.003}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}</Property>
<Property name="logfile.max.size">${sys:hpsoa.log4j.logfile.maxSize:-100 MB}</Property>
<Property name="logfile.max.count">${sys:hpsoa.log4j.logfile.maxCount:-10}</Property>
<Property name="logfile.immediateFlush">${sys:hpsoa.log4j.logfile.immediateFlush:-false}</Property>
<Property name="logfile.serviceLogFileName">${sys:hpsoa.log4j.logfile.serviceLogFileName:-service}</Property>
<Property name="logfile.monitorLogFileName">${sys:hpsoa.log4j.logfile.monitorLogFileName:-monitor}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.suffix">%d{yyyy-MM-dd}-%i.log.gz</Property>
<Property name="logfile.stacktrace.filters">${sys:hpsoa.log4j.logfile.stacktrace.filters:-org.springframework.security.web,org.apache.catalina,org.apache.coyote,org.apache.tomcat,org.hibernate,org.apache.el,org.apache.cxf,org.junit,junit.framework,org.jboss,org.h2,org.eclipse,org.richfaces,java.lang.reflect,java.base/java.lang.reflect,jdk.internal.reflect,java.base/jdk.internal.reflect,com.sun,javax.servlet,jakarta.servlet,io.netty.handler.codec,org.apache.dubbo.rpc.cluster.filter,org.springframework.security.web,org.springframework.web.servlet.DispatcherServlet,org.springframework.web.filter.OncePerRequestFilter,org.springframework.aop.framework.ReflectiveMethodInvocation,org.springframework.aop.framework.CglibAopProxy}</Property>
<Property name="logfile.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%t] %C{1.1.1.*}#%M\(L:%L\) -&gt; %m%n%xEx{filters(${logfile.stacktrace.filters})}</Property>
Expand Down Expand Up @@ -76,7 +79,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-MONITOR"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
</RedisAppender>

Expand All @@ -97,7 +100,7 @@
<JsonTemplateLayout eventTemplateUri="${json.template.layout}">
<EventTemplateAdditionalField key="log_type" value="${log.type}"/>
<EventTemplateAdditionalField key="facility" value="SOA-SERVICE"/>
<EventTemplateAdditionalField key="@version" value="${project.version}"/>
<EventTemplateAdditionalField key="@version" value="${app.version}"/>
</JsonTemplateLayout>
</RedisAppender>

Expand Down
7 changes: 5 additions & 2 deletions hp-demo/hp-demo-bff-basic/src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@

<Properties>
<Property name="base.package">${project.groupId}</Property>
<Property name="project.name">${project.artifactId}</Property>
<Property name="app.name">${sys:hp.soa.web.app.name:-${project.name}}</Property>
<Property name="app.version">${project.version}</Property>
<Property name="log.type">${sys:hpsoa.log4j.logType:-hp-soa}</Property>
<Property name="log.level">${sys:hpsoa.log4j.logLevel:-DEBUG}</Property>
<Property name="log.includeLocation">${sys:hpsoa.log4j.includeLcation:-true}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}</Property>
<Property name="logfile.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}</Property>
<Property name="logfile.max.size">${sys:hpsoa.log4j.logfile.maxSize:-100 MB}</Property>
<Property name="logfile.max.count">${sys:hpsoa.log4j.logfile.maxCount:-10}</Property>
<Property name="logfile.immediateFlush">${sys:hpsoa.log4j.logfile.immediateFlush:-false}</Property>
<Property name="logfile.serviceLogFileName">${sys:hpsoa.log4j.logfile.serviceLogFileName:-service}</Property>
<Property name="logfile.monitorLogFileName">${sys:hpsoa.log4j.logfile.monitorLogFileName:-monitor}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${project.artifactId}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.path">${sys:hpsoa.log4j.logfile.path:-/data/logs/access}/${app.name}/${date:yyyy-MM}</Property>
<Property name="logfile.archive.suffix">%d{yyyy-MM-dd}-%i.log.gz</Property>
<Property name="logfile.stacktrace.filters">${sys:hpsoa.log4j.logfile.stacktrace.filters:-org.springframework.security.web,org.apache.catalina,org.apache.coyote,org.apache.tomcat,org.hibernate,org.apache.el,org.apache.cxf,org.junit,junit.framework,org.jboss,org.h2,org.eclipse,org.richfaces,java.lang.reflect,java.base/java.lang.reflect,jdk.internal.reflect,java.base/jdk.internal.reflect,com.sun,javax.servlet,jakarta.servlet,io.netty.handler.codec,org.apache.dubbo.rpc.cluster.filter,org.springframework.security.web,org.springframework.web.servlet.DispatcherServlet,org.springframework.web.filter.OncePerRequestFilter,org.springframework.aop.framework.ReflectiveMethodInvocation,org.springframework.aop.framework.CglibAopProxy}</Property>
<Property name="logfile.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%t] %C{1.1.1.*}#%M\(L:%L\) -&gt; %m%n%xEx{filters(${logfile.stacktrace.filters})}</Property>
Expand Down
1 change: 1 addition & 0 deletions hp-demo/hp-demo-bff-cloud/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.classpath
.project
.flattened-pom.xml
.factorypath
.settings
/target
Loading

0 comments on commit 539c8ba

Please sign in to comment.