diff --git a/cdp-iaas/authorization-server/src/main/resources/config/application-prod.yml b/cdp-iaas/authorization-server/src/main/resources/config/application-prod.yml index e292ceb..14fc621 100644 --- a/cdp-iaas/authorization-server/src/main/resources/config/application-prod.yml +++ b/cdp-iaas/authorization-server/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/db_backstage?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + password: baiye@RDS2023. + jdbc-url: jdbc:mysql://172.16.69.134:3306/db_backstage?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root redis: #数据库索引 diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml index 63ef608..c11d22c 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml @@ -1,3 +1,5 @@ +server: + port: 8899 spring: redis: #数据库索引 diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application-prod.yml b/cdp-iaas/gateway-server/src/main/resources/config/application-prod.yml index cab59fa..3ae7cc6 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application-prod.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application-prod.yml @@ -1,4 +1,5 @@ - +server: + port: 80 spring: redis: #数据库索引 @@ -7,10 +8,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:172.16.69.134}:${MYSQL_PORT:3306}/${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@RDS2023.} cloud: gateway: discovery: diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application.yml b/cdp-iaas/gateway-server/src/main/resources/config/application.yml index 01f46f8..01dc4f2 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application.yml @@ -1,5 +1,4 @@ -server: - port: 80 + spring: application: name: @artifactId@ diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml index b068060..4210db7 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml @@ -12,9 +12,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/db_backstage?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://172.16.69.134:3306/db_backstage?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@RDS2023. # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml index 4326042..f9283c0 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml index 7c862a6..0f54ed9 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml @@ -29,4 +29,27 @@ + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.baiye.TiktokMemberApiApplication + ZIP + + + + + repackage + + + + + + + diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application-dev.yml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application-dev.yml index 1f6e7b8..7b2f9c5 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application-dev.yml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ spring: cloud: nacos: discovery: - server-addr: 8.130.96.163:8848 + server-addr: localhost:8848 redis: - database: 4 + database: 8 host: 8.130.96.163 timeout: 5000 datasource: diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application.yml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application.yml index 04b45d5..209bc12 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application.yml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/resources/config/application.yml @@ -11,7 +11,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: @@ -49,8 +49,8 @@ file: path: /home/eladmin/file/ picture: /home/eladmin/sop/picture/ windows: - path: H:\file\ - picture: H:\file\sop\picture\ + path: F:\file\ + picture: F:\file\sop\picture\ # 文件大小 /M maxSize: 100 pictureMaxSize: 5 diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPrivateLetterServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPrivateLetterServiceImpl.java index 9f1ca4c..d86a4a5 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPrivateLetterServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPrivateLetterServiceImpl.java @@ -2,7 +2,6 @@ package com.baiye.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baiye.core.constant.DateConstant; @@ -12,9 +11,7 @@ import com.baiye.dao.TiktokPrivateLetterMapper; import com.baiye.dto.MessageRecordDTO; import com.baiye.dto.SelectGroupDTO; import com.baiye.dto.TiktokMemberDTO; -import com.baiye.entity.TiktokEquipmentEntity; import com.baiye.entity.TiktokPrivateLetter; -import com.baiye.entity.TiktokVideoComment; import com.baiye.handler.TiktokSocketServerHandler; import com.baiye.mapstruct.MessageRecordMapStruct; import com.baiye.query.MessageRecordQuery; @@ -28,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import lombok.RequiredArgsConstructor; diff --git a/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/src/main/resources/config/application-prod.yml b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/src/main/resources/config/application-prod.yml index c176d58..6262bff 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/src/main/resources/config/application-prod.yml +++ b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/src/main/resources/config/application-prod.yml @@ -12,9 +12,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/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@RDS2023. # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application-prod.yml b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application-prod.yml index 44634ba..a479296 100644 --- a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application-prod.yml +++ b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application-prod.yml @@ -38,9 +38,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/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://172.16.69.134:3306/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@RDS2023. # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml b/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml index daa62de..949ed0d 100644 --- a/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml +++ b/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml @@ -3,14 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.7.1 - + cdp-tool-mq + com.baiye + 1.0.0-SNAPSHOT - com.baiye cpd-tool-mq-consumer - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT cpd-tool-mq-consumer cpd-tool-mq-consumer diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-prod.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-prod.yml index 5c071a1..c23f13f 100644 --- a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-prod.yml +++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-prod.yml @@ -35,9 +35,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/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://172.16.69.134:3306/db_wechat?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root - password: yuyou@RDS2020 + password: baiye@RDS2023. # 初始连接数 initial-size: 5 # 最小连接数