diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java index 951992a..d7f3bcd 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopUserServiceImpl.java @@ -60,10 +60,7 @@ public class CurShopUserServiceImpl extends ServiceImpl page = oldUserInfoService.page(PageUtils.buildPage(pageIndex, 5000L), queryWrapper); + Page page = oldUserInfoService.page(PageUtils.buildPage(pageIndex, 5000L)); if (page.getRecords().isEmpty()) { return; diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index dc5703c..bc066ff 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,36 +1,12 @@ - -spring: +mybatis-flex: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 - username: cashier - password: Cashier@1@ + ds1: + jdbc-url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com/czg_cashier?useUnicode=true&characterEncoding=utf-8 + username: root + password: Czg666888 + ds2: + jdbc-url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com/fycashier?useUnicode=true&characterEncoding=utf-8 + username: root + password: Czg666888 - data: - redis: - host: 121.40.109.122 - port: 6379 - password: chaozg123 - timeout: 1000 - database: 2 - - cloud: - nacos: - discovery: - server-addr: 121.40.109.122:8848 - namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca - -dubbo: - application: - name: account-server - qos-port: 22221 - qos-enable: true - registry: - address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-test - namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca - protocol: - port: 9101 - threads: 20 - threadpool: fixed diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b2792b6..abe4570 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: application: name: merge-data-server profiles: - active: dev + active: prod logging: config: classpath:logback.xml