代码抽取

eagleEye-flink_kafka/src/main/java/com/flink/achieve/doris/CollectLogAchi.java

@@ -112,7 +112,7 @@ public class CollectLogAchi extends SourceCommonBase implements Serializable{
                     row.setField(3, StringData.fromString(deviceIdInfo==null ? null : deviceIdInfo.getDeviceIdV1()));     // device_id_v1
                     row.setField(4, StringData.fromString(log.getUid()));              // uid
                     row.setField(5, StringData.fromString(deviceIdInfo==null ? null : deviceIdInfo.getIdfv()));             // idfv
-                    row.setField(6, StringData.fromString(log.getAppKey()));          // app_key
+                    row.setField(6, StringData.fromString(deviceIdInfo.getAppKey()));          // app_key
                     row.setField(7, StringData.fromString(log.getAppType()));                    // app_type
                     row.setField(8, StringData.fromString(other_info));       // other_info
                     row.setField(9, StringData.fromString(device_info));      // device_info

eagleEye-flink_kafka/src/main/java/com/flink/enums/TopicTypeEnum.java

@@ -25,6 +25,7 @@ public enum TopicTypeEnum {
 	ODS_EVENT_IP_CONVERT("ods_event_ip_convert","odsEventIpConvert"),
 	ODS_USER_INVITATION("ods_user_invitation","odsUserInvitation"),
 	SIMI_USER_LIST_TOPIC("simi_user_list","simiUserList"),
+	ABROAD_SIMI_USER_LIST_TOPIC("abroad_simi_user_list","abroadSimiUserList"),
 	OPEN_SIMI_API("ods_open_simi_api","odsOpenSimiApi"),
 	;
 	

eagleEye-flink_kafka/src/main/java/com/flink/processor/function/GenDeviceIdProcessor.java

@@ -21,7 +21,7 @@ import com.flink.vo.ios.IosEnvInfo;
 * 类说明 
 */
 public class GenDeviceIdProcessor {
-
+	
 	public static DeviceIdInfo genDeviceId(String appType,String appKey,String other_info,String device_info,String env_info) {
 		DeviceIdInfo deviceIdInfo = new DeviceIdInfo();
 		String deviceId = null;
@@ -47,7 +47,7 @@ public class GenDeviceIdProcessor {
 		
     	if(StringUtils.equals(appType, AppTypeEnum.ANDROID.getCode())) {
     		deviceIdV1 = deviceId;
-        	if(StringUtils.isEmpty(appKey) || StringUtils.equals(appKey, "C7jias27jias2")) {
+        	if(StringUtils.isEmpty(appKey) || StringUtils.isEmpty(appKey.trim()) || StringUtils.equals(appKey, "C7jias27jias2")) {
         		appKey = "8ooOvXJo276";
         	}
         }else if(StringUtils.equals(appType, AppTypeEnum.IOS.getCode())) {
@@ -57,6 +57,9 @@ public class GenDeviceIdProcessor {
         }
     	deviceIdInfo.setDeviceIdV1(deviceIdV1);
     	deviceIdInfo.setIdfv(idfv);
+    	deviceIdInfo.setAppKey(appKey);
 		return deviceIdInfo;
 	}
+	
+	
 }

eagleEye-flink_kafka/src/main/java/com/flink/processor/impl/DeviceIdLatestProcessor.java

@@ -28,7 +28,9 @@ public class DeviceIdLatestProcessor implements JobProcessor{
 	private static List<KafkaTopic> createTopicList() {
 	    return Arrays.stream(new TopicTypeEnum[]{
 	            TopicTypeEnum.ODS_NEW_COLLECT_LOG,
-	            TopicTypeEnum.SIMI_USER_LIST_TOPIC
+	            TopicTypeEnum.SIMI_USER_LIST_TOPIC,
+	            TopicTypeEnum.ABROAD_SIMI_USER_LIST_TOPIC,
+	            
 	    }).map(TopicTypeEnum::createKafkaTopic)
 	     .collect(Collectors.toList());
 	}

eagleEye-flink_kafka/src/main/java/com/flink/vo/DeviceIdInfo.java

@@ -20,4 +20,5 @@ public class DeviceIdInfo implements Serializable{
 	private static final long serialVersionUID = 1L;
 	private String idfv;
 	private String deviceIdV1;
+	private String appKey;
 }

eagleEye-flink_kafka/src/main/resources/application.properties

@@ -15,4 +15,16 @@ hdfs.url=hdfs://10.0.0.105:8020/user/ck/
 
 simiUserInfo.url= https://admin.dw20.net/prod-api/
 simiUserInfo.authorization= KhhZAQKaZkfd7p55
-simiUserInfo.key= niiKpP4SXce2zCHZ
\ No newline at end of file
+simiUserInfo.key= niiKpP4SXce2zCHZ
+
+simi.android.appKe= ptyzTPaV207
+simi.ios.appKey= giHQ1YLp925
+
+abroadSimi.android.appKey= lOxLJYzx658
+abroadSimi.ios.appKey= lcALJYzx932
+
+chainless.android.appKey= 8ooOvXJo276
+chainless.ios.appKey= 9JQ3A7GA420
+
+abroadChainless.android.appKey= 672OvXJo236
+abroadChainless.ios.appKey= KJa3A7GA410
\ No newline at end of file