|
@@ -52,13 +52,17 @@ public class TsCrawlerLoginRequest implements Serializable {
|
|
|
@JsonProperty(value = "pointJson")
|
|
@JsonProperty(value = "pointJson")
|
|
|
private String pointJson;
|
|
private String pointJson;
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 归属信息
|
|
|
|
|
+ */
|
|
|
@JsonProperty(value = "other")
|
|
@JsonProperty(value = "other")
|
|
|
- private String other;
|
|
|
|
|
|
|
+ private LinkedHashMap<String, String> other;
|
|
|
|
|
|
|
|
public TsCrawlerLoginRequest(PtlAgreementAttributionDto attribution) {
|
|
public TsCrawlerLoginRequest(PtlAgreementAttributionDto attribution) {
|
|
|
this.username = attribution.getUsername();
|
|
this.username = attribution.getUsername();
|
|
|
this.pwd = attribution.getPassword();
|
|
this.pwd = attribution.getPassword();
|
|
|
- this.other = "";
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public TsCrawlerLoginRequest(PtlAgreementAttributionDto attribution, String sendcode,TsCrawlerLoginRequest request) {
|
|
public TsCrawlerLoginRequest(PtlAgreementAttributionDto attribution, String sendcode,TsCrawlerLoginRequest request) {
|
|
@@ -68,5 +72,8 @@ public class TsCrawlerLoginRequest implements Serializable {
|
|
|
this.token = request.getToken();
|
|
this.token = request.getToken();
|
|
|
this.secretKey = request.getSecretKey();
|
|
this.secretKey = request.getSecretKey();
|
|
|
this.pointJson = request.getPointJson();
|
|
this.pointJson = request.getPointJson();
|
|
|
|
|
+ if(CollUtil.isNotEmpty(attribution.getFields())){
|
|
|
|
|
+ this.other = attribution.getFields().stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getField(), v.getValue()), LinkedHashMap::putAll);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|