|
|
@@ -4,21 +4,30 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.jzg.commons.constants.quote.enums.base.ExpenseRequestUrl;
|
|
|
import com.jzg.commons.entity.quote.vo.base.LoginBase;
|
|
|
import com.jzg.commons.entity.quote.vo.identify.SliderCaptchaVo;
|
|
|
+import com.jzg.commons.util.StringUtils;
|
|
|
import com.jzg.quotation.commons.entity.DetectLoginRequest;
|
|
|
+import com.jzg.quotation.commons.entity.GetCaptchaRequest;
|
|
|
+import com.jzg.quotation.commons.entity.GetCaptchaResponse;
|
|
|
import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
|
|
|
import com.jzg.quotation.taishan.crawler.component.TaiShanCrawlerCacheComponent;
|
|
|
import com.jzg.quotation.taishan.crawler.component.TaiShanCrawlerRequestComponent;
|
|
|
+import com.jzg.quotation.commons.component.RequestComponent;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.request.TaiShanCrawlerLoginRequest;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.request.TaiShanCrawlerSmsCodeRequest;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.request.TaiShanCrawlerVerifyRequest;
|
|
|
+import com.jzg.quotation.taishan.crawler.entity.request.TaiShanExternalSendCodeRequest;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.response.TaiShanCrawlerLoginResponse;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.response.TaiShanCrawlerSmsCodeResponse;
|
|
|
import com.jzg.quotation.taishan.crawler.entity.response.TaiShanCrawlerVerifyResponse;
|
|
|
+import com.jzg.quotation.taishan.crawler.entity.response.TaiShanExternalSendCodeResponse;
|
|
|
+import com.jzg.quotation.taishan.crawler.properties.ExteriorCaptchaProperties;
|
|
|
import com.jzg.quotation.taishan.crawler.service.TaiShanCrawlerQuoteProcessService;
|
|
|
import com.jzg.quotation.taishan.crawler.util.TaiShanCrawlerUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.http.util.TextUtils;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
@@ -45,31 +54,117 @@ public class TaiShanCrawlerQuoteProcessServiceImpl implements TaiShanCrawlerQuot
|
|
|
|
|
|
private final ExteriorUtilsRequest exteriorUtilsRequest;
|
|
|
|
|
|
+ private final RequestComponent requestComponent;
|
|
|
+
|
|
|
+ private final ExteriorCaptchaProperties exteriorCaptchaProperties;
|
|
|
+
|
|
|
// 登陆次数
|
|
|
public static final int LOGINS_NUMBER = 3;
|
|
|
|
|
|
+// @Override
|
|
|
+// public void sendCode(String username, String password) {
|
|
|
+// HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
+// getVerifyHeader(httpHeaders);
|
|
|
+// // 获取滑块验证码
|
|
|
+// Map<String, String> map = uuid();
|
|
|
+// TaiShanCrawlerVerifyRequest verifyRequest = new TaiShanCrawlerVerifyRequest(map.get("slider"));
|
|
|
+// log.info("verifyRequest参数的值：{}", JSON.toJSONString(verifyRequest));
|
|
|
+//
|
|
|
+// TaiShanCrawlerVerifyResponse verifyResponse = taiShanCrawlerRequestComponent.crawlerVerify(verifyRequest, httpHeaders);
|
|
|
+// log.info("verifyResponse参数的值：{}", JSON.toJSONString(verifyResponse));
|
|
|
+// // 滑块验证码识别
|
|
|
+// TaiShanCrawlerVerifyResponse.RepDataDTO repData = verifyResponse.getRepData();
|
|
|
+// List<Integer> integers = exteriorUtilsRequest.sliderCaptchaIdentify(ExpenseRequestUrl.SLIDER_IDENTIFY, new SliderCaptchaVo(repData.getOriginalImageBase64(), repData.getJigsawImageBase64()));
|
|
|
+// // 获取图片的宽高
|
|
|
+// List<Integer> sizeList = TaiShanCrawlerUtils.getImageSizeFromBase64(repData.getOriginalImageBase64());
|
|
|
+// // 获取验证码
|
|
|
+// TaiShanCrawlerSmsCodeRequest smsCodeRequest = new TaiShanCrawlerSmsCodeRequest(verifyResponse, integers, sizeList, password, username);
|
|
|
+// log.info("smsCodeRequest参数的值：{}", JSON.toJSONString(smsCodeRequest));
|
|
|
+// TaiShanCrawlerSmsCodeResponse smsCodeResponse = taiShanCrawlerRequestComponent.crawlerCheck(smsCodeRequest, httpHeaders);
|
|
|
+// log.info("smsCodeResponse参数的值：{}", JSON.toJSONString(smsCodeResponse));
|
|
|
+//
|
|
|
+// // 缓存登录信息
|
|
|
+// Map<String, Object> tokenMap = new HashMap<>();
|
|
|
+// tokenMap.put("token", smsCodeResponse.getRepData().getToken());
|
|
|
+// tokenMap.put("secretKey", verifyResponse.getRepData().getSecretKey());
|
|
|
+// tokenMap.put("pointJson", smsCodeResponse.getRepData().getPointJson());
|
|
|
+// log.info("TaiShan-tokenMap参数的值：{}", JSON.toJSONString(tokenMap));
|
|
|
+// taiShanCrawlerCacheComponent.cacheToken(username, tokenMap);
|
|
|
+// }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public GetCaptchaResponse getCaptcha(GetCaptchaRequest sendCaptchaRequest) {
|
|
|
+ log.info("开始获取泰山账号验证码");
|
|
|
+
|
|
|
+ GetCaptchaResponse getCaptchaResponse = new GetCaptchaResponse();
|
|
|
+ if(sendCaptchaRequest != null){
|
|
|
+ String username = sendCaptchaRequest.getUsername();
|
|
|
+ String password = sendCaptchaRequest.getPassword();
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)){
|
|
|
+ // 调用外部发送验证码接口（URL从Nacos配置读取）
|
|
|
+ TaiShanExternalSendCodeRequest externalRequest = new TaiShanExternalSendCodeRequest("", username, password);
|
|
|
+ log.info("externalSendCodeRequest参数的值：{}", JSON.toJSONString(externalRequest));
|
|
|
+
|
|
|
+ String sendCodeUrl = exteriorCaptchaProperties.getUrl();
|
|
|
+ log.info("外部发送验证码接口URL：{}", sendCodeUrl);
|
|
|
+
|
|
|
+ // 使用代码中已有的 requestComponent.post 方法
|
|
|
+ HttpHeaders externalHeaders = new HttpHeaders();
|
|
|
+ ResponseEntity<String> externalResponseEntity = requestComponent.post(sendCodeUrl, JSON.toJSONString(externalRequest), String.class, externalHeaders);
|
|
|
+ String externalResponseBody = externalResponseEntity.getBody();
|
|
|
+ log.info("外部发送验证码接口响应内容：{}", externalResponseBody);
|
|
|
+ TaiShanExternalSendCodeResponse externalResponse = JSON.parseObject(externalResponseBody, TaiShanExternalSendCodeResponse.class);
|
|
|
+ log.info("externalSendCodeResponse参数的值：{}", JSON.toJSONString(externalResponse));
|
|
|
+
|
|
|
+ // 从外部响应中获取数据并缓存
|
|
|
+ TaiShanExternalSendCodeResponse.DataDTO externalData = externalResponse.getData();
|
|
|
+ Map<String, Object> tokenMap = new HashMap<>();
|
|
|
+ tokenMap.put("token", externalData.getToken());
|
|
|
+ tokenMap.put("secretKey", externalData.getSecretKey());
|
|
|
+ tokenMap.put("pointJson", externalData.getPointJson());
|
|
|
+ log.info("TaiShan-tokenMap参数的值（从外部接口获取）：{}", JSON.toJSONString(tokenMap));
|
|
|
+ taiShanCrawlerCacheComponent.cacheToken(username, tokenMap);
|
|
|
+
|
|
|
+ getCaptchaResponse.setIdentifyId(externalData.getToken());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return getCaptchaResponse;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public void sendCode(String username, String password) {
|
|
|
- HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
- getVerifyHeader(httpHeaders);
|
|
|
- // 获取滑块验证码
|
|
|
- Map<String, String> map = uuid();
|
|
|
- TaiShanCrawlerVerifyRequest verifyRequest = new TaiShanCrawlerVerifyRequest(map.get("slider"));
|
|
|
- TaiShanCrawlerVerifyResponse verifyResponse = taiShanCrawlerRequestComponent.crawlerVerify(verifyRequest, httpHeaders);
|
|
|
- // 滑块验证码识别
|
|
|
- TaiShanCrawlerVerifyResponse.RepDataDTO repData = verifyResponse.getRepData();
|
|
|
- List<Integer> integers = exteriorUtilsRequest.sliderCaptchaIdentify(ExpenseRequestUrl.SLIDER_IDENTIFY, new SliderCaptchaVo(repData.getOriginalImageBase64(), repData.getJigsawImageBase64()));
|
|
|
- // 获取图片的宽高
|
|
|
- List<Integer> sizeList = TaiShanCrawlerUtils.getImageSizeFromBase64(repData.getOriginalImageBase64());
|
|
|
- // 获取验证码
|
|
|
- TaiShanCrawlerSmsCodeRequest smsCodeRequest = new TaiShanCrawlerSmsCodeRequest(verifyResponse, integers, sizeList, password, username);
|
|
|
- TaiShanCrawlerSmsCodeResponse smsCodeResponse = taiShanCrawlerRequestComponent.crawlerCheck(smsCodeRequest, httpHeaders);
|
|
|
-
|
|
|
- // 缓存登录信息
|
|
|
+ // 调用外部发送验证码接口（URL从Nacos配置读取）
|
|
|
+ TaiShanExternalSendCodeRequest externalRequest = new TaiShanExternalSendCodeRequest("", username, password);
|
|
|
+ log.info("externalSendCodeRequest参数的值：{}", JSON.toJSONString(externalRequest));
|
|
|
+
|
|
|
+ String sendCodeUrl = exteriorCaptchaProperties.getUrl();
|
|
|
+ log.info("外部发送验证码接口URL：{}", sendCodeUrl);
|
|
|
+
|
|
|
+ // 使用代码中已有的 requestComponent.post 方法
|
|
|
+ HttpHeaders externalHeaders = new HttpHeaders();
|
|
|
+ ResponseEntity<String> externalResponseEntity = requestComponent.post(sendCodeUrl, JSON.toJSONString(externalRequest), String.class, externalHeaders);
|
|
|
+ String externalResponseBody = externalResponseEntity.getBody();
|
|
|
+ log.info("外部发送验证码接口响应内容：{}", externalResponseBody);
|
|
|
+ TaiShanExternalSendCodeResponse externalResponse = JSON.parseObject(externalResponseBody, TaiShanExternalSendCodeResponse.class);
|
|
|
+ log.info("externalSendCodeResponse参数的值：{}", JSON.toJSONString(externalResponse));
|
|
|
+
|
|
|
+// if (externalResponse == null || externalResponse.getCode() != 200) {
|
|
|
+// String message = externalResponse != null ? externalResponse.getMessage() : "未知错误";
|
|
|
+// log.warn("外部发送验证码接口调用失败，错误信息：{}", message);
|
|
|
+// throw new RuntimeException("外部发送验证码失败：" + message);
|
|
|
+// }
|
|
|
+
|
|
|
+ // 从外部响应中获取数据并缓存
|
|
|
+ TaiShanExternalSendCodeResponse.DataDTO externalData = externalResponse.getData();
|
|
|
Map<String, Object> tokenMap = new HashMap<>();
|
|
|
- tokenMap.put("token", smsCodeResponse.getRepData().getToken());
|
|
|
- tokenMap.put("secretKey", verifyResponse.getRepData().getSecretKey());
|
|
|
- tokenMap.put("pointJson", smsCodeResponse.getRepData().getPointJson());
|
|
|
+ tokenMap.put("token", externalData.getToken());
|
|
|
+ tokenMap.put("secretKey", externalData.getSecretKey());
|
|
|
+ tokenMap.put("pointJson", externalData.getPointJson());
|
|
|
+ log.info("TaiShan-tokenMap参数的值（从外部接口获取）：{}", JSON.toJSONString(tokenMap));
|
|
|
taiShanCrawlerCacheComponent.cacheToken(username, tokenMap);
|
|
|
}
|
|
|
|
|
|
@@ -79,40 +174,66 @@ public class TaiShanCrawlerQuoteProcessServiceImpl implements TaiShanCrawlerQuot
|
|
|
*/
|
|
|
@Override
|
|
|
public void login(LoginBase loginBase) {
|
|
|
+ log.info("泰山-login");
|
|
|
HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
getVerifyHeader(httpHeaders);
|
|
|
|
|
|
Map<String, Object> tokenMap = taiShanCrawlerCacheComponent.getToken(loginBase.getUsername());
|
|
|
+ log.info("泰山-tokenMap参数的值：{}", JSON.toJSONString(tokenMap));
|
|
|
+
|
|
|
TaiShanCrawlerLoginRequest loginRequest = new TaiShanCrawlerLoginRequest(loginBase,tokenMap);
|
|
|
+ log.info("TaiShan-loginRequest参数的值：{}", JSON.toJSONString(loginRequest));
|
|
|
TaiShanCrawlerLoginResponse loginResponse = taiShanCrawlerRequestComponent.login(loginRequest, httpHeaders);
|
|
|
log.info("TaiShan-loginResponse参数的值：{}", JSON.toJSONString(loginResponse));
|
|
|
if(loginResponse.getCode().equals("200")){
|
|
|
String authorization = loginResponse.getResult().getIdToken();
|
|
|
+ log.info("TaiShan-Username参数的值：{}", JSON.toJSONString(loginBase.getUsername()));
|
|
|
+ log.info("TaiShan-authorization参数的值：{}", JSON.toJSONString(authorization));
|
|
|
taiShanCrawlerCacheComponent.cacheAuthorization(loginBase.getUsername(), authorization);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean detectLogin(DetectLoginRequest detectLoginRequest) {
|
|
|
+ log.info("泰山-detectLogin");
|
|
|
String username = detectLoginRequest.getUsername();
|
|
|
- String password = detectLoginRequest.getPassword();
|
|
|
- LoginBase loginBase = new LoginBase();
|
|
|
- loginBase.setUsername(username);
|
|
|
- loginBase.setPassword(password);
|
|
|
-
|
|
|
- HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
- getVerifyHeader(httpHeaders);
|
|
|
-
|
|
|
+ String token = null;
|
|
|
Map<String, Object> tokenMap = taiShanCrawlerCacheComponent.getToken(username);
|
|
|
- TaiShanCrawlerLoginRequest loginRequest = new TaiShanCrawlerLoginRequest(loginBase,tokenMap);
|
|
|
- TaiShanCrawlerLoginResponse loginResponse = taiShanCrawlerRequestComponent.login(loginRequest, httpHeaders);
|
|
|
- if(loginResponse.getCode().equals("200")){
|
|
|
- String authorization = loginResponse.getResult().getIdToken();
|
|
|
- taiShanCrawlerCacheComponent.cacheAuthorization(loginBase.getUsername(), authorization);
|
|
|
+ if(tokenMap !=null && !tokenMap.isEmpty()){
|
|
|
+ token = (String) tokenMap.get("token");
|
|
|
}
|
|
|
- return true;
|
|
|
+ return StringUtils.hasText(token);
|
|
|
+
|
|
|
+
|
|
|
+// log.info("TaiShan-detectLoginRequest参数的值：{}", JSON.toJSONString(detectLoginRequest));
|
|
|
+// String username = detectLoginRequest.getUsername();
|
|
|
+// String password = detectLoginRequest.getPassword();
|
|
|
+// LoginBase loginBase = new LoginBase();
|
|
|
+// loginBase.setUsername(username);
|
|
|
+// loginBase.setPassword(password);
|
|
|
+// log.info("TaiShan-loginBase参数的值：{}", JSON.toJSONString(loginBase));
|
|
|
+//
|
|
|
+// HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
+// getVerifyHeader(httpHeaders);
|
|
|
+//
|
|
|
+// sendCode(username, password);
|
|
|
+//
|
|
|
+// Map<String, Object> tokenMap = taiShanCrawlerCacheComponent.getToken(username);
|
|
|
+// log.info("TaiShan-tokenMap参数的值：{}", JSON.toJSONString(tokenMap));
|
|
|
+
|
|
|
+
|
|
|
+// TaiShanCrawlerLoginRequest loginRequest = new TaiShanCrawlerLoginRequest(loginBase,tokenMap);
|
|
|
+// TaiShanCrawlerLoginResponse loginResponse = taiShanCrawlerRequestComponent.login(loginRequest, httpHeaders);
|
|
|
+// log.info("TaiShan-loginResponse参数的值：{}", JSON.toJSONString(loginResponse));
|
|
|
+// if(loginResponse.getCode().equals("200")){
|
|
|
+// String authorization = loginResponse.getResult().getIdToken();
|
|
|
+// //缓存登录的信息
|
|
|
+// taiShanCrawlerCacheComponent.cacheAuthorization(loginBase.getUsername(), authorization);
|
|
|
+// }
|
|
|
+// return true;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
private void getVerifyHeader(HttpHeaders httpHeaders) {
|
|
|
httpHeaders.set(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
|
|
|
httpHeaders.set(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9");
|
|
|
@@ -174,7 +295,9 @@ public class TaiShanCrawlerQuoteProcessServiceImpl implements TaiShanCrawlerQuot
|
|
|
*/
|
|
|
@Override
|
|
|
public HttpHeaders getHeaders(String username, String comCode) {
|
|
|
- String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6MTUsImV4cCI6MTc4MTY4NzIzMn0.ldWz9TMY4AJ75VE0Bk1mkzAXPC9jJNMIWL82n0kGHrBwASgGvBxO3fe7orHbCIowt0athoRn1zA9m5ZNnO7olg";
|
|
|
+ //String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6MTUsImV4cCI6MTc4MTY4NzIzMn0.ldWz9TMY4AJ75VE0Bk1mkzAXPC9jJNMIWL82n0kGHrBwASgGvBxO3fe7orHbCIowt0athoRn1zA9m5ZNnO7olg";
|
|
|
+
|
|
|
+ String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6MTIsImV4cCI6MTc4MTk0MDMyMX0.rsR8yMmSsB5iOstJSToswargqTCFB5He37UydrlK_lKFsHVqtBL-EOAgls4YL4nKWvRtbSxxY6HZRczHFG0iRw";
|
|
|
HttpHeaders httpHeaders = new HttpHeaders();
|
|
|
|
|
|
httpHeaders.set("Accept", "application/json, text/plain, */*");
|
wangguoqiang