ソースを参照

对外代码修改

yumeng 4 年 前
コミット
96ad2c4ca8

+ 11 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -100,6 +100,7 @@ public class TestController {
         list.add(7421671L);
         list.add(7421646L);
         list.add(7421646L);
+        list.add(7607849L);
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
@@ -126,6 +127,7 @@ public class TestController {
         list.add(7421671L);
         list.add(7421646L);
         list.add(7421646L);
+        list.add(7607849L);
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
@@ -282,6 +284,7 @@ public class TestController {
         list.add(7421671L);
         list.add(7421646L);
         list.add(7421646L);
+        list.add(7607849L);
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
@@ -294,12 +297,12 @@ public class TestController {
                     QueryWrapper<KuaiShouCreative> creativeQueryWrapper = new QueryWrapper<>();
                     creativeQueryWrapper.eq("account_id", accountId);
                     creativeQueryWrapper.eq("campaign_id", campaign.getCampaignId());
-                    creativeQueryWrapper.notLike("click_track_url", "&ua=__UA__&oaid=__OAID__");
+               //     creativeQueryWrapper.notLike("click_track_url", "&ua=__UA__&oaid=__OAID__");
                     List<KuaiShouCreative> creativeList = creativeService.list(creativeQueryWrapper);
                     for (KuaiShouCreative creative : creativeList) {
-                        /*executorService.submit(new Runnable() {
+                        executorService.submit(new Runnable() {
                             @Override
-                            public void run() {*/
+                            public void run() {
                         try {
                             JSONObject json = new JSONObject();
                             json.put("creativeId", creative.getCreativeId());
@@ -315,10 +318,10 @@ public class TestController {
                             }
                             if (b.contains("&pass_through")) {
                                 String[] split = b.split("&pass_through");
-                                a = split[0] + "&ua=__UA__&oaid=__OAID__" + "&pass_through" + split[1];
+                                a = split[0] + "&csite=__CSITE__" + "&pass_through" + split[1];
 
                             } else {
-                                a = b + "&ua=__UA__&oaid=__OAID__";
+                                a = b + "&csite=__CSITE__";
                             }
                             if (creative.getCreativeMaterialType() == 1) {
                                 json.put("clickTrackUrl", a);
@@ -332,8 +335,8 @@ public class TestController {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-                            /*}
-                        });*/
+                            }
+                        });
                     }
                 }
             }
@@ -358,6 +361,7 @@ public class TestController {
         list.add(7421671L);
         list.add(7421646L);
         list.add(7421646L);
+        list.add(7607849L);
         for (int i = 0; i < list.size(); i++) {
             Long accountId = list.get(i);
             CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -94,9 +94,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://129.28.197.250:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
-          password: test@20190531
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -107,7 +107,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 129.28.150.229
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreativeServiceImpl.java

@@ -128,15 +128,15 @@ public class KuaiShouCreativeServiceImpl extends ServiceImpl<KuaiShouCreativeMap
             String a = "";
 
             if (clickTrackUrl.contains("&pass_through")) {
-                if (clickTrackUrl.contains("&ua=__UA__&oaid=__OAID__")) {
+                if (clickTrackUrl.contains("&csite=__CSITE__")) {
                     continue;
                 } else {
                     String[] split = clickTrackUrl.split("&pass_through");
-                    a = split[0] + "&ua=__UA__&oaid=__OAID__" + "&pass_through" + split[1];
+                    a = split[0] + "&csite=__CSITE__" + "&pass_through" + split[1];
                 }
 
             } else {
-                a = clickTrackUrl + "&ua=__UA__&oaid=__OAID__";
+                a = clickTrackUrl + "&csite=__CSITE__";
             }
 
             param1.put("click_url", a);