Sfoglia il codice sorgente

bugfix:ai登录没有UdUser用户了,统一改成admin用户

刘云鑫 9 ore fa
parent
commit
fbcca59027

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
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}")
     @Value("${third-party-login.base-url}")
     private String loginUrl;
     private String loginUrl;
 
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
     private String userName;
 
 
     @Value("${third-party-pass-word.base-url}")
     @Value("${third-party-pass-word.base-url}")

+ 1 - 1
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}")
 //    @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";
 //    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;
     private String userName;
 
 
     @Value("${third-party-pass-word.base-url:123456}")
     @Value("${third-party-pass-word.base-url:123456}")

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

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

+ 1 - 1
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}")
     @Value("${third-party-login.base-url}")
     private String loginUrl;
     private String loginUrl;
 
 
-    @Value("${third-party-user-name.base-url}")
+    @Value("${third-party-user-name-admin.base-url}")
     private String userName;
     private String userName;
 
 
     @Value("${third-party-pass-word.base-url}")
     @Value("${third-party-pass-word.base-url}")

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

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

+ 1 - 23
alien-store/src/main/java/shop/alien/store/controller/UserStoreController.java

@@ -1,42 +1,20 @@
 package shop.alien.store.controller;
 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 com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 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.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 import shop.alien.entity.result.R;
 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.StoreCommentAppealMapper;
 import shop.alien.mapper.StoreCommentMapper;
 import shop.alien.mapper.StoreCommentMapper;
-import shop.alien.store.annotation.TrackEvent;
 import shop.alien.store.service.LifeUserStoreService;
 import shop.alien.store.service.LifeUserStoreService;
 import shop.alien.util.common.AlipayTradeAppPay;
 import shop.alien.util.common.AlipayTradeAppPay;
 import shop.alien.util.common.ListToPage;
 import shop.alien.util.common.ListToPage;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 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.List;
 import java.util.Map;
 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";
     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";
     private String userName = "UdUser";
 
 
 //    @Value("${third-party-pass-word.base-url}")
 //    @Value("${third-party-pass-word.base-url}")

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

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

+ 1 - 1
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}")
     //    @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";
     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;
     private String userName;
 
 
     @Value("${third-party-pass-word.base-url:123456}")
     @Value("${third-party-pass-word.base-url:123456}")