小程序二维码改成正式版，小程序聊天头像恢复

Reviewed-on: #100

.drone-java.yml

@@ -1,29 +1,19 @@
 kind: pipeline # 定义对象类型，还有secret和signature两种类型
- 
 type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
- 
 name: filesystem-drone # 定义流水线名称
 
 clone:
   disable: true
+
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
- 
-    image: appleboy/drone-ssh # SSH工具镜像
- 
+  - image: appleboy/drone-ssh # SSH工具镜像
     settings:
- 
       host: 1.14.205.126 # 远程连接地址
- 
       username: root # 远程连接账号
- 
       password:
- 
         from_secret: ssh_password # 从Secret中读取SSH密码
- 
       port: 22 # 远程连接端口
- 
       command_timeout: 30m # 远程执行命令超时时间
- 
       script:
         - echo "build-java......"
         - cd /root/allLikeMall
@@ -34,4 +24,3 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         - cd yudao-server
         - chmod +x all.sh
         - ./all.sh
-

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java

@@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessagePageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessageSendReqVO;
@@ -31,6 +33,10 @@ public class AppKeFuMessageController {
     @Resource
     private KeFuMessageService kefuMessageService;
 
+    @Resource
+    private MemberUserApi memberUserApi;
+
+
     @PostMapping("/send")
     @Operation(summary = "发送客服消息")
     @PreAuthenticated
@@ -53,6 +59,19 @@ public class AppKeFuMessageController {
     @PreAuthenticated
     public CommonResult<PageResult<KeFuMessageRespVO>> getKefuMessagePage(@Valid AppKeFuMessagePageReqVO pageReqVO) {
         PageResult<KeFuMessageDO> pageResult = kefuMessageService.getKeFuMessagePage(pageReqVO, getLoginUserId());
+        for (int i = 0; i < pageResult.getList().size(); i++) {
+            KeFuMessageDO keFuMessageDO = pageResult.getList().get(i);
+            if (keFuMessageDO.getSenderType() == 1){
+                MemberUserRespDTO user = memberUserApi.getUser(keFuMessageDO.getSenderId());
+                keFuMessageDO.setSenderAvatar(user.getAvatar());
+            }
+
+            if (keFuMessageDO.getSenderType() == 2){
+                String systemUserAvatar = kefuMessageService.findSystemUserAvatar(keFuMessageDO.getSenderId());
+                keFuMessageDO.setSenderAvatar(systemUserAvatar);
+            }
+
+        }
         return success(BeanUtils.toBean(pageResult, KeFuMessageRespVO.class));
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/kefu/KeFuMessageDO.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.promotion.enums.kefu.KeFuMessageContentTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -78,4 +79,7 @@ public class KeFuMessageDO extends BaseDO {
      */
     private Boolean readStatus;
 
+
+    @TableField(exist = false)
+    private String senderAvatar;
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/kefu/KeFuMessageMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.Collection;
 import java.util.List;
@@ -46,4 +47,8 @@ public interface KeFuMessageMapper extends BaseMapperX<KeFuMessageDO> {
                 .orderByDesc(KeFuMessageDO::getCreateTime));
     }
 
+
+    @Select(" SELECT avatar FROM system_users where id = #{id} ")
+    String findSystemUserAvatar(Long id);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageService.java

@@ -59,4 +59,6 @@ public interface KeFuMessageService {
      */
     PageResult<KeFuMessageDO> getKeFuMessagePage(AppKeFuMessagePageReqVO pageReqVO, Long userId);
 
+    String findSystemUserAvatar(Long id);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java

@@ -159,6 +159,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
         return keFuMessageMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public String findSystemUserAvatar(Long id) {
+        return keFuMessageMapper.findSystemUserAvatar(id);
+    }
+
     private KeFuMessageServiceImpl getSelf() {
         return SpringUtil.getBean(getClass());
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java

@@ -254,6 +254,7 @@ public class SocialClientServiceImpl implements SocialClientService {
                     ObjUtil.defaultIfNull(reqVO.getAutoColor(), SocialWxQrcodeReqDTO.AUTO_COLOR),
                     null,
                     ObjUtil.defaultIfNull(reqVO.getHyaline(), SocialWxQrcodeReqDTO.HYALINE));
+
         } catch (WxErrorException e) {
             log.error("[getWxQrcode][reqVO({})) 获得小程序码失败]", reqVO, e);
             throw exception(SOCIAL_CLIENT_WEIXIN_MINI_APP_QRCODE_ERROR);

yudao-server/src/main/resources/application-local.yaml

@@ -228,7 +228,7 @@ yudao:
     enable: false
   demo: false # 关闭演示模式
   wxa-code:
-    env-version: develop # 小程序版本: 正式版为 "release"；体验版为 "trial"；开发版为 "develop"
+    env-version: release # 小程序版本: 正式版为 "release"；体验版为 "trial"；开发版为 "develop"
   tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
 
 justauth: