From 12e77c16075cc0691e458a8179f9879ce8ca52e4 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Wed, 17 Mar 2021 10:46:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=E8=BF=BD=E8=B8=AA=E5=92=8C=E6=80=A7=E8=83=BD=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-test | 4 ++-- deployment-test.yaml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile-test b/Dockerfile-test index a8bd8b6..4a3ef16 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,4 +1,4 @@ -FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 +FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6 ENV LC_ALL=zh_CN.utf8 ENV LANG=zh_CN.utf8 ENV LANGUAGE=zh_CN.utf8 @@ -7,4 +7,4 @@ RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 RUN mkdir -p /model COPY /target/classes/model/. /model/ ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] diff --git a/deployment-test.yaml b/deployment-test.yaml index c4fc4aa..fd96120 100644 --- a/deployment-test.yaml +++ b/deployment-test.yaml @@ -46,7 +46,11 @@ spec: env: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE - value: http://10.242.37.1488:6001 + value: http://10.242.37.1488:6001 + - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES + value: skywalking-oap-cluster.skywalking:11800 + - name: SW_AGENT_NAME + value: biz-service-ebtp-extend --- kind: Service apiVersion: v1 From ed38a454a8609792a7dd7f72673e10470af9508c Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Thu, 18 Mar 2021 15:57:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E8=A7=81=E6=80=A7=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/dao/BizMessageMapper.java | 5 +++++ .../dao/mapper/BizMessageMapper.xml | 21 +++++++++++++++++++ .../impl/BizMessageConsumerServiceImpl.java | 12 +++++------ 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 0ce7fdd..b504edb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -1,8 +1,13 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; +import org.apache.ibatis.annotations.Param; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; public interface BizMessageMapper extends BaseMapper { + IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml new file mode 100644 index 0000000..1d6cdc6 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index 3e63b54..07fb7ec 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -7,9 +7,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; @@ -27,6 +27,7 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; public class BizMessageConsumerServiceImpl implements BizMessageConsumerService { private @Autowired BizMessageMapper mapper; + private @Autowired IBaseCacheUserService service; /** * 消息概要列表 @@ -36,11 +37,10 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService @Override public IBizMessagePage listOutline(PageDTO page) { page = createPageCondition(page); - - IPage pageEntity = mapper.selectPage(new Page<>(page.getPageNo(), page.getPageSize()), - new QueryWrapper().select("id", "title", "category", "createtime") - .orderByDesc("createtime")); - + + IPage pageEntity = mapper.findMessage(new Page(page.getPageNo(), page.getPageSize()), + service.getCacheUser().getUserId()); + // DAT -> VO 转换 IBizMessagePage result = new BizMessagePage<>(); BeanUtils.copyProperties(pageEntity, result, "records");