diff --git a/ant-design-vue-jeecg/src/views/system/modules/DictItemModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DictItemModal.vue index 64b9288..420753a 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/DictItemModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/DictItemModal.vue @@ -94,6 +94,7 @@ edit(record) { if (record.id) { this.dictId = record.dictId; + this.status = record.status; this.visibleCheck = (record.status == 1) ? true : false; } this.form.resetFields(); diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java index 88b95d7..71d4d7c 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java @@ -3,16 +3,20 @@ package org.jeecg.config; import lombok.extern.slf4j.Slf4j; import org.jeecg.handler.HystrixFallbackHandler; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; +import org.springframework.web.reactive.function.server.ServerResponse; import javax.annotation.Resource; +import static org.springframework.web.reactive.function.server.RequestPredicates.GET; +import static org.springframework.web.reactive.function.server.RouterFunctions.route; +import static org.springframework.web.reactive.function.server.ServerResponse.ok; + /** * @author scott * @date 2020/05/26 @@ -74,6 +78,11 @@ public class GatewayRoutersConfiguration { } + @Bean + public RouterFunction<ServerResponse> indexRouter(@Value("classpath:/META-INF/resources/doc.html") final org.springframework.core.io.Resource indexHtml) { + return route(GET("/"), request -> ok().contentType(MediaType.TEXT_HTML).syncBody(indexHtml)); + } + @Resource private HystrixFallbackHandler hystrixFallbackHandler;