调整依赖

This commit is contained in:
wanggeng 2022-08-12 23:13:56 +08:00
parent a4fa22c845
commit cebca286e5
7 changed files with 35 additions and 273 deletions

63
pom.xml
View File

@ -67,11 +67,6 @@
<version>1.18.16</version> <version>1.18.16</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
</dependency>
<!-- wgink start --> <!-- wgink start -->
<dependency> <dependency>
<groupId>ink.wgink</groupId> <groupId>ink.wgink</groupId>
@ -83,63 +78,7 @@
<artifactId>login-base</artifactId> <artifactId>login-base</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- wgink start --> <!-- wgink end -->
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>module-database</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ssssssss</groupId>
<artifactId>magic-api-spring-boot-starter</artifactId>
<version>2.0.1</version>
</dependency>
<!-- mongodb start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<!-- mongodb end -->
<!-- session share start -->
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
</dependency>
<!-- session share end -->
<!-- redis start -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- redis end -->
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>mongo-login</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>mongo-menu</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ink.wgink</groupId>
<artifactId>login-oauth2-server</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>ink.wgink</groupId>
<artifactId>login-base</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -7,7 +7,6 @@ import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;
import ink.wgink.gatewaymanage.dao.api.IApiDao; import ink.wgink.gatewaymanage.dao.api.IApiDao;
import ink.wgink.gatewaymanage.enums.AuditStatusEnum; import ink.wgink.gatewaymanage.enums.AuditStatusEnum;
import ink.wgink.gatewaymanage.enums.MessageSendStatusEnum;
import ink.wgink.gatewaymanage.pojo.bos.api.ApiBO; import ink.wgink.gatewaymanage.pojo.bos.api.ApiBO;
import ink.wgink.gatewaymanage.pojo.dtos.api.ApiDTO; import ink.wgink.gatewaymanage.pojo.dtos.api.ApiDTO;
import ink.wgink.gatewaymanage.pojo.dtos.examine.ExamineDTO; import ink.wgink.gatewaymanage.pojo.dtos.examine.ExamineDTO;
@ -28,7 +27,6 @@ import ink.wgink.util.date.DateUtil;
import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.map.HashMapUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
@ -51,9 +49,6 @@ public class ApiServiceImpl extends DefaultBaseService implements IApiService {
private IClaimService claimService; private IClaimService claimService;
@Autowired @Autowired
private IMessageService messageService; private IMessageService messageService;
@Autowired
private KafkaTemplate<String, Object> kafkaTemplate;
@Override @Override
public void save(ApiVO apiVO) { public void save(ApiVO apiVO) {
saveReturnId(apiVO); saveReturnId(apiVO);
@ -287,25 +282,6 @@ public class ApiServiceImpl extends DefaultBaseService implements IApiService {
messageVO.setMessageTopic("apiPublish"); messageVO.setMessageTopic("apiPublish");
messageVO.setMessageBody(messageBody); messageVO.setMessageBody(messageBody);
messageVO.setSendTime(System.currentTimeMillis()); messageVO.setSendTime(System.currentTimeMillis());
kafkaTemplate.send("apiPublish", messageBody).addCallback(success -> {
// 消息发送到的topic
String topic = success.getRecordMetadata().topic();
// 消息发送到的分区
int partition = success.getRecordMetadata().partition();
// 消息在分区内的offset
long offset = success.getRecordMetadata().offset();
messageVO.setReceiveTime(System.currentTimeMillis());
messageVO.setUsedTime(messageVO.getReceiveTime() - messageVO.getSendTime());
messageVO.setSendStatus(MessageSendStatusEnum.SUCCESS.getValue());
messageService.save(messageVO);
System.out.println("发送消息成功:" + topic + "-" + partition + "-" + offset);
}, failure -> {
messageVO.setSendStatus(MessageSendStatusEnum.SUCCESS.getValue());
messageService.save(messageVO);
System.out.println("发送消息失败:" + failure.getMessage());
});
} }
private void setSystemInfos(List<ApiDTO> apiDTOs) { private void setSystemInfos(List<ApiDTO> apiDTOs) {

View File

@ -15,6 +15,7 @@ import ink.wgink.util.UUIDUtil;
import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.map.HashMapUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -26,6 +27,7 @@ import java.util.Map;
* @Date: 2021-08-23 21:44:01 * @Date: 2021-08-23 21:44:01
* @Version: 3.0 * @Version: 3.0
**/ **/
@Service
public class BrokerServiceImpl extends DefaultBaseService implements IBrokerService { public class BrokerServiceImpl extends DefaultBaseService implements IBrokerService {
@Autowired @Autowired

View File

@ -1,153 +0,0 @@
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<String, Object> 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<String> ids) {
mongoTemplate.remove(Query.query(Criteria.where("brokerId").in(ids)));
}
@Override
public void remove(String token, List<String> ids) {
}
@Override
public void delete(List<String> 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<String, Object> 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<String, Object> params) {
return null;
}
@Override
public BrokerBO getBO(String brokerId) {
return null;
}
@Override
public BrokerPO getPO(Map<String, Object> params) {
return null;
}
@Override
public BrokerPO getPO(String brokerId) {
return null;
}
@Override
public List<BrokerDTO> list(Map<String, Object> params) {
return mongoTemplate.findAll(BrokerDTO.class, COLLECTION_NAME);
}
@Override
public List<BrokerBO> listBO(Map<String, Object> params) {
return null;
}
@Override
public List<BrokerPO> listPO(Map<String, Object> params) {
return null;
}
@Override
public SuccessResultList<List<BrokerDTO>> 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<BrokerDTO> userLocationDTOs = mongoTemplate.find(query, BrokerDTO.class, COLLECTION_NAME);
return new SuccessResultList<>(userLocationDTOs, page.getPage(), total);
}
@Override
public Integer count(Map<String, Object> params) {
return null;
}
}

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="ink.wgink.gatewaymanage.dao.api.IApiDao"> <mapper namespace="ink.wgink.gatewaymanage.dao.api.IApiDao">
<cache flushInterval="3600000"/>
<resultMap id="apiDTO" type="ink.wgink.gatewaymanage.pojo.dtos.api.ApiDTO"> <resultMap id="apiDTO" type="ink.wgink.gatewaymanage.pojo.dtos.api.ApiDTO">
<result column="api_id" property="apiId"/> <result column="api_id" property="apiId"/>
@ -119,7 +119,7 @@
</insert> </insert>
<!-- 新增接口 --> <!-- 新增接口 -->
<insert id="save" parameterType="map" flushCache="true"> <insert id="save" parameterType="map">
INSERT INTO api_api( INSERT INTO api_api(
api_id, api_id,
system_id, system_id,
@ -172,7 +172,7 @@
</insert> </insert>
<!-- 删除接口 --> <!-- 删除接口 -->
<update id="remove" parameterType="map" flushCache="true"> <update id="remove" parameterType="map">
UPDATE UPDATE
api_api api_api
SET SET
@ -195,7 +195,7 @@
</update> </update>
<!-- 删除接口(物理) --> <!-- 删除接口(物理) -->
<update id="delete" parameterType="map" flushCache="true"> <update id="delete" parameterType="map">
DELETE FROM DELETE FROM
api_api api_api
WHERE WHERE
@ -214,7 +214,7 @@
</update> </update>
<!-- 修改接口 --> <!-- 修改接口 -->
<update id="update" parameterType="map" flushCache="true"> <update id="update" parameterType="map">
UPDATE UPDATE
api_api api_api
SET SET
@ -262,7 +262,7 @@
</update> </update>
<!-- 修改审核接口 --> <!-- 修改审核接口 -->
<update id="updateExamine" parameterType="map" flushCache="true"> <update id="updateExamine" parameterType="map">
UPDATE UPDATE
api_api api_api
SET SET
@ -275,7 +275,7 @@
</update> </update>
<!-- 接口详情 --> <!-- 接口详情 -->
<select id="get" parameterType="map" resultMap="apiDTO" useCache="true"> <select id="get" parameterType="map" resultMap="apiDTO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.title, t1.title,
@ -301,7 +301,7 @@
</select> </select>
<!-- 接口详情 --> <!-- 接口详情 -->
<select id="getBO" parameterType="map" resultMap="apiBO" useCache="true"> <select id="getBO" parameterType="map" resultMap="apiBO">
SELECT SELECT
t1.api_id, t1.api_id,
t1.system_id, t1.system_id,
@ -337,7 +337,7 @@
</select> </select>
<!-- 接口详情 --> <!-- 接口详情 -->
<select id="getPO" parameterType="map" resultMap="apiPO" useCache="true"> <select id="getPO" parameterType="map" resultMap="apiPO">
SELECT SELECT
t1.api_id, t1.api_id,
t1.system_id, t1.system_id,
@ -373,7 +373,7 @@
</select> </select>
<!-- 接口列表 --> <!-- 接口列表 -->
<select id="list" parameterType="map" resultMap="apiDTO" useCache="true"> <select id="list" parameterType="map" resultMap="apiDTO">
SELECT SELECT
t1.api_id, t1.api_id,
t1.system_id, t1.system_id,
@ -461,7 +461,7 @@
</select> </select>
<!-- 接口列表 --> <!-- 接口列表 -->
<select id="listBO" parameterType="map" resultMap="apiBO" useCache="true"> <select id="listBO" parameterType="map" resultMap="apiBO">
SELECT SELECT
t1.api_id, t1.api_id,
t1.system_id, t1.system_id,
@ -514,7 +514,7 @@
</select> </select>
<!-- 接口列表 --> <!-- 接口列表 -->
<select id="listPO" parameterType="map" resultMap="apiPO" useCache="true"> <select id="listPO" parameterType="map" resultMap="apiPO">
SELECT SELECT
t1.api_id, t1.api_id,
t1.system_id, t1.system_id,
@ -567,7 +567,7 @@
</select> </select>
<!-- 接口统计 --> <!-- 接口统计 -->
<select id="count" parameterType="map" resultType="Integer" useCache="true"> <select id="count" parameterType="map" resultType="Integer">
SELECT SELECT
COUNT(*) COUNT(*)
FROM FROM
@ -577,7 +577,7 @@
</select> </select>
<!-- 获取审核结果 --> <!-- 获取审核结果 -->
<select id="getExamineResult" parameterType="map" resultMap="examineDTO" useCache="true"> <select id="getExamineResult" parameterType="map" resultMap="examineDTO">
SELECT SELECT
t1.audit_status, t1.audit_status,
t1.audit_time, t1.audit_time,
@ -592,7 +592,7 @@
</select> </select>
<!-- 接口ID列表 --> <!-- 接口ID列表 -->
<select id="listId" parameterType="map" resultType="String" useCache="true"> <select id="listId" parameterType="map" resultType="String">
SELECT SELECT
api_id api_id
FROM FROM

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="ink.wgink.gatewaymanage.dao.system.ISystemDao"> <mapper namespace="ink.wgink.gatewaymanage.dao.system.ISystemDao">
<cache flushInterval="3600000"/>
<resultMap id="systemDTO" type="ink.wgink.gatewaymanage.pojo.dtos.system.SystemDTO"> <resultMap id="systemDTO" type="ink.wgink.gatewaymanage.pojo.dtos.system.SystemDTO">
<result column="system_id" property="systemId"/> <result column="system_id" property="systemId"/>
@ -93,7 +93,7 @@
</insert> </insert>
<!-- 新增接口系统 --> <!-- 新增接口系统 -->
<insert id="save" parameterType="map" flushCache="true"> <insert id="save" parameterType="map">
INSERT INTO api_system( INSERT INTO api_system(
system_id, system_id,
name, name,
@ -134,7 +134,7 @@
</insert> </insert>
<!-- 删除接口系统 --> <!-- 删除接口系统 -->
<update id="remove" parameterType="map" flushCache="true"> <update id="remove" parameterType="map">
UPDATE UPDATE
api_system api_system
SET SET
@ -149,7 +149,7 @@
</update> </update>
<!-- 删除接口系统(物理) --> <!-- 删除接口系统(物理) -->
<update id="delete" parameterType="map" flushCache="true"> <update id="delete" parameterType="map">
DELETE FROM DELETE FROM
api_system api_system
WHERE WHERE
@ -160,7 +160,7 @@
</update> </update>
<!-- 修改接口系统 --> <!-- 修改接口系统 -->
<update id="update" parameterType="map" flushCache="true"> <update id="update" parameterType="map">
UPDATE UPDATE
api_system api_system
SET SET
@ -193,7 +193,7 @@
</update> </update>
<!-- 修改接口系统审核状态 --> <!-- 修改接口系统审核状态 -->
<update id="updateExamine" parameterType="map" flushCache="true"> <update id="updateExamine" parameterType="map">
UPDATE UPDATE
api_system api_system
SET SET
@ -206,7 +206,7 @@
</update> </update>
<!-- 接口系统详情 --> <!-- 接口系统详情 -->
<select id="get" parameterType="map" resultMap="systemDTO" useCache="true"> <select id="get" parameterType="map" resultMap="systemDTO">
SELECT SELECT
t1.name, t1.name,
t1.summary, t1.summary,
@ -227,7 +227,7 @@
</select> </select>
<!-- 接口系统详情 --> <!-- 接口系统详情 -->
<select id="getBO" parameterType="map" resultMap="systemBO" useCache="true"> <select id="getBO" parameterType="map" resultMap="systemBO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.name, t1.name,
@ -257,7 +257,7 @@
</select> </select>
<!-- 接口系统详情 --> <!-- 接口系统详情 -->
<select id="getPO" parameterType="map" resultMap="systemPO" useCache="true"> <select id="getPO" parameterType="map" resultMap="systemPO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.name, t1.name,
@ -287,7 +287,7 @@
</select> </select>
<!-- 接口系统列表 --> <!-- 接口系统列表 -->
<select id="list" parameterType="map" resultMap="systemDTO" useCache="true"> <select id="list" parameterType="map" resultMap="systemDTO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.name, t1.name,
@ -347,7 +347,7 @@
</select> </select>
<!-- 接口系统列表 --> <!-- 接口系统列表 -->
<select id="listBO" parameterType="map" resultMap="systemBO" useCache="true"> <select id="listBO" parameterType="map" resultMap="systemBO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.name, t1.name,
@ -394,7 +394,7 @@
</select> </select>
<!-- 接口系统列表 --> <!-- 接口系统列表 -->
<select id="listPO" parameterType="map" resultMap="systemPO" useCache="true"> <select id="listPO" parameterType="map" resultMap="systemPO">
SELECT SELECT
t1.system_id, t1.system_id,
t1.name, t1.name,
@ -441,7 +441,7 @@
</select> </select>
<!-- 接口系统统计 --> <!-- 接口系统统计 -->
<select id="count" parameterType="map" resultType="Integer" useCache="true"> <select id="count" parameterType="map" resultType="Integer">
SELECT SELECT
COUNT(*) COUNT(*)
FROM FROM
@ -451,7 +451,7 @@
</select> </select>
<!-- 获取审核结果 --> <!-- 获取审核结果 -->
<select id="getExamineResult" parameterType="map" resultMap="examineDTO" useCache="true"> <select id="getExamineResult" parameterType="map" resultMap="examineDTO">
SELECT SELECT
t1.audit_status, t1.audit_status,
t1.audit_time, t1.audit_time,

View File

@ -3,9 +3,7 @@ package ink.wgink.wggatewaymanage;
import ink.wgink.gatewaymanage.WgGatewayManageApplication; import ink.wgink.gatewaymanage.WgGatewayManageApplication;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@ -14,12 +12,12 @@ import org.springframework.test.context.junit4.SpringRunner;
@ActiveProfiles("test") @ActiveProfiles("test")
class WgGatewayManageApplicationTests { class WgGatewayManageApplicationTests {
@Autowired // @Autowired
private KafkaTemplate kafkaTemplate; // private KafkaTemplate kafkaTemplate;
@Test @Test
void contextLoads() { void contextLoads() {
kafkaTemplate.send("tableSync", "{\"tableNumber\":\"C0001\",\"uid\":\"123\",\"action\":\"save\",\"data\":{\"case_code\":\"985\",\"case_description\":\"案件描述\"}}"); // kafkaTemplate.send("tableSync", "{\"tableNumber\":\"C0001\",\"uid\":\"123\",\"action\":\"save\",\"data\":{\"case_code\":\"985\",\"case_description\":\"案件描述\"}}");
} }
} }