From 0ac7776cbb4d4966b18e86ad22344a0944df6be1 Mon Sep 17 00:00:00 2001
From: MicLng <eoyacm81453@unionstone.com.cn>
Date: Sat, 16 Oct 2021 20:19:30 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?=
 =?UTF-8?q?ose=20#3230=20=E4=B8=BA=E5=8D=95=E7=8B=AC=E6=9F=90=E4=B8=AA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=BE=E7=BD=AE=E7=BD=91=E5=85=B3=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=97=B6=E9=97=B4=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java | 3 +++
 .../pigx/admin/config/DynamicRouteInitRunner.java         | 3 ++-
 .../pigx/admin/service/impl/SysRouteConfServiceImpl.java  | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java
index 6c7d33c18..3c73d1ca0 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java
@@ -85,6 +85,9 @@ public class SysRouteConf extends Model<SysRouteConf> {
 	@ApiModelProperty(value = "排序值")
 	private Integer order;
 
+	@ApiModelProperty(value = "元数据")
+	private String metadata;
+
 	/**
 	 * 创建时间
 	 */
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java
index e2c6cf6fa..040d5f11d 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java
@@ -40,6 +40,7 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.scheduling.annotation.Async;
 
 import java.net.URI;
+import java.util.Map;
 
 /**
  * @author lengleng
@@ -74,7 +75,7 @@ public class DynamicRouteInitRunner {
 			vo.setFilters(filterObj.toList(FilterDefinition.class));
 			JSONArray predicateObj = JSONUtil.parseArray(route.getPredicates());
 			vo.setPredicates(predicateObj.toList(PredicateDefinition.class));
-
+			vo.setMetadata(JSONUtil.toBean(route.getMetadata(), Map.class));
 			log.info("加载路由ID：{},{}", route.getRouteId(), vo);
 			redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class));
 			redisTemplate.opsForHash().put(CacheConstants.ROUTE_KEY, route.getRouteId(), vo);
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
index 67ca3265c..0e4ac9591 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
@@ -116,6 +116,13 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 				if (order != null) {
 					vo.setOrder(Integer.parseInt(String.valueOf(order)));
 				}
+
+				Object metadata = map.get("metadata");
+				if (metadata != null) {
+					Map<String, Object> metadataMap = JSONUtil.toBean(String.valueOf(metadata), Map.class);
+					vo.setMetadata(metadataMap);
+				}
+
 				redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class));
 				redisTemplate.opsForHash().put(CacheConstants.ROUTE_KEY, vo.getId(), vo);
 				routeDefinitionVoList.add(vo);
@@ -135,6 +142,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 				routeConf.setPredicates(JSONUtil.toJsonStr(vo.getPredicates()));
 				routeConf.setOrder(vo.getOrder());
 				routeConf.setUri(vo.getUri().toString());
+				routeConf.setMetadata(JSONUtil.toJsonStr(vo.getMetadata()));
 				return routeConf;
 			}).collect(Collectors.toList());
 			this.saveBatch(routeConfList);