Merge branch 'master' into wx

# Conflicts:
#	pigx-common/pigx-common-bom/pom.xml

pigx-visual/pigx-activiti/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-activiti</artifactId>

pigx-visual/pigx-codegen/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-codegen</artifactId>

pigx-visual/pigx-daemon-elastic-job/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-daemon-elastic-job</artifactId>

pigx-visual/pigx-daemon-quartz/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java

@@ -50,7 +50,7 @@ import static com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum.*;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/sys-job")
-@Api(value = "sys-job", description = "定时任务")
+@Api(value = "sys-job", tags = "定时任务")
 public class SysJobController {
 	private final SysJobService sysJobService;
 	private final SysJobLogService sysJobLogService;

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java

@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/sys-job-log")
-@Api(value = "sys-job-log", description = "定时任务日志")
+@Api(value = "sys-job-log", tags = "定时任务日志")
 public class SysJobLogController {
 	private final SysJobLogService sysJobLogService;
 

pigx-visual/pigx-monitor/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-monitor</artifactId>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.6.0</version>
+			<version>2.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java

@@ -17,6 +17,7 @@
 
 package com.pig4cloud.pigx.monitor.support;
 
+import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
 import de.codecentric.boot.admin.server.eventstore.InMemoryEventStore;
@@ -41,16 +42,16 @@ import java.util.List;
 @Configuration
 @AllArgsConstructor
 public class RedisEventStore extends InMemoryEventStore {
-	private final RedisTemplate pigxRedisTemplate;
+	private final RedisTemplate redisTemplate;
 
 	@Override
 	public Mono<Void> append(List<InstanceEvent> events) {
 		events.forEach(event -> {
-			String key = event.getInstance().getValue() + "_" + event.getTimestamp().toString();
+			String key = event.getInstance().getValue() + StrUtil.UNDERLINE + event.getTimestamp().toString();
 			log.info("保存实例事件的KEY：{},EVENT: {}", key, event.getType());
-			pigxRedisTemplate.setKeySerializer(new StringRedisSerializer());
-			pigxRedisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(InstanceEvent.class));
-			pigxRedisTemplate.opsForHash().put(CommonConstants.EVENT_KEY, key, event);
+			redisTemplate.setKeySerializer(new StringRedisSerializer());
+			redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(InstanceEvent.class));
+			redisTemplate.opsForHash().put(CommonConstants.EVENT_KEY, key, event);
 		});
 		return super.append(events);
 	}

pigx-visual/pigx-sso-client-demo/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<dependencies>

pigx-visual/pigx-tx-manager/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-tx-manager</artifactId>

pigx-visual/pigx-zipkin/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>pigx-visual</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

pigx-visual/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-visual</artifactId>