From a4fa22c84521b07afdf64e470c29b046f8ad9dcf Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 25 May 2022 01:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E4=BE=9D=E8=B5=96=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 33 ++++ .../gatewaymanage/pojo/bos/api/ApiBO.java | 5 +- .../pojo/bos/broker/BrokerBO.java | 5 +- .../gatewaymanage/pojo/bos/claim/ClaimBO.java | 5 +- .../pojo/bos/client/ClientBO.java | 5 +- .../pojo/bos/header/HeaderBO.java | 5 +- .../pojo/bos/message/MessageBO.java | 5 +- .../bos/requestparams/RequestParamsBO.java | 5 +- .../bos/responseparams/ResponseParamsBO.java | 5 +- .../pojo/bos/source/SourceBO.java | 5 +- .../gatewaymanage/pojo/bos/task/TaskBO.java | 5 +- .../gatewaymanage/pojo/dtos/api/ApiDTO.java | 5 +- .../pojo/dtos/broker/BrokerDTO.java | 5 +- .../pojo/dtos/claim/ClaimDTO.java | 5 +- .../pojo/dtos/client/ClientDTO.java | 5 +- .../pojo/dtos/header/HeaderDTO.java | 5 +- .../pojo/dtos/message/MessageDTO.java | 5 +- .../dtos/requestparams/RequestParamsDTO.java | 5 +- .../responseparams/ResponseParamsDTO.java | 5 +- .../pojo/dtos/source/SourceDTO.java | 5 +- .../pojo/dtos/system/SystemDTO.java | 5 +- .../gatewaymanage/pojo/dtos/task/TaskDTO.java | 5 +- .../gatewaymanage/pojo/pos/api/ApiPO.java | 5 +- .../pojo/pos/broker/BrokerPO.java | 5 +- .../gatewaymanage/pojo/pos/claim/ClaimPO.java | 5 +- .../pojo/pos/client/ClientPO.java | 5 +- .../pojo/pos/header/HeaderPO.java | 5 +- .../pojo/pos/message/MessagePO.java | 5 +- .../pos/requestparams/RequestParamsPO.java | 5 +- .../pos/responseparams/ResponseParamsPO.java | 5 +- .../pojo/pos/source/SourcePO.java | 5 +- .../gatewaymanage/pojo/pos/task/TaskPO.java | 5 +- .../broker/impl/BrokerServiceImpl.java | 2 - .../broker/impl/BrokerServiceMongoImpl.java | 153 ++++++++++++++++++ src/main/resources/application-prod.yml | 22 ++- src/main/resources/application-test.yml | 20 +++ src/main/resources/mybatis/mybatis-config.xml | 2 +- .../resources/static/route/broker/list.html | 25 +-- 38 files changed, 353 insertions(+), 59 deletions(-) create mode 100644 src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java diff --git a/pom.xml b/pom.xml index cdd2974..ad7d420 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,39 @@ 2.0.1 + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + + + + org.springframework.session + spring-session-data-redis + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + ink.wgink + mongo-login + 1.0-SNAPSHOT + + + + ink.wgink + mongo-menu + 1.0-SNAPSHOT + + ink.wgink login-oauth2-server diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/api/ApiBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/api/ApiBO.java index daff318..db25cc0 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/api/ApiBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/api/ApiBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.api; +import java.io.Serializable; + /** * * @ClassName: ApiBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.api; * @Date: 2021-08-16 14:50:40 * @Version: 3.0 **/ -public class ApiBO { +public class ApiBO implements Serializable { + private static final long serialVersionUID = -6838504531704427115L; private String apiId; private String systemId; private String title; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/broker/BrokerBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/broker/BrokerBO.java index 2202d4a..12aef1c 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/broker/BrokerBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/broker/BrokerBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.broker; +import java.io.Serializable; + /** * * @ClassName: BrokerBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.broker; * @Date: 2021-08-23 21:44:01 * @Version: 3.0 **/ -public class BrokerBO { +public class BrokerBO implements Serializable { + private static final long serialVersionUID = 4026458867068856264L; private String brokerId; private String clientId; private String brokerName; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/claim/ClaimBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/claim/ClaimBO.java index d25300b..e102192 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/claim/ClaimBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/claim/ClaimBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.claim; +import java.io.Serializable; + /** * * @ClassName: ClaimBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.claim; * @Date: 2021-08-16 14:58:13 * @Version: 3.0 **/ -public class ClaimBO { +public class ClaimBO implements Serializable { + private static final long serialVersionUID = 2170652750366426373L; private String claimId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/client/ClientBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/client/ClientBO.java index 89c549f..f589965 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/client/ClientBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/client/ClientBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.client; +import java.io.Serializable; + /** * * @ClassName: ClientBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.client; * @Date: 2021-08-23 21:44:36 * @Version: 3.0 **/ -public class ClientBO { +public class ClientBO implements Serializable { + private static final long serialVersionUID = -462280875565348320L; private String clientId; private String clientName; private String clientSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java index 8c9962d..5d06021 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.header; +import java.io.Serializable; + /** * * @ClassName: HeaderBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.header; * @Date: 2021-08-16 14:58:46 * @Version: 3.0 **/ -public class HeaderBO { +public class HeaderBO implements Serializable { + private static final long serialVersionUID = -1097947988796128852L; private String headerId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/message/MessageBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/message/MessageBO.java index 65ce117..0b7f8cf 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/message/MessageBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/message/MessageBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.message; +import java.io.Serializable; + /** * * @ClassName: MessageBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.message; * @Date: 2021-08-23 21:45:28 * @Version: 3.0 **/ -public class MessageBO { +public class MessageBO implements Serializable { + private static final long serialVersionUID = -5637364561243041119L; private String messageId; private String messageGroup; private String messageTopic; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/requestparams/RequestParamsBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/requestparams/RequestParamsBO.java index 59db92d..e63c0d8 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/requestparams/RequestParamsBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/requestparams/RequestParamsBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.requestparams; +import java.io.Serializable; + /** * * @ClassName: RequestParamsBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.requestparams; * @Date: 2021-08-16 14:59:34 * @Version: 3.0 **/ -public class RequestParamsBO { +public class RequestParamsBO implements Serializable { + private static final long serialVersionUID = -8165161661872402160L; private String requestParamsId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java index 3c19d42..8627766 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.responseparams; +import java.io.Serializable; + /** * * @ClassName: ResponseParamsBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.responseparams; * @Date: 2021-08-16 15:00:02 * @Version: 3.0 **/ -public class ResponseParamsBO { +public class ResponseParamsBO implements Serializable { + private static final long serialVersionUID = -3903873517438084324L; private String responseParamsId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/source/SourceBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/source/SourceBO.java index 9cfc2cb..dc8cfc4 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/source/SourceBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/source/SourceBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.source; +import java.io.Serializable; + /** * * @ClassName: SourceBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.source; * @Date: 2021-08-23 21:42:29 * @Version: 3.0 **/ -public class SourceBO { +public class SourceBO implements Serializable { + private static final long serialVersionUID = 8616108160990417463L; private String sourceId; private String sourceName; private String sourceSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/task/TaskBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/task/TaskBO.java index bf31647..ede9274 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/task/TaskBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/task/TaskBO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.bos.task; +import java.io.Serializable; + /** * * @ClassName: TaskBO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.bos.task; * @Date: 2021-08-23 21:43:18 * @Version: 3.0 **/ -public class TaskBO { +public class TaskBO implements Serializable { + private static final long serialVersionUID = 1037087039408507536L; private String taskId; private String taskName; private String taskSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/api/ApiDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/api/ApiDTO.java index 87f6076..e245188 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/api/ApiDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/api/ApiDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: ApiDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class ApiDTO { +public class ApiDTO implements Serializable { + private static final long serialVersionUID = 1873242612175290281L; @ApiModelProperty(name = "apiId", value = "主键") private String apiId; @ApiModelProperty(name = "systemId", value = "系统ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/broker/BrokerDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/broker/BrokerDTO.java index 7ed77b1..c981c0d 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/broker/BrokerDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/broker/BrokerDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.broker; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: BrokerDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class BrokerDTO { +public class BrokerDTO implements Serializable { + private static final long serialVersionUID = -5304508586239848809L; @ApiModelProperty(name = "brokerId", value = "") private String brokerId; @ApiModelProperty(name = "clientId", value = "客户端ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/claim/ClaimDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/claim/ClaimDTO.java index c6bfcdf..6de6aca 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/claim/ClaimDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/claim/ClaimDTO.java @@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import java.io.Serializable; + /** * @ClassName: ClaimDTO * @Description: 接口认领 @@ -17,8 +19,9 @@ import lombok.ToString; @Data @ToString @ApiModel -public class ClaimDTO { +public class ClaimDTO implements Serializable { + private static final long serialVersionUID = 4799478018471131528L; @ApiModelProperty(name = "claimId", value = "主键") private String claimId; @ApiModelProperty(name = "systemId", value = "系统ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/client/ClientDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/client/ClientDTO.java index c2ed404..fc523d6 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/client/ClientDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/client/ClientDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.client; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: ClientDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class ClientDTO { +public class ClientDTO implements Serializable { + private static final long serialVersionUID = 2154620616133215587L; @ApiModelProperty(name = "clientId", value = "主键") private String clientId; @ApiModelProperty(name = "clientName", value = "客户端名称") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java index 971f174..1733476 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.header; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: HeaderDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class HeaderDTO { +public class HeaderDTO implements Serializable { + private static final long serialVersionUID = 650852083293975395L; @ApiModelProperty(name = "headerId", value = "主键") private String headerId; @ApiModelProperty(name = "systemId", value = "系统ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/message/MessageDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/message/MessageDTO.java index e676539..1cace8d 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/message/MessageDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/message/MessageDTO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import java.io.Serializable; + /** * * @ClassName: MessageDTO @@ -16,8 +18,9 @@ import lombok.ToString; @Data @ToString @ApiModel -public class MessageDTO { +public class MessageDTO implements Serializable { + private static final long serialVersionUID = 7358689217243831191L; @ApiModelProperty(name = "messageId", value = "主键") private String messageId; @ApiModelProperty(name = "messageGroup", value = "消息组") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/requestparams/RequestParamsDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/requestparams/RequestParamsDTO.java index 02407ee..98631fc 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/requestparams/RequestParamsDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/requestparams/RequestParamsDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.requestparams; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: RequestParamsDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class RequestParamsDTO { +public class RequestParamsDTO implements Serializable { + private static final long serialVersionUID = 2057622457073307405L; @ApiModelProperty(name = "requestParamsId", value = "主键") private String requestParamsId; @ApiModelProperty(name = "systemId", value = "系统ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java index 3128997..e820dbc 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.responseparams; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: ResponseParamsDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class ResponseParamsDTO { +public class ResponseParamsDTO implements Serializable { + private static final long serialVersionUID = 5241875395939202651L; @ApiModelProperty(name = "responseParamsId", value = "主键") private String responseParamsId; @ApiModelProperty(name = "systemId", value = "系统ID") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/source/SourceDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/source/SourceDTO.java index 005da74..79f03d0 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/source/SourceDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/source/SourceDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.source; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: SourceDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class SourceDTO { +public class SourceDTO implements Serializable { + private static final long serialVersionUID = -9174342906617603492L; @ApiModelProperty(name = "sourceId", value = "主键") private String sourceId; @ApiModelProperty(name = "sourceName", value = "源名称") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java index bd9e613..e09232f 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java @@ -3,6 +3,8 @@ package ink.wgink.gatewaymanage.pojo.dtos.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: SystemDTO * @Description: 接口系统 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class SystemDTO { +public class SystemDTO implements Serializable { + private static final long serialVersionUID = 5686792172461858480L; @ApiModelProperty(name = "systemId", value = "") private String systemId; @ApiModelProperty(name = "name", value = "名称") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/task/TaskDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/task/TaskDTO.java index 4dd4432..2f720a3 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/task/TaskDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/task/TaskDTO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import java.io.Serializable; + /** * * @ClassName: TaskDTO @@ -16,8 +18,9 @@ import lombok.ToString; @Data @ToString @ApiModel -public class TaskDTO { +public class TaskDTO implements Serializable { + private static final long serialVersionUID = 3374440825835076595L; @ApiModelProperty(name = "taskId", value = "主键") private String taskId; @ApiModelProperty(name = "taskName", value = "任务名称") diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/api/ApiPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/api/ApiPO.java index 48adf1c..e4458a4 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/api/ApiPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/api/ApiPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.api; +import java.io.Serializable; + /** * * @ClassName: ApiPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.api; * @Date: 2021-08-16 14:50:40 * @Version: 3.0 **/ -public class ApiPO { +public class ApiPO implements Serializable { + private static final long serialVersionUID = -8947525208445328822L; private String apiId; private String systemId; private String title; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/broker/BrokerPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/broker/BrokerPO.java index e7b28d6..1532ee6 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/broker/BrokerPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/broker/BrokerPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.broker; +import java.io.Serializable; + /** * * @ClassName: BrokerPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.broker; * @Date: 2021-08-23 21:44:01 * @Version: 3.0 **/ -public class BrokerPO { +public class BrokerPO implements Serializable { + private static final long serialVersionUID = -3701731950338775047L; private String brokerId; private String clientId; private String brokerName; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/claim/ClaimPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/claim/ClaimPO.java index d8b313f..b5006f8 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/claim/ClaimPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/claim/ClaimPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.claim; +import java.io.Serializable; + /** * * @ClassName: ClaimPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.claim; * @Date: 2021-08-16 14:58:13 * @Version: 3.0 **/ -public class ClaimPO { +public class ClaimPO implements Serializable { + private static final long serialVersionUID = 8331887587709713262L; private String claimId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/client/ClientPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/client/ClientPO.java index 59c35af..d29c797 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/client/ClientPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/client/ClientPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.client; +import java.io.Serializable; + /** * * @ClassName: ClientPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.client; * @Date: 2021-08-23 21:44:36 * @Version: 3.0 **/ -public class ClientPO { +public class ClientPO implements Serializable { + private static final long serialVersionUID = -8367809247430054182L; private String clientId; private String clientName; private String clientSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java index e5b9757..1200b4a 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.header; +import java.io.Serializable; + /** * @ClassName: HeaderPO * @Description: 请求头 @@ -7,8 +9,9 @@ package ink.wgink.gatewaymanage.pojo.pos.header; * @Date: 2021-08-16 14:58:46 * @Version: 3.0 **/ -public class HeaderPO { +public class HeaderPO implements Serializable { + private static final long serialVersionUID = -6536640407738650931L; private String headerId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/message/MessagePO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/message/MessagePO.java index fc90a4e..856b58a 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/message/MessagePO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/message/MessagePO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.message; +import java.io.Serializable; + /** * * @ClassName: MessagePO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.message; * @Date: 2021-08-23 21:45:28 * @Version: 3.0 **/ -public class MessagePO { +public class MessagePO implements Serializable { + private static final long serialVersionUID = -5120545653449503220L; private String messageId; private String messageGroup; private String messageTopic; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/requestparams/RequestParamsPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/requestparams/RequestParamsPO.java index ce17216..9485361 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/requestparams/RequestParamsPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/requestparams/RequestParamsPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.requestparams; +import java.io.Serializable; + /** * * @ClassName: RequestParamsPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.requestparams; * @Date: 2021-08-16 14:59:34 * @Version: 3.0 **/ -public class RequestParamsPO { +public class RequestParamsPO implements Serializable { + private static final long serialVersionUID = -5409501883044105389L; private String requestParamsId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java index 4b33415..ea7b9ad 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.responseparams; +import java.io.Serializable; + /** * * @ClassName: ResponseParamsPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.responseparams; * @Date: 2021-08-16 15:00:02 * @Version: 3.0 **/ -public class ResponseParamsPO { +public class ResponseParamsPO implements Serializable { + private static final long serialVersionUID = 8407149344367574306L; private String responseParamsId; private String systemId; private String apiId; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/source/SourcePO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/source/SourcePO.java index 1ebbc9c..aa681fd 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/source/SourcePO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/source/SourcePO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.source; +import java.io.Serializable; + /** * * @ClassName: SourcePO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.source; * @Date: 2021-08-23 21:42:29 * @Version: 3.0 **/ -public class SourcePO { +public class SourcePO implements Serializable { + private static final long serialVersionUID = 7366485164533121694L; private String sourceId; private String sourceName; private String sourceSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/task/TaskPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/task/TaskPO.java index d2f4db0..697d4c7 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/task/TaskPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/task/TaskPO.java @@ -1,5 +1,7 @@ package ink.wgink.gatewaymanage.pojo.pos.task; +import java.io.Serializable; + /** * * @ClassName: TaskPO @@ -8,8 +10,9 @@ package ink.wgink.gatewaymanage.pojo.pos.task; * @Date: 2021-08-23 21:43:18 * @Version: 3.0 **/ -public class TaskPO { +public class TaskPO implements Serializable { + private static final long serialVersionUID = -486194834676322314L; private String taskId; private String taskName; private String taskSummary; diff --git a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java index 8a58a02..97ddc58 100644 --- a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java +++ b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java @@ -15,7 +15,6 @@ import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; @@ -27,7 +26,6 @@ import java.util.Map; * @Date: 2021-08-23 21:44:01 * @Version: 3.0 **/ -@Service public class BrokerServiceImpl extends DefaultBaseService implements IBrokerService { @Autowired diff --git a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java new file mode 100644 index 0000000..f073f47 --- /dev/null +++ b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java @@ -0,0 +1,153 @@ +package ink.wgink.gatewaymanage.service.broker.impl; + +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.gatewaymanage.pojo.bos.broker.BrokerBO; +import ink.wgink.gatewaymanage.pojo.dtos.broker.BrokerDTO; +import ink.wgink.gatewaymanage.pojo.pos.broker.BrokerPO; +import ink.wgink.gatewaymanage.pojo.vos.broker.BrokerVO; +import ink.wgink.gatewaymanage.service.broker.IBrokerService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.UUIDUtil; +import ink.wgink.util.map.HashMapUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: BrokerServiceMongoImpl + * @Description: 消息 + * @Author: wanggeng + * @Date: 2022/5/25 01:24 + * @Version: 1.0 + */ +@Service +public class BrokerServiceMongoImpl extends DefaultBaseService implements IBrokerService { + + private static final String COLLECTION_NAME = "broker"; + @Autowired + private MongoTemplate mongoTemplate; + + @Override + public void save(BrokerVO brokerVO) { + String brokerId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(brokerVO); + params.put("brokerId", brokerId); + setSaveInfo(params); + + BrokerDTO brokerDTO = new BrokerDTO(); + BeanUtils.copyProperties(brokerVO, brokerDTO); + brokerDTO.setBrokerId(brokerId); + mongoTemplate.save(brokerDTO, COLLECTION_NAME); + } + + @Override + public void save(String token, BrokerVO brokerVO) { + + } + + @Override + public String saveReturnId(BrokerVO brokerVO) { + return null; + } + + @Override + public String saveReturnId(String token, BrokerVO brokerVO) { + return null; + } + + @Override + public void remove(List ids) { + mongoTemplate.remove(Query.query(Criteria.where("brokerId").in(ids))); + } + + @Override + public void remove(String token, List ids) { + + } + + @Override + public void delete(List ids) { + + } + + @Override + public void update(String brokerId, BrokerVO brokerVO) { + BrokerDTO brokerDTO = new BrokerDTO(); + BeanUtils.copyProperties(brokerVO, brokerDTO); + brokerDTO.setBrokerId(brokerId); + mongoTemplate.remove(Query.query(Criteria.where("brokerId").is(brokerId)), COLLECTION_NAME); + mongoTemplate.save(brokerDTO, COLLECTION_NAME); + } + + @Override + public void update(String token, String brokerId, BrokerVO brokerVO) { + + } + + @Override + public BrokerDTO get(Map params) { + return null; + } + + @Override + public BrokerDTO get(String brokerId) { + return mongoTemplate.findOne(Query.query(Criteria.where("brokerId").is(brokerId)), BrokerDTO.class, COLLECTION_NAME); + } + + @Override + public BrokerBO getBO(Map params) { + return null; + } + + @Override + public BrokerBO getBO(String brokerId) { + return null; + } + + @Override + public BrokerPO getPO(Map params) { + return null; + } + + @Override + public BrokerPO getPO(String brokerId) { + return null; + } + + @Override + public List list(Map params) { + return mongoTemplate.findAll(BrokerDTO.class, COLLECTION_NAME); + } + + @Override + public List listBO(Map params) { + return null; + } + + @Override + public List listPO(Map params) { + return null; + } + + @Override + public SuccessResultList> listPage(ListPage page) { + Query query = new Query(); + long total = mongoTemplate.count(query, COLLECTION_NAME); + query.with(Pageable.ofSize(page.getRows()).withPage(page.getPage() - 1)); + List userLocationDTOs = mongoTemplate.find(query, BrokerDTO.class, COLLECTION_NAME); + return new SuccessResultList<>(userLocationDTOs, page.getPage(), total); + } + + @Override + public Integer count(Map params) { + return null; + } +} diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index b493871..a70d791 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -7,6 +7,11 @@ server: # default-home-page: route/system/default servlet: context-path: /gateway-manage + master-node: true + init: + table: true + menu: true + user: true magic-api: #配置web页面入口 @@ -80,6 +85,21 @@ spring: # 如果'enable.auto.commit'为true,则消费者偏移自动提交给Kafka的频率(以毫秒为单位),默认值为5000。 auto-commit-interval: 100 max-poll-records: 5 + data: + mongodb: + uri: mongodb://study:study@192.168.0.103:27017/study + redis: + database: 6 + host: 192.168.0.103 + port: 6379 + password: 666 + timeout: 3000ms + jedis: + pool: + max-active: 8 + max-wait: 1ms + max-idle: 8 + min-idle: 0 # 数据库 @@ -131,5 +151,5 @@ logging: file: name: E:\project\gateway\gateway-manage-logs.log level: - org.springframework: debug + org.springframework: error ink.wgink: debug diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 880e06f..bf47c3f 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -7,6 +7,11 @@ server: # default-home-page: route/system/default servlet: context-path: /gateway-manage + master-node: true + init: + table: true + menu: true + user: true magic-api: #配置web页面入口 @@ -80,6 +85,21 @@ spring: # 如果'enable.auto.commit'为true,则消费者偏移自动提交给Kafka的频率(以毫秒为单位),默认值为5000。 auto-commit-interval: 100 max-poll-records: 5 + data: + mongodb: + uri: mongodb://study:study@192.168.0.103:27017/study + redis: + database: 2 + host: 192.168.0.103 + port: 6379 + password: 666 + timeout: 3000ms + jedis: + pool: + max-active: 8 + max-wait: 1ms + max-idle: 8 + min-idle: 0 # 数据库 diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml index b6637b0..697bbb2 100644 --- a/src/main/resources/mybatis/mybatis-config.xml +++ b/src/main/resources/mybatis/mybatis-config.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/static/route/broker/list.html b/src/main/resources/static/route/broker/list.html index 0cfcf01..11fe8b5 100644 --- a/src/main/resources/static/route/broker/list.html +++ b/src/main/resources/static/route/broker/list.html @@ -16,20 +16,6 @@
-
-
- -
-
- -
-
- -
- -