From 1f04d9770b4374ccf22b7f6c81a3e53ec37f7103 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Wed, 17 Apr 2024 09:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=85=BE=E8=AE=AF=E4=BA=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/application-prod.yml | 4 +- .../resources/config/application-prod.yml | 4 +- .../entity/dto/CallImportDTO.java | 2 +- .../java/com/baiye/timed/DecryptTask.java | 9 +++-- .../main/java/com/baiye/util/CSVFileUtil.java | 37 +++++++++++-------- .../resources/config/application-prod.yml | 4 +- .../src/main/resources/application-prod.yml | 4 +- 7 files changed, 37 insertions(+), 27 deletions(-) diff --git a/ad-platform-auth/src/main/resources/config/application-prod.yml b/ad-platform-auth/src/main/resources/config/application-prod.yml index ca19fc47..a54737e5 100644 --- a/ad-platform-auth/src/main/resources/config/application-prod.yml +++ b/ad-platform-auth/src/main/resources/config/application-prod.yml @@ -6,8 +6,8 @@ spring: connection-test-query: select 1 auto-commit: true #注意的是这个地方的定义需要用在DataSourceConfig.java里面使用，是因为在定义JobEventConfig.java的时候需要引入自定义dataSource - password: yuyou@RDS2020 - jdbc-url: jdbc:mysql://rm-bp1693kl5d490o5cn.mysql.rds.aliyuncs.com:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + password: baiye@TDB2024 + jdbc-url: jdbc:mysql://sh-cdb-ng5dv8mm.sql.tencentcdb.com:63955/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root redis: #数据库索引 diff --git a/ad-platform-gateway/src/main/resources/config/application-prod.yml b/ad-platform-gateway/src/main/resources/config/application-prod.yml index 562088bb..637b3880 100644 --- a/ad-platform-gateway/src/main/resources/config/application-prod.yml +++ b/ad-platform-gateway/src/main/resources/config/application-prod.yml @@ -7,10 +7,10 @@ spring: port: 6379 password: datasource: - url: jdbc:mysql://${MYSQL_HOST:rm-bp1693kl5d490o5cn.mysql.rds.aliyuncs.com}:${MYSQL_PORT:3306}/${MYSQL_DB:gateway}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://${MYSQL_HOST:sh-cdb-ng5dv8mm.sql.tencentcdb.com}:${MYSQL_PORT:63955}/${MYSQL_DB:gateway}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true driver-class-name: com.mysql.jdbc.Driver username: ${MYSQL_USER:root} - password: ${MYSQL_PASSWORD:yuyou@RDS2020} + password: ${MYSQL_PASSWORD:baiye@TDB2024} cloud: gateway: discovery: diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/CallImportDTO.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/CallImportDTO.java index 8881f3a4..1d918b3f 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/CallImportDTO.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/CallImportDTO.java @@ -49,7 +49,7 @@ public class CallImportDTO { private String variable; - private List variableList; + // private List variableList; } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DecryptTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DecryptTask.java index 35cfdefe..e4a7904a 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DecryptTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DecryptTask.java @@ -161,14 +161,17 @@ public class DecryptTask { try { List sendClientList = Lists.newArrayList(); list.forEach(str -> { - List variableList = Lists.newArrayList(); + /*List variableList = Lists.newArrayList(); CallImportDTO.Source client = new CallImportDTO.Source(); CallImportDTO.Variable variable = CallImportDTO.Variable.builder().field (str.getTag()).value(str.getTag()).build(); - variableList.add(variable); + variableList.add(variable); + client.setCellphone(str.getNid()); + client.setVariableList(variableList); + sendClientList.add(client);*/ + CallImportDTO.Source client = new CallImportDTO.Source(); client.setCellphone(str.getNid()); - client.setVariableList(variableList); sendClientList.add(client); }); dto.setClientList(sendClientList); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java index 7cb17072..c6d3796c 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java @@ -44,37 +44,44 @@ public class CSVFileUtil { } public static void main(String[] args) { - File file = new File("C:\\Users\\a\\Desktop\\jl-tztb1-xsxt2-010.csv"); List phoneList = Lists.newArrayList(); List tagStr = Lists.newArrayList(); CsvReader reader = CsvUtil.getReader(); + String tag = ""; + for (int i = 1; i < 3; i++) { + File file = new File("C:\\Users\\a\\Desktop\\a-" + i + ".csv"); + // 解析文件 + CsvData data = reader.read(file); + + CsvRow strings = data.getRows().get(DefaultNumberConstants.ZERO_NUMBER); + tag = strings.get(DefaultNumberConstants.ONE_NUMBER); + + // csv通配 + data.getRows().forEach(clue -> { + phoneList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER + ? clue.get(DefaultNumberConstants.ZERO_NUMBER) : clue.get(DefaultNumberConstants.TWO_NUMBER)); + //tagStr.add(tag); + }); + } + - // 解析文件 - CsvData data = reader.read(file); - CsvRow strings = data.getRows().get(DefaultNumberConstants.ZERO_NUMBER); - String tag = strings.get(DefaultNumberConstants.ONE_NUMBER); - // csv通配 - data.getRows().forEach(clue -> { - phoneList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER - ? clue.get(DefaultNumberConstants.TWO_NUMBER) : clue.get(DefaultNumberConstants.ZERO_NUMBER)); - tagStr.add(tag); - }); // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); - File csvFile = new File("C:\\Users\\a\\Desktop\\2023420-jl-tztb1-xsxt2-010.csv"); + File csvFile = new File("C:\\Users\\a\\Desktop\\ks-cdjjhmtykqmzbyxgs-0907-08l6.csv"); //导入HuTool中CSV工具包的CsvWriter类 //设置导出字符类型, CHARSET_UTF_8 CsvWriter writer = CsvUtil.getWriter(csvFile, CharsetUtil.CHARSET_UTF_8); for (int i = 0; i < phoneSets.size(); i++) { - String decrypt = AESUtils.decrypt(phoneSets.get(i), AdPlatFormConstants.AD_PLATFORM); + writer.writeLine(phoneSets.get(i)); + /* String decrypt = AESUtils.decrypt(phoneSets.get(i), AdPlatFormConstants.AD_PLATFORM); if (MobileUtil.checkPhone(decrypt)) { - writer.writeLine(decrypt); - } + + }*/ } writer.close(); } diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml index 67e09d0a..8e72cbab 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml @@ -17,9 +17,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-bp1693kl5d490o5cn.mysql.rds.aliyuncs.com:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://sh-cdb-ng5dv8mm.sql.tencentcdb.com:63955/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@TDB2024 # 初始连接数 initial-size: 10 # 最小连接数 diff --git a/ad-platform-services/ad-platform-source/src/main/resources/application-prod.yml b/ad-platform-services/ad-platform-source/src/main/resources/application-prod.yml index cf49ac31..9ca4e8cf 100644 --- a/ad-platform-services/ad-platform-source/src/main/resources/application-prod.yml +++ b/ad-platform-services/ad-platform-source/src/main/resources/application-prod.yml @@ -14,9 +14,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-bp1693kl5d490o5cn.mysql.rds.aliyuncs.com:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://sh-cdb-ng5dv8mm.sql.tencentcdb.com:63955/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@TDB2024 # 初始连接数 initial-size: 10 # 最小连接数