diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 638ac33..12c9b81 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,11 +1,8 @@ spring: datasource: -# url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false -# username: root -# password: mysqlroot@123 - url: jdbc:mysql://101.37.12.135:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true - username: fycashier - password: Twc6MrzzjBiWSsjh + url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true + username: cashier + password: Cashier@1@ driver-class-name: com.mysql.cj.jdbc.Driver initialSize: 5 minIdle: 5 diff --git a/src/main/resources/application-dev2.yml b/src/main/resources/application-pre.yml similarity index 79% rename from src/main/resources/application-dev2.yml rename to src/main/resources/application-pre.yml index c4924e0..e2140ec 100644 --- a/src/main/resources/application-dev2.yml +++ b/src/main/resources/application-pre.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false - username: root - password: mysqlroot@123 + url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true + username: cashier + password: Cashier@1@ driver-class-name: com.mysql.cj.jdbc.Driver initialSize: 5 minIdle: 5 @@ -15,7 +15,7 @@ spring: # redis数据库索引(默认为0),我们使用索引为3的数据库,避免和其他数据库冲突 database: 0 # redis服务器地址(默认为localhost) - host: 101.37.12.135 + host: localhost # redis端口(默认为6379) port: 6379 # redis访问密码(默认为空) @@ -33,12 +33,11 @@ spring: main: allow-circular-references: true rabbitmq: - host: 101.37.12.135 + host: localhost port: 5672 username: admin password: Czg666888 - mybatis: configuration: map-underscore-to-camel-case: true @@ -55,9 +54,12 @@ thirdPay: callFSTBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyfstCallBack songOrderBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/songOrderCallBack server: - port: 9889 -prod: devyhq -queue: cart_queue_putdevyhq + port: 9888 +prod: dev1 +queue: cart_queue_putdev1 +subscribe: + message: + miniprogramState: trial diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml deleted file mode 100644 index 891e93b..0000000 --- a/src/main/resources/application-test.yml +++ /dev/null @@ -1,53 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false - username: root - password: mysqlroot@123 - driver-class-name: com.mysql.cj.jdbc.Driver - initialSize: 5 - minIdle: 5 - maxActive: 20 - maxWait: 60000 - logging: - level: - com.chaozhanggui.system.openness: info - redis: - # redis数据库索引(默认为0),我们使用索引为3的数据库,避免和其他数据库冲突 - database: 0 - # redis服务器地址(默认为localhost) - host: 101.37.12.135 - # redis端口(默认为6379) - port: 6379 - # redis访问密码(默认为空) - password: 111111 - # redis连接超时时间(单位为毫秒) - timeout: 1000 - block-when-exhausted: true - # redis连接池配置 - jedis: - pool: - max-active: 8 - max-idle: 1024 - min-idle: 0 - max-wait: -1 - main: - allow-circular-references: true - rabbitmq: - host: 101.37.12.135 - port: 5672 - username: admin - password: Czg666888 - -mybatis: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath:mapper/*.xml -ysk: - url: https://gatewaytestapi.sxczgkj.cn/gate-service/ - callBackurl: https://cashierapplet.sxczgkj.cn/cashierService/notify/notifyCallBack - callBackGroupurl: https://cashierapplet.sxczgkj.cn/cashierService/notify/notifyCallBackGroup - callBackIn: https://cashierapplet.sxczgkj.cn/cashierService/notify/memberInCallBack - default: 18710449883 - -