V1.1.7.2

f02d2829 · 张永 · b1152005 · f02d2829 · f02d2829 · f02d2829
Commit f02d2829 authored Jan 29, 2024 by 张永
4 changed files
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,7 @@
 				</executions>
 				<configuration>
 					<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
-					<tag>V1.1.7.1</tag>
+					<tag>V1.1.7.2</tag>
 					<buildArgs>
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>

--- a/src/main/java/com/egolm/shop/common/component/IDCSystemLogAspect.java
+++ b/src/main/java/com/egolm/shop/common/component/IDCSystemLogAspect.java
@@ -47,7 +47,8 @@ public class IDCSystemLogAspect {
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 	
- 	
+	@Value("${server.shop.name:shop}")
+	private String serverShopName;
 	
 	// 扫描使用@LogResource注解的方法
 	@Pointcut("@annotation(com.egolm.shop.common.component.IDCLogResource)")
@@ -90,7 +91,7 @@ public class IDCSystemLogAspect {
    void syncSaveLog(ProceedingJoinPoint joinPoint, Date startTime, Date endTime,
                     String exception, String result, int statusCode) {
 		TIdcServicesLogs log = new TIdcServicesLogs(); 
-		log.setsChannel("shop");
+		log.setsChannel(serverShopName);
        try {
        	//获取请求参数，不通过 joinPoint.getArgs() 获取。
         

--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,6 +5,9 @@ server.port=30005
 server.servlet.context-path=/shop
 server.session.timeout=90000
 server.tomcat.uri-encoding=utf-8
+
+server.shop.name=shop
+
 spring.http.multipart.maxFileSize=5MB
 spring.http.multipart.maxRequestSize=5MB
 spring.http.encoding.force=true

--- a/src/main/resources/templates/redmine.html
+++ b/src/main/resources/templates/redmine.html
@@ -24,6 +24,8 @@
 </head>
 <body>
 	<div id="app">
+	      <el-divider content-position="left">V1.1.7.2 2024-1-29</el-divider>
+		 <p class="title">1.增加server.shop.name参数,便于分布式布署区分日志。</p> 
 	 	<el-divider content-position="left">V1.1.7.1 2024-1-18</el-divider>
 		 <p class="title">1.张亮观测云测试</p> 
 		 <el-divider content-position="left">V1.1.7 2024-1-11</el-divider>