Browse Source

:sparkles: 添加新特性。 新增字段

冷冷 6 years ago
parent
commit
079fbd1c27

File diff suppressed because it is too large
+ 235 - 385
doc/db/pigxx.sql


+ 6 - 0
pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/vo/RouteDefinitionVo.java

@@ -18,6 +18,7 @@
 package com.pig4cloud.pigx.common.gateway.vo
 	;
 
+import lombok.Data;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 
 import java.io.Serializable;
@@ -29,5 +30,10 @@ import java.io.Serializable;
  * 扩展此类支持序列化a
  * See RouteDefinition.class
  */
+@Data
 public class RouteDefinitionVo extends RouteDefinition implements Serializable {
+	/**
+	 * 路由名称
+	 */
+	private String routeName;
 }

+ 5 - 1
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java

@@ -43,6 +43,10 @@ public class SysRouteConf extends Model<SysRouteConf> {
 	 * 路由ID
 	 */
 	private String routeId;
+	/**
+	 * 路由名称
+	 */
+	private String routeName;
 	/**
 	 * 断言
 	 */
@@ -58,7 +62,7 @@ public class SysRouteConf extends Model<SysRouteConf> {
 	/**
 	 * 排序
 	 */
-	@TableField(value="`order`")
+	@TableField(value = "`order`")
 	private Integer order;
 	/**
 	 * 创建时间

+ 1 - 0
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java

@@ -62,6 +62,7 @@ public class DynamicRouteInitRunner {
 
 		routeConfService.routes().forEach(route -> {
 			RouteDefinitionVo vo = new RouteDefinitionVo();
+			vo.setRouteName(route.getRouteName());
 			vo.setId(route.getRouteId());
 			vo.setUri(URI.create(route.getUri()));
 			vo.setOrder(route.getOrder());

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

@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.controller;
 
 import com.pig4cloud.pigx.admin.service.MobileService;
 import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,7 +39,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class MobileController {
 	private final MobileService mobileService;
 
-	@SysLog("发送验证码")
 	@GetMapping("/{mobile}")
 	public R sendSmsCode(@PathVariable String mobile) {
 		return mobileService.sendSmsCode(mobile);

+ 6 - 0
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java

@@ -97,6 +97,11 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 				vo.setId(String.valueOf(id));
 			}
 
+			Object routeName = map.get("routeName");
+			if (routeName != null) {
+				vo.setRouteName(String.valueOf(routeName));
+			}
+
 			Object predicates = map.get("predicates");
 			if (predicates != null) {
 				JSONArray predicatesArray = (JSONArray) predicates;
@@ -137,6 +142,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 		List<SysRouteConf> routeConfList = routeDefinitionVoList.stream().map(vo -> {
 			SysRouteConf routeConf = new SysRouteConf();
 			routeConf.setRouteId(vo.getId());
+			routeConf.setRouteName(vo.getRouteName());
 			routeConf.setFilters(JSONUtil.toJsonStr(vo.getFilters()));
 			routeConf.setPredicates(JSONUtil.toJsonStr(vo.getPredicates()));
 			routeConf.setOrder(vo.getOrder());