Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -819,7 +819,7 @@ public class AiHookServiceImpl implements AiHookService {
                                         .append("\uD83C\uDF39\uD83C\uDF39\uD83C\uDF39");
                             case 3:
                                 ExpressInfoDTO expressInfo = getExpress(fsStoreOrder.getOrderId());
-                                sBuilder.append("您购买的有一个包裹 ");
+                                sBuilder.append("您有一个包裹 ");
                                 sBuilder.append(" 已经查询到了，正在配送中了。\n");
                                 if(expressInfo != null && expressInfo.getTraces() != null && !expressInfo.getTraces().isEmpty()){
                                     List<TracesDTO> traces = expressInfo.getTraces();

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -1309,6 +1309,10 @@ public class QwUserServiceImpl implements IQwUserService
         WxWorkGetQrCodeDTO wxWorkGetQrCodeDTO = new WxWorkGetQrCodeDTO();
         wxWorkGetQrCodeDTO.setUuid(qwUser.getUid());
         try {
+            redisCache.deleteObject("qrCode:uuid:"+qwUser.getUid());
+            redisCache.deleteObject("qrCodeUid:"+qwUser.getUid());
+            redisCache.deleteObject("qrCode:qwUserId:"+qwUser.getId());
+            redisCache.deleteObject("qrCodeUid:qwUserId:"+qwUser.getId());
             wxWorkService.LoginOut(wxWorkGetQrCodeDTO,qwUser.getServerId());
         }catch (Exception e){