Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java

@@ -0,0 +1,49 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: MessageTypeEnum
+ * @Description:
+ * @date 2023-06-15 10:14
+ */
+public enum MessageTypeEnum {
+
+    SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag")
+
+
+
+    ;
+
+    private String code;
+
+    private String name;
+
+    private String imageMediaId;
+
+    MessageTypeEnum(String code, String name, String imageMediaId) {
+        this.code = code;
+        this.name = name;
+        this.imageMediaId = imageMediaId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImageMediaId() {
+        return imageMediaId;
+    }
+
+    public static String getImageMediaId(String code){
+        for (MessageTypeEnum value : MessageTypeEnum.values()) {
+            if(value.code.equals(code)){
+                return value.imageMediaId;
+            }
+        }
+        return null;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java

@@ -0,0 +1,33 @@
+package com.cool.store.dto.message;
+
+import com.cool.store.enums.MessageTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: SendCardMessageDTO
+ * @Description:发送卡片消息
+ * @date 2023-06-15 11:05
+ */
+@Data
+public class SendCardMessageDTO {
+
+    @ApiModelProperty("消息接收人")
+    private List<String> userIds;
+
+    @ApiModelProperty("消息链接")
+    private String messageUrl;
+
+    @ApiModelProperty("消息标题")
+    private String title;
+
+    @ApiModelProperty("消息内容")
+    private String content;
+
+    @ApiModelProperty("消息类型, MessageTypeEnum")
+    private MessageTypeEnum messageType;
+
+}

coolstore-partner-service/coolstore-partner-service.iml

@@ -168,5 +168,7 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-array:0.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-number:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
   </component>
 </module>

coolstore-partner-service/pom.xml

@@ -72,6 +72,14 @@
             <groupId>com.aliyun</groupId>
             <artifactId>ocr20191230</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java

@@ -7,6 +7,7 @@ import com.cool.store.dto.enterprise.AuthScopeDTO;
 import com.cool.store.dto.enterprise.EnterpriseUserDTO;
 import com.cool.store.dto.enterprise.SysDepartmentDTO;
 import com.cool.store.dto.login.UserIdInfoDTO;
+import com.cool.store.dto.message.SendCardMessageDTO;
 import com.cool.store.dto.response.ResultDTO;
 import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.enums.ErrorCodeEnum;
@@ -17,6 +18,7 @@ import com.cool.store.utils.RestTemplateUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -311,4 +313,23 @@ public class ISVHttpRequest {
         }
         return null;
     }
+
+    /**
+     * 发送飞书卡片消息
+     * @param param
+     */
+    public void sendFeiShuCardMessage(SendCardMessageDTO param) throws ApiException{
+        if(CollectionUtils.isEmpty(param.getUserIds()) || StringUtils.isAnyBlank(param.getTitle(), param.getContent(), param.getMessageUrl()) || Objects.isNull(param.getMessageType())){
+            return;
+        }
+        String url = isvDomain + "/sendFeiShuCardMessage";
+        ResultDTO responseEntity = null;
+        try {
+            responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class);
+            log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity));
+        } catch (Exception e) {
+            log.info("调用isv出错{}", e);
+            throw new ApiException(e.getMessage());
+        }
+    }
 }

coolstore-partner-service/src/main/java/com/cool/store/mq/RocketMqLogAspect.java

@@ -0,0 +1,66 @@
+package com.cool.store.mq;
+
+
+import com.aliyun.openservices.ons.api.Constants;
+import com.aliyun.openservices.ons.api.Message;
+import com.cool.store.constants.CommonConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 切面处理类，操作日志异常日志记录处理
+ * @author jiangjixiang
+ */
+@Aspect
+@Component
+@Slf4j
+public class RocketMqLogAspect {
+
+
+    /**
+     * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
+     */
+    @Pointcut(value = "execution(public * com.cool.store.mq.consumer.listener..*.consume(..))")
+    public void rocketMqMdc() {
+    }
+
+    /**
+     * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行
+     *
+     * @param joinPoint 切入点
+     * @param keys      返回结果
+     */
+    @Before(value = "rocketMqMdc()")
+    public void mqBeforeLog(JoinPoint joinPoint) {
+        try {
+            Object[] args = joinPoint.getArgs();
+            Message message = (Message)args[0];
+            String traceId = message.getMsgID() + Constants.TOPIC_PARTITION_SEPARATOR + message.getReconsumeTimes();
+            Map<String, String> context = MDC.getCopyOfContextMap();
+            if(Objects.isNull(context)){
+                MDC.put(CommonConstants.REQUEST_ID, traceId);
+            }
+        } catch (IllegalArgumentException e) {
+            log.info("MDC mqBeforeLog", e);
+        }
+    }
+
+
+    @AfterReturning(value = "rocketMqMdc()")
+    public void doAfterReturning(JoinPoint joinPoint){
+        try {
+            MDC.clear();
+        } catch (Exception e) {
+            log.info("MDC doAfterReturning", e);
+        }
+    }
+}

coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java

@@ -1,6 +1,7 @@
 package com.cool.store.service;
 
 import com.cool.store.dto.partner.DescribePhoneNumberDTO;
+import com.cool.store.exception.ApiException;
 import com.cool.store.vo.cuser.IdentityCardInfoVO;
 
 /**
@@ -23,6 +24,6 @@ public interface AliyunService {
      * @param faceImageUrl
      * @return
      */
-    IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl);
+    IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl) throws ApiException;
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java

@@ -6,11 +6,10 @@ import com.aliyun.dytnsapi20200217.models.DescribePhoneNumberOperatorAttributeRe
 import com.aliyun.dytnsapi20200217.models.DescribePhoneNumberOperatorAttributeResponse;
 import com.aliyun.ocr20191230.models.RecognizeIdentityCardResponse;
 import com.aliyun.ocr20191230.models.RecognizeIdentityCardResponseBody;
-import com.aliyun.tea.TeaException;
-import com.aliyun.tea.TeaModel;
 import com.aliyun.teaopenapi.models.Config;
 import com.cool.store.dto.partner.DescribePhoneNumberDTO;
 import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.service.AliyunService;
 import com.cool.store.vo.cuser.IdentityCardInfoVO;
@@ -62,7 +61,7 @@ public class AliyunServiceImpl implements AliyunService {
     }
 
     @Override
-    public IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl) {
+    public IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl) throws ApiException {
         //todo zcb ak sk替换
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
                 .setAccessKeyId("LTAI5t9RaXvABZbHvoXjDFJ1")
@@ -94,14 +93,17 @@ public class AliyunServiceImpl implements AliyunService {
             return result;
         } catch (com.aliyun.tea.TeaException e) {
             log.error("身份证解析报错TeaException：{}", e);
+            throw new ApiException(e.getMessage());
         } catch (MalformedURLException e) {
             log.error("身份证解析报错MalformedURLException：{}", e);
+            throw new ApiException(e.getMessage());
         } catch (IOException e) {
             log.error("身份证解析报错IOException：{}", e);
+            throw new ApiException(e.getMessage());
         } catch (Exception e) {
             log.error("身份证解析报错Exception：{}", e);
+            throw new ApiException(e.getMessage());
         }
-        return null;
     }
 
     public static String convertDate(String date, String format) {

coolstore-partner-webb/coolstore-partner-webb.iml

@@ -119,6 +119,8 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-array:0.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-number:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.6.RELEASE" level="project" />

coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java

@@ -1,14 +1,17 @@
 package com.cool.store.config;
 
 import com.alibaba.fastjson.JSON;
+import com.cool.store.constants.CommonConstants;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.utils.UUIDUtils;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
@@ -67,6 +70,7 @@ public class TokenValidateFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest reqs = (HttpServletRequest) servletRequest;
         String uri = reqs.getRequestURI();
@@ -109,6 +113,7 @@ public class TokenValidateFilter implements Filter {
             filterChain.doFilter(servletRequest, servletResponse);
         } finally {
             CurrentUserHolder.removeUser();
+            MDC.clear();
         }
     }
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java

@@ -6,6 +6,7 @@ import com.cool.store.dto.calendar.CreateCalendarEventDTO;
 import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
 import com.cool.store.dto.calendar.UpdateCalendarEventDTO;
 import com.cool.store.dto.calendar.UserCalendarsEventDTO;
+import com.cool.store.dto.message.SendCardMessageDTO;
 import com.cool.store.dto.partner.DescribePhoneNumberDTO;
 import com.cool.store.dto.response.ResultDTO;
 import com.cool.store.entity.HyOpenAreaInfoDO;
@@ -200,7 +201,7 @@ public class TestController {
         return ResultDTO.successResult(isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime));
     }
 
-    @GetMapping(path = "/getIdentityCardInfo")
+    @GetMapping("/getIdentityCardInfo")
     @ApiOperation("根据身份证正面解析获取数据")
     public ResponseResult<IdentityCardInfoVO> getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){
         try {
@@ -211,4 +212,14 @@ public class TestController {
         }
     }
 
+    @PostMapping("/sendFeiShuCardMessage")
+    public ResponseResult sendFeiShuCardMessage(@RequestBody SendCardMessageDTO param){
+        try {
+            isvHttpRequest.sendFeiShuCardMessage(param);
+            return ResponseResult.success();
+        } catch (Exception e) {
+            throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);
+        }
+    }
+
 }

coolstore-partner-webc/coolstore-partner-webc.iml

@@ -117,6 +117,8 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-array:0.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:darabonba-number:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.3" level="project" />

coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java

@@ -2,6 +2,7 @@ package com.cool.store.config;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.response.ResponseResult;
@@ -9,9 +10,11 @@ import com.cool.store.service.WechatMiniAppService;
 import com.cool.store.utils.AesUtil;
 import com.cool.store.utils.Md5Utils;
 import com.cool.store.utils.Sha1Utils;
+import com.cool.store.utils.UUIDUtils;
 import com.cool.store.vo.PartnerUserInfoVO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
@@ -46,7 +49,9 @@ public class SignValidateFilter implements Filter {
 
     private static List<String> patternList =
             Lists.newArrayList("/web/check/ok","/check/ok",
-                    "/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**","/partner/pc/feiShuLogin","/partner/pc/oss/getUploadFileConfig",
+                    "/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**",
+                    "/partner/mini/program/oss/getUploadFileConfig",
+                    "/partner/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
                     "/**/swagger*/**", "/**/webjars/**");
 
 
@@ -73,6 +78,7 @@ public class SignValidateFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String uri = request.getRequestURI();
@@ -101,8 +107,7 @@ public class SignValidateFilter implements Filter {
             // 前后端验签不等
             if (!newSign.equals(sign)) {
                 response.setStatus(HttpStatus.OK.value());
-                response.getWriter().write(JSON.toJSONString(
+                response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL)));
-                        ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL)));
                 return;
             }
             PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, openid);
@@ -116,6 +121,7 @@ public class SignValidateFilter implements Filter {
             filterChain.doFilter(servletRequest, servletResponse);
         } finally {
             PartnerUserHolder.removeUser();
+            MDC.clear();
         }
     }
 

pom.xml

@@ -186,6 +186,16 @@
                 <artifactId>ocr20191230</artifactId>
                 <version>1.0.26</version>
             </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>1.9.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjweaver</artifactId>
+                <version>1.9.5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>