数据源修改

pom.xml

@@ -216,51 +216,46 @@
                 <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
                 <!--//office-->
                 <default.datasource.url>
-                    jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
                 </default.datasource.url>
                 <default.datasource.username>trackingio</default.datasource.username>
                 <default.datasource.password>trackingio</default.datasource.password>
                 <tkio.url>
-                    jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/trackingio?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/trackingio?characterEncoding=utf-8
                 </tkio.url>
                 <tkio.username>trackingio</tkio.username>
                 <tkio.password>trackingio</tkio.password>
 
                 <office.url>
-                    jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8
                 </office.url>
                 <office.username>office</office.username>
                 <office.password>office</office.password>
 
                 <track.url>
-                    jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8
                 </track.url>
                 <track.username>admin</track.username>
                 <track.password>admin!@#456</track.password>
 
                 <dmp.url>
-                    jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
                 </dmp.url>
                 <dmp.username>trackingio</dmp.username>
                 <dmp.password>trackingio</dmp.password>
 
                 <io.url>
-                    jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8
                 </io.url>
                 <io.username>reyun</io.username>
                 <io.password>Reyun123</io.password>
 
                 <etl.url>
-                    jdbc:mysql://etl.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/tkio?characterEncoding=utf-8
+                    jdbc:mysql://sss-reyun-contract.crcf8yi9cse9.rds.cn-north-1.amazonaws.com.cn:3306/tkio?characterEncoding=utf-8
                 </etl.url>
                 <etl.username>trackingio_rpt</etl.username>
                 <etl.password>trackingio_rpt</etl.password>
 
-                <qcloudatasource.url>
-                    jdbc:mysql://172.28.16.22:3306/trackingio?characterEncoding=utf-8
-                </qcloudatasource.url>
-                <qcloudatasource.username>reyun</qcloudatasource.username>
-                <qcloudatasource.password>Reyun123</qcloudatasource.password>
 
                 <mail.host>smtp.263.net</mail.host>
                 <mail.username>manager@reyun.com</mail.username>
@@ -272,7 +267,7 @@
                 <!-- 单位是分钟-->
                 <mail.valid_time>3</mail.valid_time>
 
-                <report.url>http://internal-report-api-976419027.cn-north-1.elb.amazonaws.com.cn</report.url>
+                <report.url>https://new.trackingio.com</report.url>
                 <import.temp.url>http://172.31.25.137:9001</import.temp.url>
                 <adi.url>http://39.104.94.46:8080,http://129.226.187.229:8080</adi.url>
                 <adi.account.check>http://39.104.65.219</adi.account.check>
@@ -281,14 +276,14 @@
                 <redis.ip.requesttimes>5</redis.ip.requesttimes>
                 <redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes>
 
-                <redis.surl.host>trackingio-web.nr7fi4.ng.0001.cnn1.cache.amazonaws.com.cn</redis.surl.host>
+                <redis.surl.host>sss-reyun-contract-v2-ro.r9ckzu.ng.0001.cnn1.cache.amazonaws.com.cn</redis.surl.host>
                 <redis.surl.port>6379</redis.surl.port>
 
-                <redis.event.host>trackingio-web.nr7fi4.ng.0001.cnn1.cache.amazonaws.com.cn</redis.event.host>
+                <redis.event.host>sss-reyun-contract-v2-ro.r9ckzu.ng.0001.cnn1.cache.amazonaws.com.cn</redis.event.host>
                 <redis.event.port>6379</redis.event.port>
                 <redis.event.database>13</redis.event.database>
                 <!--Redis setting//end-->
-
+                <!--大后台服务器-->
                 <downhost>http://172.31.25.137:9001</downhost>
                 <ddb.accesskey>AKIA3XXNRTS2KXU632MD</ddb.accesskey>
                 <ddb.secretkey>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</ddb.secretkey>

src/main/java/common/service/impl/AppServiceImpl.java

@@ -172,7 +172,7 @@ public class AppServiceImpl implements AppService
 
 
         Map<String, String> conditions = new HashedMap();
-        String url = Constant.reportUrl + "/api/dmp/newdevicebypkgname/test";
+        String url = Constant.reportUrl + "/api/tkio/report/dmp/newdevicebypkgname/test/fd7ee4f73ea9d9619471aacc2ced1357";
         conditions.put("datatype", "list");
         conditions.put("startdate", startDate);
         conditions.put("enddate", endDate);

src/main/java/common/task/SyncAppDataTask.java

@@ -288,7 +288,7 @@ public class SyncAppDataTask
 
     public List<String> findReyunPkgList() {
         Map<String, String> conditions = new HashedMap();
-        String url = Constant.reportUrl + "/api/manager/bysql";
+        String url = Constant.reportUrl + "/api/tkio/report/manager/bysql/fd7ee4f73ea9d9619471aacc2ced1357";
         String sql = "select distinct pkgname from tkio.tkio_app_pkgname where pkgname!='NULL'";
         conditions.put("sql", sql);
         conditions.put("dbtype", "mysql");
@@ -382,4 +382,23 @@ public class SyncAppDataTask
         SyncAppDataTask task = new SyncAppDataTask();
         task.syncAppData();
     }*/
+
+    public static void main(String[] args) {
+        Map<String, String> conditions = new HashedMap();
+        String url = "http://localhost:8091/api/tkio/report/manager/bysql";
+        String sql = "select distinct pkgname from tkio.tkio_app_pkgname where pkgname!='NULL'";
+        conditions.put("sql", sql);
+        conditions.put("dbtype", "mysql");
+        conditions.put("datatype", "list");
+        conditions.put("reportname", "pkgname_list");
+        String responseJson = HttpClientUtil.doHttpPostRequest(url, "manager", conditions);
+
+        JSONObject object = JSONObject.fromObject(responseJson);
+        JSONArray array = object.getJSONArray("val");
+        List<String> pkgName = new ArrayList<>();
+        for (int i=0; i<array.size(); i++) {
+            JSONObject o = array.getJSONObject(i);
+            pkgName.add(o.getString("pkgname"));
+        }
+    }
 }

src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java

@@ -221,7 +221,7 @@ public class AccountFlowRestrictServiceImpl implements AccountFlowRestrictServic
         conditions.put("enddate", pastDate);
         conditions.put("datatype", "list");
         conditions.put("iscache", "0");
-        String url = Constant.reportUrl + "/api/trackingio/" + reportName + "/" + appId;
+        String url = Constant.reportUrl + "/api/tkio/report/trackingio/" + reportName + "/" + appId+"/fd7ee4f73ea9d9619471aacc2ced1357";
         String responseJson = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions);
         //System.out.println(reportName + "===========================" + responseJson);
         HashMap<String, String> resultValMap = new HashMap<>();

src/main/java/tkio/service/impl/TkioAccountServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.*;
 public class TkioAccountServiceImpl implements TkioAccountService {
     private static final Logger logger = LoggerFactory.getLogger(TkioAccountServiceImpl.class);
     //查询URI
-    private final static String URI_REPORT_BY_SQL = "/api/trackingio/bysql";
+    private final static String URI_REPORT_BY_SQL = "/api/tkio/report/trackingio/bysql";
 
     @Autowired
     Account4WebRepository account4WebRepository;

src/main/java/userio/service/impl/IOAccountServiceImpl.java

@@ -37,7 +37,7 @@ import java.util.*;
 public class IOAccountServiceImpl implements IOAccountService {
 
     //查询URI
-    private final static String URI_REPORT_BY_SQL = "/api/trackingio/bysql";
+    private final static String URI_REPORT_BY_SQL = "/tkio/report/trackingio/bysql/fd7ee4f73ea9d9619471aacc2ced1357";
 
     @Autowired
     IOAccount4WebRepository account4WebRepository;