接口添加路由

.gitignore

@@ -3,3 +3,6 @@
 .classpath
 .project
 bin/
+*.iml
+spring5-admin/.idea/
+spring5-common/.idea/

spring5-admin/pom.xml

@@ -16,6 +16,16 @@
     </parent>
 
 	<dependencies>
+	    <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-gateway-core</artifactId>
+        </dependency>
+        
+<!--         <dependency> -->
+<!--             <groupId>org.springframework.boot</groupId> -->
+<!--             <artifactId>spring-boot-starter-web</artifactId> -->
+<!--         </dependency> -->
+        
 		<!-- Spring Boot Redis 依赖 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -110,6 +120,12 @@
             <groupId>com.yaozhitech</groupId>
             <artifactId>spring5-auth-client</artifactId>
             <version>0.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-webflux</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 	</dependencies>

spring5-admin/src/main/java/com/yaozhitech/spring5/config/RedisConfig.java

@@ -0,0 +1,71 @@
+package com.yaozhitech.spring5.config;
+
+
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * redis 配置
+ *
+ * @author yinzy
+ */
+@Configuration
+public class RedisConfig extends CachingConfigurerSupport {
+	
+	public static String cachePrefix = "bbc:";
+	
+    @Bean
+    public StringRedisSerializer stringRedisSerializer() {
+        return new StringRedisSerializer();
+    }
+
+    @Bean
+    public GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer() {
+        return new GenericJackson2JsonRedisSerializer();
+    }
+    
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory){
+        StringRedisTemplate template = new StringRedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory,
+                                                       StringRedisSerializer stringRedisSerializer,
+                                                       GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory);
+        redisTemplate.setKeySerializer(stringRedisSerializer);
+        redisTemplate.setValueSerializer(genericJackson2JsonRedisSerializer);
+        redisTemplate.setHashKeySerializer(stringRedisSerializer);
+        redisTemplate.setHashValueSerializer(genericJackson2JsonRedisSerializer);
+        return redisTemplate;
+    }
+    
+    @Bean
+    public ReactiveRedisTemplate<Object, Object> reactiveRedisTemplate(ReactiveRedisConnectionFactory reactiveRedisConnectionFactory) {
+    	ReactiveRedisTemplate<Object, Object> redisTemplate = new ReactiveRedisTemplate(reactiveRedisConnectionFactory, 
+    			RedisSerializationContext.fromSerializer(genericJackson2JsonRedisSerializer()));
+        return redisTemplate;
+    }
+    
+    
+    @Bean
+    public ReactiveStringRedisTemplate ReactiveStringRedisTemplate(ReactiveRedisConnectionFactory reactiveRedisConnectionFactory){
+    	ReactiveStringRedisTemplate template = new ReactiveStringRedisTemplate(reactiveRedisConnectionFactory);
+        return template;
+    }
+    
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/controller/GatewayRouteController.java

@@ -0,0 +1,95 @@
+package com.yaozhitech.spring5.controller;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.yaozhitech.spring5.form.GatewayRoute;
+import com.yaozhitech.spring5.form.GatewayRouteForm;
+import com.yaozhitech.spring5.service.impl.GatewayRouteService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@RestController
+@RequestMapping("/gateway/routes")
+@Api("gateway routes")
+@Slf4j
+public class GatewayRouteController {
+
+    @Autowired
+    private GatewayRouteService gatewayRoutService;
+
+    @ApiOperation(value = "新增网关路由", notes = "新增一个网关路由")
+    @ApiImplicitParam(name = "gatewayRoutForm", value = "新增网关路由form表单", required = true, dataType = "GatewayRouteForm")
+    @PostMapping
+    public String add(@Valid @RequestBody GatewayRouteForm gatewayRoutForm) {
+        log.info("name:", gatewayRoutForm);
+        GatewayRoute gatewayRout = gatewayRoutForm.toPo(GatewayRoute.class);
+        gatewayRoutService.add(gatewayRout);
+        return "success";
+    }
+
+//    @ApiOperation(value = "删除网关路由", notes = "根据url的id来指定删除对象")
+//    @ApiImplicitParam(paramType = "path", name = "id", value = "网关路由ID", required = true, dataType = "long")
+//    @DeleteMapping(value = "/{id}")
+//    public Result delete(@PathVariable String id) {
+//        return Result.success(gatewayRoutService.delete(id));
+//    }
+//
+//    @ApiOperation(value = "修改网关路由", notes = "修改指定网关路由信息")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "网关路由ID", required = true, dataType = "long"),
+//            @ApiImplicitParam(name = "gatewayRoutForm", value = "网关路由实体", required = true, dataType = "GatewayRouteForm")
+//    })
+//    @PutMapping(value = "/{id}")
+//    public Result update(@PathVariable String id, @Valid @RequestBody GatewayRouteForm gatewayRoutForm) {
+//        GatewayRoute gatewayRout = gatewayRoutForm.toPo(GatewayRoute.class);
+//        gatewayRout.setId(id);
+//        return Result.success(gatewayRoutService.update(gatewayRout));
+//    }
+//
+//    @ApiOperation(value = "获取网关路由", notes = "根据id获取指定网关路由信息")
+//    @ApiImplicitParam(paramType = "path", name = "id", value = "网关路由ID", required = true, dataType = "long")
+//    @GetMapping(value = "/{id}")
+//    public Result get(@PathVariable String id) {
+//        log.info("get with id:{}", id);
+//        return Result.success(new GatewayRouteVo(gatewayRoutService.get(id)));
+//    }
+//
+//    @ApiOperation(value = "根据uri获取网关路由", notes = "根据uri获取网关路由信息，简单查询")
+//    @ApiImplicitParam(paramType = "query", name = "name", value = "网关路由路径", required = true, dataType = "string")
+//    @ApiResponses(
+//            @ApiResponse(code = 200, message = "处理成功", response = Result.class)
+//    )
+//    @GetMapping
+//    public Result getByUri(@RequestParam String uri) {
+//        return Result.success(gatewayRoutService.query(new GatewayRouteQueryParam(uri)).stream().findFirst());
+//    }
+//
+//    @ApiOperation(value = "搜索网关路由", notes = "根据条件查询网关路由信息")
+//    @ApiImplicitParam(name = "gatewayRoutQueryForm", value = "网关路由查询参数", required = true, dataType = "GatewayRouteQueryForm")
+//    @ApiResponses(
+//            @ApiResponse(code = 200, message = "处理成功", response = Result.class)
+//    )
+//    @PostMapping(value = "/conditions")
+//    public Result search(@Valid @RequestBody GatewayRouteQueryForm gatewayRouteQueryForm) {
+//        return Result.success(gatewayRoutService.query(gatewayRouteQueryForm.toParam(GatewayRouteQueryParam.class)));
+//    }
+//
+//    @ApiOperation(value = "重载网关路由", notes = "将所以网关的路由全部重载到redis中")
+//    @ApiResponses(
+//            @ApiResponse(code = 200, message = "处理成功", response = Result.class)
+//    )
+//    @PostMapping(value = "/overload")
+//    public Result overload() {
+//        return Result.success(gatewayRoutService.overload());
+//    }
+
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/BasePo.java

@@ -0,0 +1,34 @@
+package com.yaozhitech.spring5.form;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class BasePo implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -191156952545501329L;
+
+	@TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createdTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updatedTime;
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/FilterDefinition.java

@@ -0,0 +1,16 @@
+package com.yaozhitech.spring5.form;
+
+import lombok.*;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@EqualsAndHashCode
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FilterDefinition {
+    private String name;
+    private Map<String, String> args = new LinkedHashMap<>();
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/GatewayRoute.java

@@ -0,0 +1,22 @@
+package com.yaozhitech.spring5.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GatewayRoute extends BasePo {
+    private String uri;
+    private String routeId;
+    private String predicates;
+    private String filters;
+    private String description;
+    private Integer orders = 0;
+    private String status = "Y";
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/GatewayRouteForm.java

@@ -0,0 +1,58 @@
+package com.yaozhitech.spring5.form;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import org.springframework.beans.BeanUtils;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+@ApiModel
+@Data
+@Slf4j
+public class GatewayRouteForm {
+
+    @NotEmpty(message = "网关断言不能为空")
+    @ApiModelProperty(value = "网关断言")
+    private List<PredicateDefinition> predicates = new ArrayList<>();
+
+    @ApiModelProperty(value = "网关过滤器信息")
+    private List<FilterDefinition> filters = new ArrayList<>();
+
+    @NotBlank(message = "uri不能为空")
+    @ApiModelProperty(value = "网关uri")
+    private String uri;
+
+    @NotBlank(message = "路由id不能为空")
+    @ApiModelProperty(value = "网关路由id")
+    private String routeId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer orders = 0;
+
+    @ApiModelProperty(value = "网关路由描述信息")
+    private String description;
+
+    
+    public GatewayRoute toPo(Class<GatewayRoute> clazz) {
+        GatewayRoute gatewayRoute = new GatewayRoute();
+        BeanUtils.copyProperties(this, gatewayRoute);
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            gatewayRoute.setFilters(objectMapper.writeValueAsString(this.getFilters()));
+            gatewayRoute.setPredicates(objectMapper.writeValueAsString(this.getPredicates()));
+        } catch (JsonProcessingException e) {
+            log.error("网关filter或predicates配置转换异常", e);
+        }
+        return gatewayRoute;
+    }
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/GatewayRouteQueryForm.java

@@ -0,0 +1,29 @@
+package com.yaozhitech.spring5.form;
+
+import java.util.Date;
+
+import javax.validation.constraints.Past;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class GatewayRouteQueryForm {
+
+    @ApiModelProperty(value = "uri路径", required = true)
+    private String uri;
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    @Past(message = "查询开始时间必须小于当前日期")
+    @ApiModelProperty(value = "查询开始时间")
+    private Date createdTimeStart;
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    @Past(message = "查询结束时间必须小于当前日期")
+    @ApiModelProperty(value = "查询结束时间")
+    private Date createdTimeEnd;
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/form/PredicateDefinition.java

@@ -0,0 +1,16 @@
+package com.yaozhitech.spring5.form;
+
+import lombok.*;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@EqualsAndHashCode
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PredicateDefinition {
+    private String name;
+    private Map<String, String> args = new LinkedHashMap<>();
+}

spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/GatewayRouteService.java

@@ -0,0 +1,87 @@
+package com.yaozhitech.spring5.service.impl;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+
+import org.springframework.cloud.gateway.route.RouteDefinition;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yaozhitech.spring5.form.FilterDefinition;
+import com.yaozhitech.spring5.form.GatewayRoute;
+import com.yaozhitech.spring5.form.PredicateDefinition;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+public class GatewayRouteService {
+
+    private static final String GATEWAY_ROUTES = "gateway_routes::";
+    
+    private RedisTemplate redisTemplate;
+
+//    @CreateCache(name = GATEWAY_ROUTES, cacheType = CacheType.REMOTE)
+//    private Cache<String, RouteDefinition> gatewayRouteCache;
+//
+//    @Autowired
+//    private EventSender eventSender;
+
+    public boolean add(GatewayRoute gatewayRoute) {
+//        boolean isSuccess = this.save(gatewayRoute);
+        // 转化为gateway需要的类型，缓存到redis, 并事件通知各网关应用
+        RouteDefinition routeDefinition = gatewayRouteToRouteDefinition(gatewayRoute);
+        
+        redisTemplate.opsForValue().set(gatewayRoute.getRouteId(), routeDefinition);
+//        eventSender.send(BusConfig.ROUTING_KEY, routeDefinition);
+        return true;
+    }
+
+//    public boolean delete(String id) {
+//        GatewayRoute gatewayRoute = this.getById(id);
+//        // 删除redis缓存, 并事件通知各网关应用
+//        gatewayRouteCache.remove(gatewayRoute.getRouteId());
+//        eventSender.send(BusConfig.ROUTING_KEY, gatewayRouteToRouteDefinition(gatewayRoute));
+//        return this.removeById(id);
+//    }
+//
+//    public boolean update(GatewayRoute gatewayRoute) {
+//        boolean isSuccess = this.updateById(gatewayRoute);
+//        // 转化为gateway需要的类型，缓存到redis, 并事件通知各网关应用
+//        RouteDefinition routeDefinition = gatewayRouteToRouteDefinition(gatewayRoute);
+//        gatewayRouteCache.put(gatewayRoute.getRouteId(), routeDefinition);
+//        eventSender.send(BusConfig.ROUTING_KEY, routeDefinition);
+//        return isSuccess;
+//    }
+//
+    /**
+     * 将数据库中json对象转换为网关需要的RouteDefinition对象
+     *
+     * @param gatewayRoute
+     * @return RouteDefinition
+     */
+    private RouteDefinition gatewayRouteToRouteDefinition(GatewayRoute gatewayRoute) {
+        RouteDefinition routeDefinition = new RouteDefinition();
+        routeDefinition.setId(gatewayRoute.getRouteId());
+        routeDefinition.setOrder(gatewayRoute.getOrders());
+        routeDefinition.setUri(URI.create(gatewayRoute.getUri()));
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            routeDefinition.setFilters(objectMapper.readValue(gatewayRoute.getFilters(), new TypeReference<List<FilterDefinition>>() {
+            }));
+            routeDefinition.setPredicates(objectMapper.readValue(gatewayRoute.getPredicates(), new TypeReference<List<PredicateDefinition>>() {
+            }));
+        } catch (IOException e) {
+            log.error("网关路由对象转换失败", e);
+        }
+        return routeDefinition;
+    }
+//
+//    public GatewayRoute get(String id) {
+//        return this.getById(id);
+//    }
+
+}

spring5-auth/spring5-auth-client/pom.xml

@@ -6,7 +6,7 @@
 	<artifactId>spring5-auth-client</artifactId>
 	<packaging>jar</packaging>
 	<name>${project.artifactId}</name>
-    <description>spring5 demo</description>
+    <description>spring5 demo</description> 
 	
 	<parent>
         <groupId>com.yaozhitech</groupId>
@@ -21,12 +21,6 @@
 <!--             <artifactId>spring-boot-starter-data-redis-reactive</artifactId> -->
 <!--         </dependency> -->
         
-        <!-- Spring Boot Web 依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        
         <!-- jwt -->
         <dependency>
             <groupId>com.auth0</groupId>

spring5-common/pom.xml

@@ -19,6 +19,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions></exclusions>
         </dependency>
 		
 	</dependencies>