Merge branch 'release' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release

src/main/java/cn/com/poc/agent_application/aggregate/AgentApplicationMallService.java

@@ -4,8 +4,14 @@ package cn.com.poc.agent_application.aggregate;
 public interface AgentApplicationMallService {
     /**
      * 收藏/取消收藏应用广场中的应用
-     *
-     * */
+     */
     void collectOrCancelAgentInMall(Integer id) throws Exception;
 
+    /**
+     * 添加浏览量
+     *
+     * @param agentPublishId 应用广场发布id
+     */
+    void addClickNumber(Integer agentPublishId) throws Exception;
+
 }

src/main/java/cn/com/poc/agent_application/aggregate/impl/AgentApplicationMallServiceImpl.java

 package cn.com.poc.agent_application.aggregate.impl;
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
-import cn.com.poc.agent_application.convert.BizAgentApplicationMallConvert;
-import cn.com.poc.agent_application.dto.BizAgentApplicationMallDto;
 import cn.com.poc.agent_application.entity.BizAgentApplicationMallEntity;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.entity.BizMemberAgentApplicationCollectEntity;
@@ -85,4 +83,14 @@ public class AgentApplicationMallServiceImpl implements AgentApplicationMallServ
         }
         bizAgentApplicationMallService.update(mallEntity);
     }
+
+    @Override
+    public void addClickNumber(Integer agentPublishId) throws Exception {
+        BizAgentApplicationMallEntity mallEntity = bizAgentApplicationMallService.getByAgentPublishId(agentPublishId);
+        if (mallEntity == null) {
+            return;
+        }
+        mallEntity.setClickNumber(mallEntity.getClickNumber() + 1);
+        bizAgentApplicationMallService.update(mallEntity);
+    }
 }

src/main/java/cn/com/poc/agent_application/convert/BizAgentApplicationMallConvert.java

@@ -119,8 +119,8 @@ public class BizAgentApplicationMallConvert {
         BizAgentApplicationPublishService agentApplicationPublishService = SpringUtils.getBean(BizAgentApplicationPublishServiceImpl.class);
         BizAgentApplicationPublishEntity publishEntity = agentApplicationPublishService.get(item.getAgentPublishId());
 
-        AgentApplicationBaseInfo baseInfo = new AgentApplicationBaseInfo();
         if (publishEntity != null) {
+            AgentApplicationBaseInfo baseInfo = new AgentApplicationBaseInfo();
             baseInfo.setMemberId(publishEntity.getMemberId());
             baseInfo.setAgentId(publishEntity.getAgentId());
             baseInfo.setAgentTitle(publishEntity.getAgentTitle());
@@ -129,10 +129,8 @@ public class BizAgentApplicationMallConvert {
             baseInfo.setAgentSystem(publishEntity.getAgentSystem());
             baseInfo.setAgentPublishStatus(publishEntity.getAgentPublishStatus());
             baseInfo.setPublishTime(publishEntity.getPublishTime());
-        }
 
-        AgentApplicationCommConfig commConfig = new AgentApplicationCommConfig();
-        if (publishEntity != null) {
+            AgentApplicationCommConfig commConfig = new AgentApplicationCommConfig();
             commConfig.setPreamble(publishEntity.getPreamble());
             commConfig.setFeaturedQuestions(publishEntity.getFeaturedQuestions());
             commConfig.setContinuousQuestionStatus(publishEntity.getContinuousQuestionStatus());
@@ -140,32 +138,26 @@ public class BizAgentApplicationMallConvert {
             commConfig.setContinuousQuestionTurn(publishEntity.getContinuousQuestionTurn());
             commConfig.setVariableStructure(publishEntity.getVariableStructure());
             commConfig.setIsLongMemory(publishEntity.getIsLongMemory());
-        }
 
-        AgentApplicationKnowledgeConfig knowledgeConfig = new AgentApplicationKnowledgeConfig();
-        if (publishEntity != null) {
+            AgentApplicationKnowledgeConfig knowledgeConfig = new AgentApplicationKnowledgeConfig();
             knowledgeConfig.setKnowledgeIds(publishEntity.getKnowledgeIds());
-        }
 
-        AgentApplicationCommModelConfig commModelConfig = new AgentApplicationCommModelConfig();
-        if (publishEntity != null) {
+            AgentApplicationCommModelConfig commModelConfig = new AgentApplicationCommModelConfig();
             commModelConfig.setLargeModel(publishEntity.getLargeModel());
             commModelConfig.setTopP(publishEntity.getTopP());
             commModelConfig.setCommunicationTurn(publishEntity.getCommunicationTurn());
+
+            dto.setUnitIds(publishEntity.getUnitIds());
+            dto.setBaseInfo(baseInfo);
+            dto.setCommConfig(commConfig);
+            dto.setKnowledgeConfig(knowledgeConfig);
+            dto.setCommModelConfig(commModelConfig);
         }
 
         dto.setId(item.getId());
         dto.setAgentType(item.getAgentType());
         dto.setCollectNumber(item.getCollectNumber());
         dto.setClickNumber(item.getClickNumber());
-        dto.setBaseInfo(baseInfo);
-        dto.setCommConfig(commConfig);
-        dto.setKnowledgeConfig(knowledgeConfig);
-        dto.setCommModelConfig(commModelConfig);
-        if (publishEntity != null) {
-            dto.setUnitIds(publishEntity.getUnitIds());
-        }
-
         dto.setIsCopy(item.getIsCopy());
         dto.setIsSale(item.getIsSale());
         dto.setPopularity(item.getPopularity());

src/main/java/cn/com/poc/agent_application/query/MemberCollectQuery.sql

-select baap.member_id    as member_id,
+select distinct baap.member_id    as member_id,
        baap.agent_id     as agent_id,
        baap.agent_title  as agent_title,
        baap.agent_desc   as agent_desc,
        baap.agent_avatar as agent_avatar
 from biz_member_agent_application_collect bmaac
-         left join biz_agent_application_publish baap on baap.agent_id = bmaac.agent_id and baap.is_deleted = 'N'
-where bmaac.is_deleted = 'N' <<and bmaac.is_collect = :isCollect>>
+left join biz_agent_application_publish baap on baap.agent_id = bmaac.agent_id
+where baap.is_deleted = 'N'
+and bmaac.is_deleted = 'N'
+<<and bmaac.is_collect = :isCollect>>
 <<and bmaac.member_id = :memberId>>
 order by baap.created_time desc
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/rest/impl/AgentApplicationInfoRestImpl.java

@@ -7,6 +7,7 @@ import cn.com.poc.agent_application.entity.*;
 import cn.com.poc.agent_application.query.AgentApplicationInfoQueryCondition;
 import cn.com.poc.agent_application.rest.AgentApplicationInfoRest;
 import cn.com.poc.agent_application.service.*;
+import cn.com.poc.common.annotation.RedisLimit;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.service.RedisService;
 import cn.com.poc.common.utils.BlContext;
@@ -347,6 +348,7 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
     }
 
     @Override
+    @RedisLimit(key = "collect:agent_person", currentUser = true, count = 1, timeout = 1, exceptionInfo = "exception/too.many.requests")
     public void collectOrCancelAgentInPerson(String agentId) throws Exception {
         Assert.notNull(agentId);
         agentApplicationInfoService.collectOrCancelAgentInPerson(agentId);
@@ -359,6 +361,9 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
         if (MapUtils.isEmpty(map)) {
             BizAgentApplicationInfoEntity infoEntity = bizAgentApplicationInfoService.getByAgentId(agentId);
             List<Variable> variableStructure = infoEntity.getVariableStructure();
+            if (CollectionUtils.isEmpty(variableStructure)) {
+                return result;
+            }
             for (Variable variable : variableStructure) {
                 AgentApplicationValueMemoryDto valueMemoryDto = new AgentApplicationValueMemoryDto();
                 valueMemoryDto.setKey(variable.getKey());

src/main/java/cn/com/poc/agent_application/rest/impl/BizAgentApplicationMallRestImpl.java

@@ -11,13 +11,17 @@ import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.entity.BizMemberAgentApplicationCollectEntity;
 import cn.com.poc.agent_application.query.MallAgentApplicationQueryCondition;
 import cn.com.poc.agent_application.query.MallAgentApplicationQueryItem;
+import cn.com.poc.agent_application.query.MemberCollectQueryCondition;
+import cn.com.poc.agent_application.query.MemberCollectQueryItem;
 import cn.com.poc.agent_application.rest.BizAgentApplicationMallRest;
 import cn.com.poc.agent_application.service.BizAgentApplicationCategoryService;
 import cn.com.poc.agent_application.service.BizAgentApplicationMallService;
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.agent_application.service.BizMemberAgentApplicationCollectService;
+import cn.com.poc.common.annotation.RedisLimit;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.constant.XLangConstant;
+import cn.com.poc.common.utils.BlContext;
 import cn.com.poc.common.utils.StringUtils;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.data.model.PagingInfo;
@@ -28,6 +32,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Component
 public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallRest {
@@ -111,20 +116,18 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
             }
         }
         List<MallAgentApplicationQueryItem> items = bizAgentApplicationMallService.mallAgentApplicationQuery(mallAgentApplicationQueryCondition, pagingInfo);
+        MemberCollectQueryCondition collectQueryCondition = new MemberCollectQueryCondition();
+        collectQueryCondition.setMemberId(BlContext.getCurrentUserNotException().getUserId());
+        collectQueryCondition.setIsCollect(CommonConstant.YOrN.Y);
+        List<MemberCollectQueryItem> memberCollectQueryItems = bizMemberAgentApplicationCollectService.queryMemberCollect(collectQueryCondition, null);
 
         for (MallAgentApplicationQueryItem item : items) {
             BizAgentApplicationMallDto mallDto = BizAgentApplicationMallConvert.itemToDto(item);
             // 如果应用上架了
-            if (CommonConstant.IsDeleted.Y.equals(mallDto.getIsSale())) {
+            if (mallDto.getBaseInfo() != null && CommonConstant.YOrN.Y.equals(mallDto.getIsSale())) {
                 // 设置当前用户是否收藏了
-                if (mallDto.getBaseInfo() != null) {
-                    BizMemberAgentApplicationCollectEntity collect = bizMemberAgentApplicationCollectService.getByAgentId(mallDto.getBaseInfo().getAgentId());
-                    if (collect != null) {
-                        mallDto.setIsCollect(collect.getIsCollect());
-                    } else {
-                        mallDto.setIsCollect(CommonConstant.IsDeleted.N);
-                    }
-                }
+                String agentId = mallDto.getBaseInfo().getAgentId();
+                mallDto.setIsCollect(memberCollectQueryItems.stream().anyMatch(v -> agentId.equals(v.getAgentId())) ? CommonConstant.YOrN.Y : CommonConstant.YOrN.N);
                 resultList.add(mallDto);
             }
         }
@@ -143,6 +146,7 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
     }
 
     @Override
+    @RedisLimit(currentUser = true, key = "collect:agent", count = 1, timeout = 1, exceptionInfo = "exception/collect.limit.message")
     public void collectOrCancelAgentInMall(Integer id) throws Exception {
         Assert.notNull(id);
         agentApplicationMallService.collectOrCancelAgentInMall(id);

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationMallServiceImpl.java

@@ -109,6 +109,9 @@ public class BizAgentApplicationMallServiceImpl extends BaseServiceImpl
         if (entity.getIsSale() != null) {
             model.setIsSale(entity.getIsSale());
         }
+        if (entity.getCategoryId() != null) {
+            model.setCategoryId(entity.getCategoryId());
+        }
         if (entity.getPopularity() != null) {
             model.setPopularity(entity.getPopularity());
         }

src/main/java/cn/com/poc/common/annotation/CurrentUserRolePermission.java

+package cn.com.poc.common.annotation;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.*;
+
+/**
+ * @author Ken
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface CurrentUserRolePermission {
+
+
+    String[] permissionCodeArr();
+
+
+    String prompt() default "无权限,请联系管理员";
+
+
+}
+

src/main/java/cn/com/poc/common/annotation/RedisLimit.java

+package cn.com.poc.common.annotation;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.*;
+
+/**
+ * 限流
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Component
+@Documented
+public @interface RedisLimit {
+
+
+    /**
+     * 限流key
+     */
+    String key();
+
+
+    /**
+     * 限流数量 [单位时间内次数]
+     */
+    int count();
+
+    /**
+     * 限流时间 默认60秒
+     */
+    long timeout() default 60;
+
+    /**
+     * 限流时间单位 [默认秒]
+     */
+    LimitTimeUnit timeUnit() default LimitTimeUnit.SECONDS;
+
+    /**
+     * 是否针对当前用户
+     *
+     * @return
+     */
+    boolean currentUser() default false;
+
+    /**
+     * 异常信息
+     */
+    String exceptionInfo() default "";
+
+
+    enum LimitTimeUnit {
+        /**
+         * 秒
+         */
+        SECONDS,
+
+        /**
+         * 分钟
+         */
+        MINUTES,
+        /**
+         * 小时
+         */
+        HOURS,
+        /**
+         * 天
+         */
+        DAYS,
+
+        /**
+         * 当日
+         */
+        DAY_OF_MONTH,
+
+        /**
+         * 当月
+         */
+        MONTH_OF_YEAR;
+
+        LimitTimeUnit(){}
+    }
+
+}

src/main/java/cn/com/poc/common/aspect/RedisLimitAspect.java

+package cn.com.poc.common.aspect;
+
+import cn.com.poc.common.annotation.RedisLimit;
+import cn.com.poc.common.utils.BlContext;
+import cn.com.poc.common.utils.DateUtils;
+import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
+import cn.com.yict.framemax.core.exception.BusinessException;
+import cn.com.yict.framemax.core.i18n.I18nMessageException;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 限流切面
+ */
+@Aspect
+@Component
+public class RedisLimitAspect {
+
+
+    private final Logger logger = LoggerFactory.getLogger(RedisLimitAspect.class);
+
+    @Resource
+    private RedisTemplate<String, Integer> redisTemplate;
+
+    @Pointcut("@annotation( cn.com.poc.common.annotation.RedisLimit)")
+    public void redisLimitAnnotation() {
+    }
+
+    @Around(value = "redisLimitAnnotation()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        RedisLimit annotation = method.getAnnotation(RedisLimit.class);
+        StringBuilder redisKey = new StringBuilder();
+        String key = annotation.key();
+        redisKey.append("Limit_");
+        redisKey.append(key);
+        redisKey.append(":");
+
+        if (annotation.currentUser()) {
+            UserBaseEntity currentUser = BlContext.getCurrentUserNotException();
+            redisKey.append(currentUser.getUserId());
+        }
+
+        if (Boolean.FALSE.equals(redisTemplate.hasKey(redisKey.toString()))) {
+            redisTemplate.opsForValue().increment(redisKey.toString(), 1);
+            redisTemplate.expire(redisKey.toString(), expireTime(annotation.timeout(), annotation.timeUnit()), TimeUnit.MILLISECONDS);
+        } else if (redisTemplate.opsForValue().get(redisKey.toString()).intValue() >= annotation.count()) {
+            throw new I18nMessageException(annotation.exceptionInfo());
+        } else {
+            redisTemplate.opsForValue().increment(redisKey.toString(), 1);
+        }
+
+        return joinPoint.proceed();
+    }
+
+    private Long expireTime(Long timeout, RedisLimit.LimitTimeUnit limitTimeUnit) {
+        switch (limitTimeUnit) {
+            case SECONDS:
+                return timeout * 1000;
+            case MINUTES:
+                return timeout * 60 * 1000;
+            case HOURS:
+                return timeout * 60 * 60 * 1000;
+            case DAYS:
+                Date date = new Date();
+                return DateUtils.diffTwoDate(DateUtils.addDays(date, timeout.intValue()), date);
+            case DAY_OF_MONTH:
+                Date dayBegin = DateUtils.getDayBegin(DateUtils.addDays(DateUtils.getToday(), timeout.intValue()));
+                return DateUtils.diffTwoDate(dayBegin, DateUtils.getToday());
+
+            case MONTH_OF_YEAR:
+                Date monthBegin = DateUtils.getMonthBegin(DateUtils.getMonthAfter(DateUtils.getToday(), timeout.intValue()));
+                return DateUtils.diffTwoDate(monthBegin, DateUtils.getToday());
+            default:
+                throw new BusinessException("不支持的单位");
+        }
+    }
+
+}

src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java

@@ -130,7 +130,7 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
             outputRecord.setTimestamp(System.currentTimeMillis());
 
             //对话
-            String output = agentApplicationInfoService.callAgentApplication(dialogsId, infoEntity.getLargeModel(),
+                String output = agentApplicationInfoService.callAgentApplication(dialogsId, infoEntity.getLargeModel(),
                     infoEntity.getUnitIds(), infoEntity.getAgentSystem(), kdIdList.toArray(new Integer[0]), infoEntity.getCommunicationTurn(),
                     infoEntity.getTopP(), infoEntity.getTemperature(), messages, tools, httpServletResponse);
 

src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java

@@ -31,7 +31,7 @@ public interface AgentApplicationRest extends BaseRest {
     /**
      * 创建对话
      */
-    String createDialogues() throws Exception;
+    String createDialogues(@RequestParam(required = false) String agentId) throws Exception;
 
     /**
      * 调用 已发布Agent应用

src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

 package cn.com.poc.expose.rest.impl;
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationInfoService;
+import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
 import cn.com.poc.agent_application.convert.AgentApplicationInfoConvert;
 import cn.com.poc.agent_application.convert.BizAgentApplicationPublishConvert;
 import cn.com.poc.agent_application.dto.AgentApplicationCreateContinueQuesDto;
@@ -19,10 +20,14 @@ import cn.com.poc.common.utils.UUIDTool;
 import cn.com.poc.expose.aggregate.AgentApplicationService;
 import cn.com.poc.expose.dto.*;
 import cn.com.poc.expose.rest.AgentApplicationRest;
+import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
+import cn.com.poc.message.service.AgentApplicationProducerService;
 import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.data.model.PagingInfo;
 import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -37,6 +42,7 @@ import java.util.stream.Collectors;
 @Component
 public class AgentApplicationRestImpl implements AgentApplicationRest {
 
+    private Logger logger = LoggerFactory.getLogger(AgentApplicationRest.class);
 
     @Resource
     private AgentApplicationService agentApplicationService;
@@ -50,6 +56,9 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     @Resource
     private BizAgentApplicationDialoguesRecordService bizAgentApplicationDialoguesRecordService;
 
+    @Resource
+    private AgentApplicationProducerService agentApplicationProducerService;
+
     @Override
     public List<String> getRecommendQuestions(HttpServletRequest httpServletRequest) throws Exception {
         return agentApplicationService.getRecommendQuestions(httpServletRequest.getHeader("x-lang"));
@@ -78,7 +87,12 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     }
 
     @Override
-    public String createDialogues() {
+    public String createDialogues(String agentId) {
+        if (StringUtils.isNotBlank(agentId)) {
+            AgentApplicationClickEventMessage agentApplicationClickEventMessage = new AgentApplicationClickEventMessage();
+            agentApplicationClickEventMessage.setAgentId(agentId);
+            agentApplicationProducerService.clickEvent(agentApplicationClickEventMessage);
+        }
         return "DIA_" + UUIDTool.getUUID();
     }
 

src/main/java/cn/com/poc/message/entity/AgentApplicationClickEventMessage.java

+package cn.com.poc.message.entity;
+
+import java.io.Serializable;
+
+public class AgentApplicationClickEventMessage implements Serializable {
+
+    private String agentId;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+}

src/main/java/cn/com/poc/message/service/AgentApplicationConsumerService.java

+package cn.com.poc.message.service;
+
+import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
+import cn.com.yict.framemax.core.service.BaseService;
+
+public interface AgentApplicationConsumerService extends BaseService {
+
+    void clickEvent(AgentApplicationClickEventMessage message) throws Exception;
+}

src/main/java/cn/com/poc/message/service/AgentApplicationProducerService.java

+package cn.com.poc.message.service;
+
+import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
+import cn.com.yict.framemax.core.service.BaseService;
+
+public interface AgentApplicationProducerService extends BaseService {
+
+    AgentApplicationClickEventMessage clickEvent(AgentApplicationClickEventMessage message);
+
+}

src/main/java/cn/com/poc/message/service/impl/AgentApplicationConsumerServiceImpl.java

+package cn.com.poc.message.service.impl;
+
+import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
+import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
+import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
+import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
+import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
+import cn.com.poc.message.service.AgentApplicationConsumerService;
+import cn.com.poc.message.topic.AgentApplicationTopic;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.yict.framemax.tumbleweed.client.annotation.Consumer;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class AgentApplicationConsumerServiceImpl implements AgentApplicationConsumerService {
+
+
+    @Resource
+    private BizAgentApplicationPublishService bizAgentApplicationPublishService;
+
+    @Resource
+    private AgentApplicationMallService agentApplicationMallService;
+
+
+    @Override
+    @Consumer(topic = AgentApplicationTopic.AGENT_APPLICATION_CLICK_EVENT, retry = true)
+    public void clickEvent(AgentApplicationClickEventMessage message) throws Exception {
+        BizAgentApplicationPublishEntity agentApplicationPublishEntity = bizAgentApplicationPublishService.getByAgentId(message.getAgentId());
+        if (agentApplicationPublishEntity != null) {
+            Integer publishId = agentApplicationPublishEntity.getId();
+            agentApplicationMallService.addClickNumber(publishId);
+        }
+    }
+}

src/main/java/cn/com/poc/message/service/impl/AgentApplicationProducerServiceImpl.java

+package cn.com.poc.message.service.impl;
+
+import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
+import cn.com.poc.message.service.AgentApplicationProducerService;
+import cn.com.poc.message.topic.AgentApplicationTopic;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.yict.framemax.tumbleweed.client.annotation.Producer;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AgentApplicationProducerServiceImpl implements AgentApplicationProducerService {
+
+    @Override
+    @Producer(topic = AgentApplicationTopic.AGENT_APPLICATION_CLICK_EVENT)
+    public AgentApplicationClickEventMessage clickEvent(AgentApplicationClickEventMessage message) {
+        return message;
+    }
+}

src/main/java/cn/com/poc/message/topic/AgentApplicationTopic.java

+package cn.com.poc.message.topic;
+
+public interface AgentApplicationTopic {
+
+
+    /**
+     * Agent application click event.
+     */
+    String AGENT_APPLICATION_CLICK_EVENT = "agent_application_click_event";
+
+}

src/main/java/cn/com/poc/user/dto/MemberInfoDto.java

@@ -2,6 +2,8 @@ package cn.com.poc.user.dto;
 
 
 import cn.com.yict.framemax.data.model.BaseModelClass;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.util.Date;
 

src/main/java/cn/com/poc/user/rest/BizMemberInfoRest.java

@@ -8,7 +8,9 @@ import cn.com.poc.user.dto.MemberPasswordRequestDto;
 import cn.com.yict.framemax.core.rest.BaseRest;
 import cn.com.yict.framemax.web.permission.Access;
 import cn.com.yict.framemax.web.permission.Permission;
+import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Permission(Access.Safety)
 public interface BizMemberInfoRest extends BaseRest {
@@ -41,4 +43,10 @@ public interface BizMemberInfoRest extends BaseRest {
      * @return
      */
     MemberInfoDto getCurrentMemberInfo() throws Exception;
+
+    /**
+     * 获取用户昵称
+     */
+    @Permission(Access.Anonymous)
+    MemberInfoDto getMemberNickName(@RequestParam Long memberId) throws Exception;
 }
\ No newline at end of file

src/main/java/cn/com/poc/user/rest/impl/BizMemberInfoRestImpl.java

@@ -14,6 +14,7 @@ import cn.com.poc.user.aggregation.MemberInfoService;
 import cn.com.poc.user.builder.LoginChannelBuilder;
 import cn.com.poc.user.entity.MemberInfoEntity;
 import cn.com.poc.user.service.BizMemberInfoService;
+import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.security.oauth.OauthAccesstokenManager;
 import cn.com.yict.framemax.security.oauth.entity.OauthResultEntity;
 import org.springframework.stereotype.Component;
@@ -111,4 +112,16 @@ public class BizMemberInfoRestImpl implements BizMemberInfoRest {
         return MemberInfoConvert.converEntity2Dto(memberInfoEntity);
     }
 
+
+    @Override
+    public MemberInfoDto getMemberNickName(Long memberId) throws Exception {
+        MemberInfoEntity memberInfoEntity = bizMemberInfoService.getById(memberId.intValue());
+        if (memberInfoEntity == null) {
+            throw new I18nMessageException("exception/user.does.not.exist");
+        }
+        MemberInfoDto memberInfoDto = new MemberInfoDto();
+        memberInfoDto.setNickName(memberInfoEntity.getNickName());
+        memberInfoDto.setAvatarUrl(memberInfoEntity.getAvatarUrl());
+        return memberInfoDto;
+    }
 }
\ No newline at end of file

src/main/resources/framemax-config/i18n/en/exception.properties

@@ -58,7 +58,7 @@ failed.to.obtain.token=Failed to obtain token
 re-verify.the.user.identity=Please re verify the user's identity
 user.cannot.be.found=The user cannot be found
 verification.code.is.incorrect.please.re-enter=The verification code is incorrect, please re-enter
-user.does.not.exist=The login  user does not exist
+user.does.not.exist=User does not exist
 password.error.please.re-enter=Password error, please re-enter
 unable.find.user.association.relationship=Unable to find user's association relationship
 account.has.already=This account has already been registered, please replace it
@@ -67,4 +67,5 @@ call.failure=Call failure
 model.not.exist=Model not exist
 upload.more.than.10m=The uploaded file cannot exceed 10M file name
 error.file.content.is.null=Incorrect file, file contents cannot be empty, file name
-file.content.more.than.100w=The number of characters in a file cannot exceed 100w
+file.content.more.than.100w=The number of characters in a file cannot exceed 100w
\ No newline at end of file
+collect.limit.message=Click too fast, do not repeat the operation
\ No newline at end of file