Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java

@@ -132,8 +132,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             data.setApprovalTime(new Date());
             //遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警
             for (BusiNotice busiNotice : list) {
-                double v1 = NoticeUtils.computeJaccardSimilarity(data.getTitle(), busiNotice.getTitle());
-                double v2 = NoticeUtils.computeJaccardSimilarity(data.getDetail(), busiNotice.getDetail());
+                String tempTitle1 = data.getTitle().replaceAll("<br>","");
+                String tempTitle2 = busiNotice.getTitle().replaceAll("<br>","");
+                String tempDetail1 = data.getDetail().replaceAll("<br>","");
+                String tempDetail2 = busiNotice.getDetail().replaceAll("<br>","");
+                double v1 = NoticeUtils.computeJaccardSimilarity(tempTitle1, tempTitle2);
+                double v2 = NoticeUtils.computeJaccardSimilarity(tempDetail1, tempDetail2);
                 if (v1>=0.7&&v2>=0.7){
                     //title 和 detail 相似度大于70% 待审核
                     data.setApprovalStatus("0");

ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java

@@ -163,7 +163,7 @@ public class MemberUserController extends BaseController {
      * 赠送新人好礼
      */
     @Log(title = "赠送新人好礼", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/sendNewGift")
     public AjaxResult sendNewGift() {
         memberUserService.sendNewGift();
         return success();