fix

azkaban/adx_package_tag.job

+type=command
+retries=3
+command=sh -x adx_package_tag.sh
\ No newline at end of file

azkaban/adx_package_tag.sh

+#!/usr/sh
+
+check_await() {
+    while [[ true ]];
+    do
+        if hadoop fs -ls "$1" > /dev/null 2>&1
+        then
+            break
+        fi
+        sleep 300
+    done
+}
+
+today=${ScheduleTime:-$1}
+date=$(date +"%Y%m%d" -d "-1 day $today")
+date_path=$(date +%Y/%m/%d -d "-1 day $today")
+
+INPUT="s3://mob-emr-test/dataplatform/DataWareHouse/data/dwh/dim_adn_adx_package/${date_path}"
+
+check_await ${INPUT}/_SUCCESS
+root_dir=`pwd`
+
+if [[ ! -d "${root_dir}/adx_package/${date}" ]]; then
+  mkdir -p ${root_dir}/adx_package/${date}
+else
+  rm -rf ${root_dir}/adx_package/${date}
+  mkdir -p ${root_dir}/adx_package/${date}
+fi
+
+result="${root_dir}/adx_package/${date}/package.txt"
+
+hdfs dfs -text ${INPUT}/* >${result}
+if [[ $? -ne 0 ]]; then
+    exit 255
+fi
+
+java -jar -Dloader.main=com.mobvista.apptag.utils.GetPackageFromAdxFile apptag.jar ${result}
+
+if [[ $? -ne 0 ]]; then
+    exit 255
+fi
\ No newline at end of file

src/main/java/com/mobvista/apptag/utils/GetPackageFromAdxFile.java

+package com.mobvista.apptag.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @package: com.mobvista.apptag.utils
+ * @author: wangjf
+ * @date: 2019-07-17
+ * @time: 11:38
+ * @email: jinfeng.wang@mobvista.com
+ * @phone: 152-1062-7698
+ */
+public class GetPackageFromAdxFile {
+
+    public static void main(String[] args) {
+        try {
+            String filePath = "";
+            if (args.length == 1) {
+                filePath = args[0];
+            } else {
+                System.out.println("Please check input!");
+                System.exit(1);
+            }
+            Set<String> set = readTxtFileIntoStringSet(filePath);
+            System.out.println("packageNames.size ===>>> " + set.size());
+            //  MySqlUtil mySqlUtil = new MySqlUtil();
+            //  mySqlUtil.insert(set);
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+        }
+    }
+
+    public static Set<String> readTxtFileIntoStringSet(String filePath) {
+
+        Set<String> set = new HashSet<>();
+        try {
+            String encoding = "GBK";
+            File file = new File(filePath);
+            //  判断文件是否存在
+            if (file.isFile() && file.exists()) {
+                //  考虑到编码格式
+                InputStreamReader read = new InputStreamReader(
+                        new FileInputStream(file), encoding);
+                BufferedReader bufferedReader = new BufferedReader(read);
+                String lineTxt;
+                while ((lineTxt = bufferedReader.readLine()) != null) {
+                    String packageName = lineTxt;
+                    set.add(packageName);
+                }
+                bufferedReader.close();
+                read.close();
+            } else {
+                System.out.println("找不到指定的文件");
+            }
+        } catch (Exception e) {
+            System.out.println("读取文件内容出错");
+            e.printStackTrace();
+        }
+        return set;
+    }
+}

src/main/java/com/mobvista/apptag/utils/MySqlUtil.java

@@ -30,7 +30,7 @@ public class MySqlUtil {
                 Pattern iosPkgPtn = Pattern.compile("^\\d+$");
                 Pattern adrPkgPtn = Pattern.compile("^[0-9a-zA-Z\\.]+$");
                 if (iosPkgPtn.matcher(packageName).matches() || adrPkgPtn.matcher(packageName).matches()) {
-                    if (packageName.contains(".")) {
+                    if (adrPkgPtn.matcher(packageName).matches()) {
                         platform = "Android";
                     } else {
                         platform = "IOS";