diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index b8be076b..6d9b3c86 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -54,7 +54,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index 688a1602..3d702999 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 diff --git a/config/application.yml b/config/application.yml index 777ef5d8..3eed6f1c 100644 --- a/config/application.yml +++ b/config/application.yml @@ -29,9 +29,9 @@ spring: type: redis # Redis redis: - host: 192.168.31.100 - port: 30379 - password: lilishop + host: 127.0.0.1 + port: 6379 +# password: e4ea0caebfd2 lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 @@ -60,9 +60,9 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.31.100:30306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: lilishop + url: jdbc:mysql://82.156.121.2:23306/shop_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: wzj + password: A085F27A43B0 maxActive: 50 initialSize: 20 maxWait: 60000 @@ -256,18 +256,18 @@ lili: data: elasticsearch: cluster-name: elasticsearch - cluster-nodes: 192.168.31.100:30920 + cluster-nodes: 82.156.121.2:19200 index: number-of-replicas: 0 number-of-shards: 3 index-prefix: lili schema: http - # account: - # username: elastic - # password: LiLiShopES + account: + username: elastic + password: B5254c5953d logstash: - server: 192.168.31.100:30560 + server: 127.0.0.1:30560 rocketmq: promotion-topic: shop_lili_promotion_topic promotion-group: shop_lili_promotion_group @@ -288,7 +288,7 @@ lili: after-sale-topic: shop_lili_after_sale_topic after-sale-group: shop_lili_after_sale_group rocketmq: - name-server: 192.168.31.100:9876 + name-server: 127.0.0.1:9876 isVIPChannel: false producer: group: lili_group @@ -297,7 +297,7 @@ rocketmq: xxl: job: admin: - addresses: http://192.168.31.100:30001/xxl-job-admin + addresses: http://127.0.1:30001/xxl-job-admin executor: appname: xxl-job-executor-lilishop address: diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml index f3c3ed20..cb5cdfbe 100644 --- a/consumer/src/main/resources/application.yml +++ b/consumer/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 @@ -67,9 +67,9 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/wuzhongjie?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: lilishop + password: 123 maxActive: 20 initialSize: 5 maxWait: 60000 @@ -274,12 +274,12 @@ rocketmq: name-server: 127.0.0.1:9876 producer: group: lili_group - send-message-timeout: 30000 + send-message-timeout: 100000 xxl: job: admin: - addresses: http://127.0.0.1:9001/xxl-job-admin + addresses: http://127.0.0.1:30001/xxl-job-admin executor: appname: xxl-job-executor-lilishop address: diff --git a/im-api/src/main/resources/application.yml b/im-api/src/main/resources/application.yml index da5cd1a2..3cbd4e50 100644 --- a/im-api/src/main/resources/application.yml +++ b/im-api/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 @@ -64,9 +64,9 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/wuzhongjie?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: lilishop + password: 123 maxActive: 20 initialSize: 5 maxWait: 60000 @@ -259,7 +259,7 @@ lili: after-sale-topic: lili_after_sale_topic after-sale-group: lili_after_sale_group rocketmq: - name-server: 127.0.0.1:9876 + name-server: 82.156.121.2:9876 producer: group: lili_group send-message-timeout: 30000 @@ -267,7 +267,7 @@ rocketmq: xxl: job: admin: - addresses: http://127.0.0.1:9001/xxl-job-admin + addresses: http://82.156.121.2:9001/xxl-job-admin executor: appname: xxl-job-executor-lilishop address: diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml index fcb39e68..e64e448f 100644 --- a/manager-api/src/main/resources/application.yml +++ b/manager-api/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 diff --git a/seller-api/src/main/resources/application.yml b/seller-api/src/main/resources/application.yml index eb93aaa3..986da920 100644 --- a/seller-api/src/main/resources/application.yml +++ b/seller-api/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lilishop +# password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 diff --git a/xxl-job/application.properties b/xxl-job/application.properties index eae3a677..7f9abdd5 100644 --- a/xxl-job/application.properties +++ b/xxl-job/application.properties @@ -1,5 +1,5 @@ ### web -server.port=9001 +server.port=30001 server.servlet.context-path=/xxl-job-admin ### actuator @@ -23,9 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://192.168.0.106:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://localhost:3306/wuzhongjie?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai spring.datasource.username=root -spring.datasource.password=lilishop +spring.datasource.password=123 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ### datasource-pool @@ -35,8 +35,8 @@ spring.datasource.hikari.maximum-pool-size=30 spring.datasource.hikari.auto-commit=true spring.datasource.hikari.idle-timeout=30000 spring.datasource.hikari.pool-name=HikariCP -spring.datasource.hikari.max-lifetime=900000 -spring.datasource.hikari.connection-timeout=10000 +spring.datasource.hikari.max-lifetime=90000 +spring.datasource.hikari.connection-timeout=30000 spring.datasource.hikari.connection-test-query=SELECT 1 spring.datasource.hikari.validation-timeout=1000 diff --git a/xxl-job/xxl-job/xxl-job-admin.log.2025-02-22.zip b/xxl-job/xxl-job/xxl-job-admin.log.2025-02-22.zip new file mode 100644 index 00000000..c9520fb1 Binary files /dev/null and b/xxl-job/xxl-job/xxl-job-admin.log.2025-02-22.zip differ