Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into sit

alien-job/src/main/java/shop/alien/job/second/AiCheckXxlJob.java

@@ -69,7 +69,7 @@ public class AiCheckXxlJob {
     private String loginUrl;
 
     //用户名
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     //密码

alien-job/src/main/java/shop/alien/job/second/AiProductComplaintJob.java

@@ -45,7 +45,7 @@ public class AiProductComplaintJob {
     private final LifeUserMapper lifeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

alien-job/src/main/java/shop/alien/job/second/AiUserViolationJob.java

@@ -46,7 +46,7 @@ public class AiUserViolationJob {
     private final SecondUserCreditMapper secondUserCreditMapper;
     private final SecondUserCreditRecordMapper secondUserCreditRecordMapper;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

alien-job/src/main/java/shop/alien/job/store/AiTagJob.java

@@ -92,7 +92,7 @@ public class AiTagJob {
     private String aiMerchantOnboardingApplicationsUrl;
 
     //用户名
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     //密码

alien-job/src/main/java/shop/alien/job/store/BadReviewAppealJob.java

@@ -71,7 +71,7 @@ public class BadReviewAppealJob {
 //    @Value("${third-party-login.base-url}")
 //    private String loginUrl;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

alien-lawyer/src/main/java/shop/alien/lawyer/util/ai/AiAuthTokenUtil.java

@@ -24,7 +24,7 @@ public class AiAuthTokenUtil {
     @Value("${third-party-login.base-url}")
     private String loginUrl;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

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

@@ -207,6 +207,12 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
 //                SecondGoodsRecord goodsRecord = secondGoodsRecordMapper.selectOne(goodsWrapper);
 //                if (null != goodsRecord) lifeuserViolation.setBusinessId(goodsRecord.getId());
 //            }
+            List<String> imgList = lifeuserViolation.getImgUrl();
+            String imgStr = "";
+            if (imgList != null && !imgList.isEmpty()) {
+                imgStr = StringUtils.join(imgList, ",");
+            }
+            lifeuserViolation.setReportEvidenceImg(imgStr);
             int result = lifeUserViolationMapper.insert(lifeuserViolation);
             if (result > 0) {
 

alien-second/src/main/java/shop/alien/second/util/AiTaskUtils.java

@@ -29,7 +29,7 @@ public class AiTaskUtils {
 //    @Value("${third-party-login.base-url:http://192.168.2.250:9000/ai/user-auth-core/api/v1/auth/login}")
 //    private String loginUrl = "http://192.168.2.250:9000/ai/user-auth-core/api/v1/auth/login";
 
-    @Value("${third-party-user-name.base-url:UdUser}")
+    @Value("${third-party-user-name-admin.base-url:UdUser}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url:123456}")

alien-second/src/main/java/shop/alien/second/util/AiUserViolationUtils.java

@@ -43,13 +43,13 @@ public class AiUserViolationUtils {
     @Value("${third-party-login.base-url}")
     private String loginUrl;
 
-    @Value("${third-party-user-name.base-url:UdUser}")
+    @Value("${third-party-user-name-admin.base-url:UdUser}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url:123456}")
     private String passWord;
 
-    @Value("${third-party-ai.report-review.base-url}")
+    @Value("${third-party-ai.reportuser-review.base-url}")
     private String userComplaintRecordUrl;
 
     @Value("${third-party-ai.report-review.base-url}")
@@ -115,36 +115,40 @@ public class AiUserViolationUtils {
         analyzeHeaders.set("Authorization", "Bearer " + accessToken);
 
         Map<String, Object> analyzeRequest = new HashedMap<>();
-//        // 对应参数
-//        if (1 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "用户违规");
-//        } else if (2 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "色情低俗");
-//        } else if (3 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "违法违规");
-//        } else if (4 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "谩骂嘲讽、煽动对立");
-//        } else if (5 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "涉嫌诈骗");
-//        } else if (6 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "人身攻击");
-//        } else if (7 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "种族歧视");
-//        } else if (8 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "政治敏感");
-//        } else if (9 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "虚假、不实内容");
-//        } else if (10 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "违反公德秩序");
-//        } else if (11 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "危害人身安全");
-//        } else if (12 == lifeuserViolation.getDictId()){
-//            analyzeRequest.put("complaint_type", "网络暴力");
-//        } else {
-//            analyzeRequest.put("complaint_type", "其他");
-//        }
-        analyzeRequest.put("id", lifeuserViolation.getId());
-        analyzeRequest.put("type", lifeuserViolation.getReportContextType());
+        // 对应参数举报类型
+        if (1 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "用户违规");
+        } else if (2 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "色情低俗");
+        } else if (3 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "违法违规");
+        } else if (4 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "谩骂嘲讽、煽动对立");
+        } else if (5 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "涉嫌诈骗");
+        } else if (6 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "人身攻击");
+        } else if (7 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "种族歧视");
+        } else if (8 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "政治敏感");
+        } else if (9 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "虚假、不实内容");
+        } else if (10 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "违反公德秩序");
+        } else if (11 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "危害人身安全");
+        } else if (12 == lifeuserViolation.getDictId()){
+            analyzeRequest.put("complaint_type", "网络暴力");
+        } else {
+            analyzeRequest.put("complaint_type", "其他");
+        }
+        // 设置举报补充
+        analyzeRequest.put("complaint_text",lifeuserViolation.getOtherReasonContent());
+        // 举报凭证
+        analyzeRequest.put("evidence_urls",((SecondUserViolationVo) lifeuserViolation).getImgUrl());
+//        analyzeRequest.put("id", lifeuserViolation.getId());
+//        analyzeRequest.put("type", lifeuserViolation.getReportContextType());
 
         //举报人
         String reporterUserId = lifeuserViolation.getReportingUserId();
@@ -167,8 +171,10 @@ public class AiUserViolationUtils {
         List<LifeMessage> chatMessages = getRecentChatMessages(userReporterUserById, userReportedUserById);
 
         // 将聊天记录转换为文本格式
-        String text = convertMessagesToText(chatMessages);
-        analyzeRequest.put("conversation_context", StringUtils.hasText(text) ? text : "");
+        String text = convertMessagesToText(chatMessages,userReporterUserById);
+        analyzeRequest.put("chat_records", StringUtils.hasText(text) ? text : "");
+        analyzeRequest.put("reporter_user_id", reporterUserId);
+        analyzeRequest.put("reported_user_id", reportedUserId);
 
 //        analyzeRequest.put("text", StringUtils.hasText(text) ? text : "");
 //        analyzeRequest.put("img_urls", img_urls);
@@ -206,7 +212,7 @@ public class AiUserViolationUtils {
                 R.fail("提交用户投诉审核任务返回record_id为空");
                 return  null;
             }
-            // 解析AI审核结果
+          /*  // 解析AI审核结果
             String processingStatus = JSONObject.parseObject(analyzeResp.getBody()).getJSONObject("data").getJSONObject("result").getString("processing_status");
             boolean success = "1".equals(processingStatus);
 
@@ -215,7 +221,7 @@ public class AiUserViolationUtils {
             // 更新举报处理状态
             lifeUserViolation.setProcessingStatus(processingStatus);
             lifeUserViolation.setProcessingTime(new Date());
-            lifeUserViolationMapper.updateById(lifeUserViolation);
+            lifeUserViolationMapper.updateById(lifeUserViolation);*/
             return taskId;
         } else {
             if (analyzeResp != null) {
@@ -409,7 +415,7 @@ public class AiUserViolationUtils {
      * @param messages 聊天消息列表
      * @return 格式化后的文本字符串
      */
-    private String convertMessagesToText(List<LifeMessage> messages) {
+    private String convertMessagesToText(List<LifeMessage> messages, String userReporterUserById) {
         if (messages == null || messages.isEmpty()) {
             return "";
         }
@@ -419,9 +425,13 @@ public class AiUserViolationUtils {
         for (int i = messages.size() - 1; i >= 0; i--) {
             LifeMessage message = messages.get(i);
             // 格式：[时间] 发送者ID: 消息内容
-            sb.append("[").append(formatTime(message.getCreatedTime())).append("] ")
-                    .append(message.getSenderId()).append(": ")
-                    .append(message.getContent()).append("\n");
+            sb.append("[").append(formatTime(message.getCreatedTime())).append("] ");
+            if( message.getSenderId().equals(userReporterUserById) ) {
+                sb.append("0: ");
+            } else {
+                sb.append("1: ");
+            }
+            sb.append(message.getContent()).append("\n");
         }
 
         return sb.toString().trim();

alien-store-platform/src/main/java/shop/alien/storeplatform/util/AiAuthTokenUtil.java

@@ -26,7 +26,7 @@ public class AiAuthTokenUtil {
     @Value("${third-party-login.base-url}")
     private String loginUrl;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

alien-store/src/main/java/shop/alien/store/controller/AiAuditController.java

@@ -38,7 +38,7 @@ public class AiAuditController {
 
     private final RestTemplate restTemplate;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-user-name-admin.base-url}")

alien-store/src/main/java/shop/alien/store/controller/UserStoreController.java

@@ -1,42 +1,20 @@
 package shop.alien.store.controller;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.StoreComment;
-import shop.alien.entity.store.StoreCommentAppeal;
-import shop.alien.entity.store.vo.StoreCommentAppealVo;
 import shop.alien.mapper.StoreCommentAppealMapper;
 import shop.alien.mapper.StoreCommentMapper;
-import shop.alien.store.annotation.TrackEvent;
 import shop.alien.store.service.LifeUserStoreService;
 import shop.alien.util.common.AlipayTradeAppPay;
 import shop.alien.util.common.ListToPage;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -61,7 +39,7 @@ public class UserStoreController {
 
     private String resultUrl = "http://192.168.2.250:9000/ai/auto-review/api/v1/records/{record_id}/completed";
 
-//    @Value("${third-party-user-name.base-url}")
+//    @Value("${third-party-user-name-admin.base-url}")
     private String userName = "UdUser";
 
 //    @Value("${third-party-pass-word.base-url}")

alien-store/src/main/java/shop/alien/store/service/StoreCommentAppealSupplementJobService.java

@@ -47,7 +47,7 @@ public class StoreCommentAppealSupplementJobService {
     private final StoreInfoMapper storeInfoMapper;
     private final CommonRatingService commonRatingService;
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url}")

alien-store/src/main/java/shop/alien/store/util/AiUserViolationUtils.java

@@ -37,7 +37,7 @@ public class AiUserViolationUtils {
     //    @Value("${third-party-login.base-url:http://192.168.2.250:9000/ai/user-auth-core/api/v1/auth/login}")
     private String loginUrl = "http://192.168.2.250:9000/ai/user-auth-core/api/v1/auth/login";
 
-    @Value("${third-party-user-name.base-url:UdUser}")
+    @Value("${third-party-user-name-admin.base-url:UdUser}")
     private String userName;
 
     @Value("${third-party-pass-word.base-url:123456}")