:bookmark: Releasing / Version tags. 2.7.0

docker-compose.yml

@@ -1,4 +1,4 @@
-# 使用说明 V2.6.0
+# 使用说明 V2.7.0
 # 1. 使用docker-compose  宿主机不需要配置host来发现
 # 2. 无需修改源码，根目录  docker-compose up 即可
 # 3. 静静等待服务启动
@@ -106,7 +106,6 @@ services:
     image: pigx-daemon-elastic-job
     container_name: pigx-daemon-elastic-job
 
-
   pigx-codegen:
     build:
       context: ./

pigx-auth/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-auth</artifactId>

pigx-common/pigx-common-bom/pom.xml

@@ -16,9 +16,10 @@
 	<description>pigx 公共版本控制</description>
 
 	<properties>
-		<pigx.version>2.6.0</pigx.version>
+		<pigx.version>2.7.0</pigx.version>
 		<mybatis-plus.version>3.1.0</mybatis-plus.version>
 		<mysql.connector.version>8.0.13</mysql.connector.version>
+		<swagger.core.version>1.5.22</swagger.core.version>
 	</properties>
 
 	<dependencyManagement>
@@ -92,6 +93,17 @@
 				<artifactId>mysql-connector-java</artifactId>
 				<version>${mysql.connector.version}</version>
 			</dependency>
+			<!--swagger 最新依赖内置版本-->
+			<dependency>
+				<groupId>io.swagger</groupId>
+				<artifactId>swagger-models</artifactId>
+				<version>${swagger.core.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.swagger</groupId>
+				<artifactId>swagger-annotations</artifactId>
+				<version>${swagger.core.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 </project>

pigx-common/pigx-common-core/pom.xml

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

pigx-common/pigx-common-data/pom.xml

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

pigx-common/pigx-common-gateway/pom.xml

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

pigx-common/pigx-common-job/pom.xml

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

pigx-common/pigx-common-log/pom.xml

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

pigx-common/pigx-common-minio/pom.xml

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

pigx-common/pigx-common-security/pom.xml

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

pigx-common/pigx-common-swagger/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-common-swagger</artifactId>
@@ -38,7 +38,8 @@
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
-			<version>${swagger.version}</version>
+			<version>${swagger.fox.version}</version>
 		</dependency>
+
 	</dependencies>
 </project>

pigx-common/pigx-common-transaction/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
 	</parent>
 
 	<artifactId>pigx-common-transaction</artifactId>

pigx-common/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-common</artifactId>

pigx-config/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-config</artifactId>

pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml

@@ -23,11 +23,11 @@ spring:
     password: root
     url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
 
-# 文件系统
+# 文件系统 (提供测试环境，不要乱传)
 minio:
-  url: http://139.224.200.249:9090
-  access-key: lengleng
-  secret-key: lengleng
+  url: https://minio.pig4cloud.com
+  access-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)
+  secret-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)
 
 # Logger Config
 logging:

pigx-eureka/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-eureka</artifactId>

pigx-gateway/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-gateway</artifactId>
@@ -72,12 +72,12 @@
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
-			<version>${swagger.version}</version>
+			<version>${swagger.fox.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
-			<version>${swagger.version}</version>
+			<version>${swagger.fox.version}</version>
 		</dependency>
 	</dependencies>
 

pigx-upms/pigx-upms-api/pom.xml

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

pigx-upms/pigx-upms-biz/pom.xml

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

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java

@@ -42,7 +42,7 @@ import java.time.LocalDateTime;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/dept")
-@Api(value = "dept", description = "部门管理模块")
+@Api(value = "dept", tags = "部门管理模块")
 public class DeptController {
 	private final SysDeptService sysDeptService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java

@@ -49,7 +49,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/dict")
-@Api(value = "dict", description = "字典管理模块")
+@Api(value = "dict", tags = "字典管理模块")
 public class DictController {
 	private final SysDictService sysDictService;
 	private final SysDictItemService sysDictItemService;

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java

@@ -24,6 +24,7 @@ import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.common.minio.service.MinioTemplate;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.core.util.R;
+import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -44,18 +45,20 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/file")
+@Api(value = "file", tags = "文件管理模块")
 public class FileController {
 	private final MinioTemplate minioTemplate;
 
 	/**
 	 * 上传文件
 	 * 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
+	 *
 	 * @param file 资源
 	 * @return R(bucketName, filename)
 	 */
 	@PostMapping("/upload")
 	public R upload(@RequestParam("file") MultipartFile file) {
-		String fileName = IdUtil.simpleUUID()+StrUtil.DOT+ FileUtil.extName(file.getOriginalFilename());
+		String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
 		Map<String, String> resultMap = new HashMap<>(4);
 		resultMap.put("bucketName", CommonConstants.BUCKET_NAME);
 		resultMap.put("fileName", fileName);

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java

@@ -46,7 +46,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/log")
-@Api(value = "log", description = "日志管理模块")
+@Api(value = "log", tags = "日志管理模块")
 public class LogController {
 	private final SysLogService sysLogService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java

@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/menu")
-@Api(value = "menu", description = "菜单管理模块")
+@Api(value = "menu", tags = "菜单管理模块")
 public class MenuController {
 	private final SysMenuService sysMenuService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/mobile")
-@Api(value = "mobile", description = "手机管理模块")
+@Api(value = "mobile", tags = "手机管理模块")
 public class MobileController {
 	private final MobileService mobileService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java

@@ -43,7 +43,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/client")
-@Api(value = "client", description = "客户端管理模块")
+@Api(value = "client", tags = "客户端管理模块")
 public class OauthClientDetailsController {
 	private final SysOauthClientDetailsService sysOauthClientDetailsService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java

@@ -40,7 +40,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/role")
-@Api(value = "role", description = "角色管理模块")
+@Api(value = "role", tags = "角色管理模块")
 public class RoleController {
 	private final SysRoleService sysRoleService;
 	private final SysRoleMenuService sysRoleMenuService;

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/route")
-@Api(value = "route",description = "动态路由管理模块")
+@Api(value = "route",tags = "动态路由管理模块")
 public class SysRouteConfController {
 	private final SysRouteConfService sysRouteConfService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java

@@ -41,7 +41,7 @@ import javax.validation.Valid;
 @RestController
 @RequestMapping("/social")
 @AllArgsConstructor
-@Api(value = "social", description = "三方账号管理模块")
+@Api(value = "social", tags = "三方账号管理模块")
 public class SysSocialDetailsController {
 	private final SysSocialDetailsService sysSocialDetailsService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/token")
-@Api(value = "token", description = "令牌管理模块")
+@Api(value = "token", tags = "令牌管理模块")
 public class TokenController {
 	private final RemoteTokenService remoteTokenService;
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java

@@ -45,7 +45,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/user")
-@Api(value = "user", description = "用户管理模块")
+@Api(value = "user", tags = "用户管理模块")
 public class UserController {
 	private final SysUserService userService;
 

pigx-upms/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-upms</artifactId>

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>

pom.xml

@@ -24,7 +24,7 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pigx</artifactId>
-	<version>2.6.0</version>
+	<version>2.7.0</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<organization>
@@ -51,7 +51,7 @@
 		<spring-boot-admin.version>2.1.3</spring-boot-admin.version>
 		<hutool.version>4.4.5</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
-		<swagger.version>2.9.2</swagger.version>
+		<swagger.fox.version>2.9.2</swagger.fox.version>
 		<curator.version>2.10.0</curator.version>
 		<velocity.version>1.7</velocity.version>
 		<lcn.version>4.1.0</lcn.version>