Fixing sensitive information

WeBankFinTech · Sep 6, 2020 · ec9f28e · ec9f28e
1 parent 1fd737d
commit ec9f28e
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 171 deletions.
diff --git a/azkaban-common/src/main/java/com/webank/wedatasphere/schedulis/common/utils/HttpUtils.java b/azkaban-common/src/main/java/com/webank/wedatasphere/schedulis/common/utils/HttpUtils.java
@@ -333,53 +333,6 @@ public static String getLinuxLocalIp(Logger log) {
 
   public static void main(String[] args) {
 
-    Map resultMap = new HashMap();
-    String maskUrl = "http://10.255.10.90:8087/api/v1/mask-status?";
-
-    RequestBody requestBody = new FormBody.Builder()
-        .add("targetDb", "bdp_test_ods_mask")
-        .add("targetTable", "ccpd_dump")
-        .add("partition", "dcn_id=UA0/type_id=6042/ip=127.0.0.1/ds=2015-04-06")
-        .build();
-
-    FormBody.Builder formBuilder = new FormBody.Builder();
-
-    Map<String, String> map = new HashMap<>();
-    map.put("targetDb", "bdp_test_ods_mask");
-    map.put("targetTable", "ccpd_dump");
-    //map.put("partition", "ds=20180925");
-    map.put("partition", "ds\\=20180925");
-
-    //String params = gson.toJson(map);
-    MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-    Iterator<String> iterator = map.keySet().iterator();
-    String key = "";
-    while(iterator.hasNext()){
-      key = iterator.next().toString();
-      formBuilder.add(key, map.get(key));
-    }
-
-    RequestBody requestBody2 = formBuilder.build();
-
-    Properties props = new Properties();
-//    props.put(DataChecker.MASK_APP_ID, "wtss");
-//    props.put(DataChecker.MASK_APP_TOKEN, "20a0ccdfc0");
-//
-//    Map<String, String> dataMap = HttpUtils.initSelectParams(props);
-//
-//    try {
-//      String result = HttpUtils.httpClientHandle(maskUrl, requestBody, dataMap);
-//      System.out.println(result);
-//      Map resulMap = HttpUtils.getReturnMap(result);
-//      if("200".equals(resulMap.get("code"))){
-//        System.out.println("数据查找成功变更datacheck状态");
-//      }
-//    } catch (Exception e) {
-//      e.printStackTrace();
-//      System.out.println(e.getMessage());
-//    }
-
   }
 
 

diff --git a/azkaban-common/src/test/java/azkaban/db/AzDBTestUtility.java b/azkaban-common/src/test/java/azkaban/db/AzDBTestUtility.java
@@ -56,7 +56,7 @@ public static class EmbeddedMysqlDataSource extends AzkabanDataSource {
 
     public EmbeddedMysqlDataSource() {
       super();
-      final String url = "jdbc:mysql://127.0.0.1:3306/wtss_qyh_test?useUnicode=true&characterEncoding=UTF-8";
+      final String url = "jdbc:mysql://10.255.0.76:3306/wtss_qyh_test?useUnicode=true&characterEncoding=UTF-8";
       setDriverClassName("com.mysql.jdbc.Driver");
       setUrl(url);
       setUsername("root");

diff --git a/azkaban-db/src/test/java/azkaban/db/AzDBTestUtility.java b/azkaban-db/src/test/java/azkaban/db/AzDBTestUtility.java
@@ -56,11 +56,11 @@ public static class EmbeddedMysqlDataSource extends AzkabanDataSource {
 
     public EmbeddedMysqlDataSource() {
       super();
-      final String url = "jdbc:mysql://127.0.0.1:8504/bdp_scheduler_01?useUnicode=true&characterEncoding=UTF-8";
+      final String url = "jdbc:mysql://localhost:port/bdp_scheduler_01?useUnicode=true&characterEncoding=UTF-8";
       setDriverClassName("com.mysql.jdbc.Driver");
       setUrl(url);
-      setUsername("bdpscheduler");
-      setPassword("bdp@2017");
+      setUsername("username");
+      setPassword("password");
     }
 
     @Override

diff --git a/...jobtype/src/main/java/com/webank/wedatasphere/schedulis/datacheck/test/DatacheckTest.java b/...jobtype/src/main/java/com/webank/wedatasphere/schedulis/datacheck/test/DatacheckTest.java
diff --git a/...an-jobtype/src/main/java/com/webank/wedatasphere/schedulis/jobtype/util/EventChecker.java b/...an-jobtype/src/main/java/com/webank/wedatasphere/schedulis/jobtype/util/EventChecker.java
@@ -225,9 +225,9 @@ public static void main(String[] args) {
 //		p.put("msg.body","msg.body");
 
 		p.put("msg.eventchecker.jdo.option.name","msg");
-		p.put("msg.eventchecker.jdo.option.url","jdbc:mysql://127.0.0.1:3306/wtss_qyh_test?useUnicode=true&characterEncoding=UTF-8");
-		p.put("msg.eventchecker.jdo.option.username","root");
-		p.put("msg.eventchecker.jdo.option.password","YmRwI3Jvb3RAMjAxOQ==");
+		p.put("msg.eventchecker.jdo.option.url","jdbc:mysql://locahost:port/wtss_qyh_test?useUnicode=true&characterEncoding=UTF-8");
+		p.put("msg.eventchecker.jdo.option.username","username");
+		p.put("msg.eventchecker.jdo.option.password","password");
 
 		EventChecker ec = new EventChecker("AA",p);
 		ec.run();

diff --git a/azkaban-jobtype/src/main/java/com/webank/wedatasphere/schedulis/jobtype/util/HttpUtils.java b/azkaban-jobtype/src/main/java/com/webank/wedatasphere/schedulis/jobtype/util/HttpUtils.java
@@ -203,7 +203,7 @@ public static void main(String[] args) {
     RequestBody requestBody = new FormBody.Builder()
         .add("targetDb", "bdp_test_ods_mask")
         .add("targetTable", "ccpd_dump")
-        .add("partition", "dcn_id=UA0/type_id=6042/ip=127.0.0.1/ds=2015-04-06")
+        .add("partition", "dcn_id=UA0/type_id=6042/ip=10.240.228.31/ds=2015-04-06")
         .build();
 
     FormBody.Builder formBuilder = new FormBody.Builder();

diff --git a/...ban-jobtype/src/test/java/azkaban/jobtype/TestHadoopJobUtilsFindApplicationIdFromLog.java b/...ban-jobtype/src/test/java/azkaban/jobtype/TestHadoopJobUtilsFindApplicationIdFromLog.java
@@ -102,14 +102,12 @@ public void testLogWithMultipleApplicationIdsAppearingMultipleTimes() throws IOE
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO See http://eat1-nertzwp02.grid.linkedin.com:8080/proxy/application_1440264346270_3044/ for details.\n");
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO Running job: job_1440264346270_3044\n");
     bw.write("28-08-2015 12:30:21 PDT Training_clickSelectFeatures INFO - INFO Closing idle connection Socket[addr=eat1-hcl5481.grid.linkedin.com/172.20.138.228,port=42492,localport=42382] to server eat1-hcl5481.grid.linkedin.com/172.20.138.228:42492\n");
-    bw.write("28-08-2015 12:30:37 PDT Training_clickSelectFeatures INFO - INFO Closing idle connection Socket[addr=eat1-nertznn01.grid.linkedin.com/127.0.01,port=9000,localport=30453] to server eat1-nertznn01.grid.linkedin.com/127.0.01:9000\n");
+    bw.write("28-08-2015 12:30:37 PDT Training_clickSelectFeatures INFO - INFO Closing idle connection Socket[addr=eat1-nertznn01.grid.linkedin.com/172.20.158.57,port=9000,localport=30453] to server eat1-nertznn01.grid.linkedin.com/172.20.158.57:9000\n");
     bw.write("28-08-2015 12:31:09 PDT Training_clickSelectFeatures INFO - INFO Job job_1440264346270_3044 running in uber mode : false\n");
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO Submitted application application_1440264346270_3088\n");
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO The url to track the job: http://eat1-nertzwp02.grid.linkedin.com:8080/proxy/application_1440264346270_3088/\n");
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO See http://eat1-nertzwp02.grid.linkedin.com:8080/proxy/application_1440264346270_3088/ for details.\n");
     bw.write("28-08-2015 12:29:38 PDT Training_clickSelectFeatures INFO - INFO Running job: job_1440264346270_3088\n");
-    bw.write("28-08-2015 12:30:21 PDT Training_clickSelectFeatures INFO - INFO Closing idle connection Socket[addr=eat1-hcl5481.grid.linkedin.com/172.20.138.228,port=42492,localport=42382] to server eat1-hcl5481.grid.linkedin.com/172.20.138.228:42492\n");
-    bw.write("28-08-2015 12:30:37 PDT Training_clickSelectFeatures INFO - INFO Closing idle connection Socket[addr=eat1-nertznn01.grid.linkedin.com/127.0.01,port=9000,localport=30453] to server eat1-nertznn01.grid.linkedin.com/127.0.01:9000\n");
     bw.write("28-08-2015 12:31:09 PDT Training_clickSelectFeatures INFO - INFO Job job_1440264346270_3088 running in uber mode : false\n");
     bw.close();
 

diff --git a/bin/construct/hdp_wtss_deploy_script.sql b/bin/construct/hdp_wtss_deploy_script.sql
@@ -1,5 +1,5 @@
 -- --------------------------------------------------------
--- 主机:                           127.0.0.1
+-- 主机:                           10.255.4.29
 -- 服务器版本:                        10.1.9-MariaDBV1.0R030D002-20161207-1922 - Source distribution
 -- 服务器操作系统:                      Linux
 -- HeidiSQL 版本:                  9.4.0.5125

diff --git a/bin/upgrade/upgrade.sh b/bin/upgrade/upgrade.sh
@@ -11,8 +11,8 @@ v_hosts=/data/change/client/hdp_client.hosts${UUID}
 echo >$v_hosts
 cat >$v_hosts <<EOF
 [all:vars]
-ansible_ssh_port=36000
-ansible_ssh_pass=Isd#APP@2020
+ansible_ssh_port=[#ssh_port]
+ansible_ssh_pass=[#ssh_password]
 
 [all_nodes]
 EOF

diff --git a/docs/schedulis_deploy_cn.md b/docs/schedulis_deploy_cn.md
@@ -388,7 +388,7 @@ sudo sh 2.hdp_wtss_deploy_web.sh 10.255.10.99:bdphdp02jobs05 1.0.0
 参数6：数据库密码(base64加密)
 
 例： （初始化部署1.5.0版本数据库）：
-sudo sh 3.hdp_wtss_deploy_script.sh 1.0.0 127.0.0.1 3306 wtssdb root 123456
+sudo sh 3.hdp_wtss_deploy_script.sh 1.0.0 10.255.0.76 3306 wtssdb root 123456
 ```
 
 #### 4. 进程启动