From 4796f51458ae3b0887a7980a12476e5c5b95f2a4 Mon Sep 17 00:00:00 2001 From: WenG <450292408@qq.com> Date: Wed, 14 Apr 2021 14:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ink/wgink/gateway/config/BeanConfig.java | 13 ------- .../gateway/dao/route/impl/RouteDaoImpl.java | 4 +-- .../gateway/pojo/dtos/route/RouteDTO.java | 9 +++-- .../wgink/gateway/pojo/pos/route/RoutePO.java | 9 ++--- .../wgink/gateway/pojo/vos/route/RouteVO.java | 36 ++----------------- 5 files changed, 13 insertions(+), 58 deletions(-) diff --git a/src/main/java/ink/wgink/gateway/config/BeanConfig.java b/src/main/java/ink/wgink/gateway/config/BeanConfig.java index 27deced..8ad1011 100644 --- a/src/main/java/ink/wgink/gateway/config/BeanConfig.java +++ b/src/main/java/ink/wgink/gateway/config/BeanConfig.java @@ -1,22 +1,9 @@ package ink.wgink.gateway.config; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.MediaType; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; /** * When you feel like quitting. Think about why you started diff --git a/src/main/java/ink/wgink/gateway/dao/route/impl/RouteDaoImpl.java b/src/main/java/ink/wgink/gateway/dao/route/impl/RouteDaoImpl.java index cce2c20..cf08242 100644 --- a/src/main/java/ink/wgink/gateway/dao/route/impl/RouteDaoImpl.java +++ b/src/main/java/ink/wgink/gateway/dao/route/impl/RouteDaoImpl.java @@ -64,8 +64,8 @@ public class RouteDaoImpl extends BaseDao implements IRouteDao { Update update = new Update(); update.set("system", routePO.getSystem()); update.set("summary", routePO.getSummary()); - update.set("inUrl", routePO.getInUrl()); - update.set("outUrl", routePO.getOutUrl()); + update.set("path", routePO.getPath()); + update.set("uri", routePO.getUri()); setUpdate(update); mongoTemplate.updateMulti(new Query(Criteria.where(ISystemConst.UUID).is(uuid)), update, RoutePO.class); } diff --git a/src/main/java/ink/wgink/gateway/pojo/dtos/route/RouteDTO.java b/src/main/java/ink/wgink/gateway/pojo/dtos/route/RouteDTO.java index 6e586e4..15ed11a 100644 --- a/src/main/java/ink/wgink/gateway/pojo/dtos/route/RouteDTO.java +++ b/src/main/java/ink/wgink/gateway/pojo/dtos/route/RouteDTO.java @@ -1,10 +1,9 @@ package ink.wgink.gateway.pojo.dtos.route; +import ink.wgink.gateway.dao.route.IRouteDao; import ink.wgink.gateway.pojo.BasePOJO; import lombok.Data; import lombok.ToString; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; import java.io.Serializable; @@ -21,13 +20,13 @@ import java.io.Serializable; */ @Data @ToString -@Document(collection = "sys_route") +@Document(collection = IRouteDao.COLLECTION_NAME) public class RouteDTO extends BasePOJO implements Serializable { private static final long serialVersionUID = -4892456861969101733L; private String system; private String summary; - private String outUrl; - private String inUrl; + private String path; + private String uri; } diff --git a/src/main/java/ink/wgink/gateway/pojo/pos/route/RoutePO.java b/src/main/java/ink/wgink/gateway/pojo/pos/route/RoutePO.java index d1d4d45..05bcc8c 100644 --- a/src/main/java/ink/wgink/gateway/pojo/pos/route/RoutePO.java +++ b/src/main/java/ink/wgink/gateway/pojo/pos/route/RoutePO.java @@ -1,9 +1,9 @@ package ink.wgink.gateway.pojo.pos.route; +import ink.wgink.gateway.dao.route.IRouteDao; import ink.wgink.gateway.pojo.BasePOJO; import lombok.Data; import lombok.ToString; -import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; @@ -21,15 +21,16 @@ import java.io.Serializable; */ @Data @ToString -@Document(collection = "sys_route") +@Document(collection = IRouteDao.COLLECTION_NAME) public class RoutePO extends BasePOJO implements Serializable { private static final long serialVersionUID = 3471850588453134724L; + @Indexed private String system; private String summary; @Indexed - private String outUrl; + private String path; @Indexed - private String inUrl; + private String uri; } diff --git a/src/main/java/ink/wgink/gateway/pojo/vos/route/RouteVO.java b/src/main/java/ink/wgink/gateway/pojo/vos/route/RouteVO.java index 9e2727f..a4286d4 100644 --- a/src/main/java/ink/wgink/gateway/pojo/vos/route/RouteVO.java +++ b/src/main/java/ink/wgink/gateway/pojo/vos/route/RouteVO.java @@ -2,7 +2,6 @@ package ink.wgink.gateway.pojo.vos.route; import lombok.Data; import lombok.ToString; -import org.springframework.data.mongodb.core.index.Indexed; /** * When you feel like quitting. Think about why you started @@ -20,38 +19,7 @@ public class RouteVO { private String system; private String summary; - private String outUrl; - private String inUrl; + private String path; + private String uri; - public String getSystem() { - return system == null ? "" : system; - } - - public void setSystem(String system) { - this.system = system; - } - - public String getSummary() { - return summary == null ? "" : summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } - - public String getOutUrl() { - return outUrl == null ? "" : outUrl; - } - - public void setOutUrl(String outUrl) { - this.outUrl = outUrl; - } - - public String getInUrl() { - return inUrl == null ? "" : inUrl; - } - - public void setInUrl(String inUrl) { - this.inUrl = inUrl; - } }