alien-second/src/main/java/shop/alien/second/controller/SecondGoodsController.java

@@ -132,7 +132,7 @@ public class SecondGoodsController {
      * 文本审核接口 - 商品发布场景
      */
     @GetMapping("/textModeration/productPublish")
-    @ApiOperation("文本审核 - 商品发布场景（大语言模型输入文字检测、广告法合规检测_专业版、URL风险链接检测）")
+    @ApiOperation("文本审核 - 商品发布场景（大语言模型输入文字检测、广告法合规检测_专业版）")
     public R<TextModerationResultVO> productPublishTextModeration(@ApiParam("待审核文本") @RequestParam String text) {
         log.info("SecondGoodsController.productPublishTextModeration?text={}", text);
         try {
@@ -151,13 +151,12 @@ public class SecondGoodsController {
      * 文本审核接口 - 聊一聊场景
      */
     @GetMapping("/textModeration/chat")
-    @ApiOperation("文本审核 - 聊一聊场景（私聊互动内容检测_专业版、广告法合规检测_专业版、URL风险链接检测）")
+    @ApiOperation("文本审核 - 聊一聊场景（私聊互动内容检测_专业版、广告法合规检测_专业版）")
     public R<TextModerationResultVO> chatTextModeration(@ApiParam("待审核文本") @RequestParam String text) {
         log.info("SecondGoodsController.chatTextModeration?text={}", text);
         try {
             List<String> servicesList = Lists.newArrayList();
             servicesList.add(TextReviewServiceEnum.AD_COMPLIANCE_DETECTION_PRO.getService());
-            servicesList.add(TextReviewServiceEnum.URL_DETECTION.getService());
             servicesList.add(TextReviewServiceEnum.CHAT_DETECTION_PRO.getService());
             TextModerationResultVO textModerationResultVO = textModerationUtil.invokeFunction(text,servicesList);
             return R.data(textModerationResultVO);
@@ -171,13 +170,12 @@ public class SecondGoodsController {
      * 文本审核接口 - 评论场景
      */
     @GetMapping("/textModeration/comment")
-    @ApiOperation("文本审核 - 评论场景（公聊评论内容检测_专业版、广告法合规检测_专业版、URL风险链接检测）")
+    @ApiOperation("文本审核 - 评论场景（公聊评论内容检测_专业版、广告法合规检测_专业版）")
     public R<TextModerationResultVO> commentTextModeration(@ApiParam("待审核文本") @RequestParam String text) {
         log.info("SecondGoodsController.commentTextModeration?text={}", text);
         try {
             List<String> servicesList = Lists.newArrayList();
             servicesList.add(TextReviewServiceEnum.AD_COMPLIANCE_DETECTION_PRO.getService());
-            servicesList.add(TextReviewServiceEnum.URL_DETECTION.getService());
             servicesList.add(TextReviewServiceEnum.CHAT_DETECTION_PRO.getService());
             TextModerationResultVO textModerationResultVO = textModerationUtil.invokeFunction(text,servicesList);
             return R.data(textModerationResultVO);
@@ -191,11 +189,15 @@ public class SecondGoodsController {
      * 图片审核接口 - 发布商品场景
      */
     @GetMapping("/imageModeration/productPublish")
-    @ApiOperation("图片审核 - 发布商品场景（内容治理检测、AIGC图片风险检测、图片万物识别）")
+    @ApiOperation("图片审核 - 发布商品场景（内容治理检测、AIGC图片风险检测）")
     public R<ImageModerationResultVO> productPublishImageModeration(@ApiParam("图片地址") @RequestParam String imageUrl) {
         log.info("SecondGoodsController.productPublishImageModeration?imageUrl={}", imageUrl);
         try {
-            ImageModerationResultVO response = imageModerationUtil.productPublishCheck(imageUrl);
+            List<String> servicesList = Lists.newArrayList();
+            // TODO 后续配置到数据库 中
+            servicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
+            servicesList.add(ImageReviewServiceEnum.AIGC_CHECK.getService());
+            ImageModerationResultVO response = imageModerationUtil.productPublishCheck(imageUrl,servicesList);
             return R.data(response);
         } catch (Exception e) {
             log.error("图片审核异常", e);
@@ -207,11 +209,14 @@ public class SecondGoodsController {
      * 图片审核接口 - 聊一聊场景
      */
     @GetMapping("/imageModeration/chat")
-    @ApiOperation("图片审核 - 聊一聊场景（图片万物识别、内容治理检测）")
+    @ApiOperation("图片审核 - 聊一聊场景（内容治理检测）")
     public R<ImageModerationResultVO> chatImageModeration(@ApiParam("图片地址") @RequestParam String imageUrl) {
         log.info("SecondGoodsController.chatImageModeration?imageUrl={}", imageUrl);
         try {
-            ImageModerationResultVO response = imageModerationUtil.chatCheck(imageUrl);
+            List<String> servicesList = Lists.newArrayList();
+            // TODO 后续配置到数据库 中
+            servicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
+            ImageModerationResultVO response = imageModerationUtil.productPublishCheck(imageUrl,servicesList);
             return R.data(response, "审核成功");
         } catch (Exception e) {
             log.error("图片审核异常", e);

alien-second/src/main/java/shop/alien/second/controller/SecondShieldController.java

@@ -3,6 +3,7 @@ package shop.alien.second.controller;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiSort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +11,7 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.second.SecondShield;
+import shop.alien.entity.second.vo.SecondGoodsVo;
 import shop.alien.mapper.second.SecondShieldMapper;
 import shop.alien.util.common.JwtUtil;
 
@@ -56,17 +58,15 @@ public class SecondShieldController {
     }
 
 
-    @ApiOperation("取消拉黑")
+    /**
+     * 取消拉黑
+     */
     @PostMapping("/deleteGoodsShield")
-    public R<T> deleteGoodsShield(
-            @RequestParam(value = "id", required = false) Integer id) {
-        Integer num = mapper.deleteById(id);
-
-        if(num == 1) {
-            return R.success("取消拉黑成功");
-        }
-        return R.fail("取消拉黑失败");
-
+    @ApiOperation("取消拉黑")
+    public R<Void> deleteGoodsShield(@ApiParam("取消拉黑") @RequestBody SecondGoodsVo secondGoods) {
+        log.info("SecondShieldController.GoodsShield?secondGoods={}", secondGoods.toString());
+        mapper.deleteById(secondGoods.getShieldId());
+        return R.success("取消拉黑成功");
     }
 
 }

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -197,7 +197,11 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         if (imageUrls != null && !imageUrls.isEmpty()) {
             StringBuilder failReasonBuilder = new StringBuilder();
             for (String imageUrl : imageUrls) {
-                ImageModerationResultVO response = imageModerationUtil.productPublishCheck(imageUrl);
+                List<String> imgServicesList = Lists.newArrayList();
+                // TODO 后续配置到数据库 中
+                imgServicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
+                imgServicesList.add(ImageReviewServiceEnum.AIGC_CHECK.getService());
+                ImageModerationResultVO response = imageModerationUtil.productPublishCheck(imageUrl,imgServicesList);
                 if ("high".equals(response.getRiskLevel())) {
                     // 文本审核不通过或存在高风险
                     goods.setGoodsStatus(2); // 审核失败

alien-util/src/main/java/shop/alien/util/common/safe/ImageModerationUtil.java

@@ -123,15 +123,11 @@ public class ImageModerationUtil {
      * @return 检测结果VO
      * @throws Exception 检测异常
      */
-    public ImageModerationResultVO productPublishCheck(String imageUrl) throws Exception {
+    public ImageModerationResultVO productPublishCheck(String imageUrl,List<String> servicesList) throws Exception {
         ImageModerationResultVO resultVO = new ImageModerationResultVO();
         // 批量服务key
         StringBuilder serviceBatchEnum = new StringBuilder();
         StringBuilder serviceEnum = new StringBuilder();
-        List<String> servicesList = Lists.newArrayList();
-        // TODO 后续配置到数据库 中
-        servicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
-        servicesList.add(ImageReviewServiceEnum.AIGC_CHECK.getService());
         for (String service : servicesList) {
             if (isSpecialService(service)) {
                 serviceBatchEnum.append(service).append(",");