From 0a7da333b22eb31a8991a7c1eef0adae73720710 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Tue, 18 Jul 2023 15:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=94=B6=E9=93=B6=E5=91=97?= =?UTF-8?q?=E5=AD=97=E6=A0=B7=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=88=9B=E5=AE=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=8A=B6=E6=80=81,=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=97=B6=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA,=E5=88=86=E4=BA=AB=E6=B3=A8=E5=86=8C=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=AE=97=E6=B3=95=E5=88=97=E8=A1=A8,?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A8=E5=B9=BF=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 22 +++++++++---------- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../resources/config/application-common.yml | 2 +- .../src/main/resources/mapper/Cash-sqlmap.xml | 2 +- .../src/main/resources/application-dev.yml | 22 ++++++++++++------- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../platform/bsj/conn/domain/CodeEnum.java | 4 ++-- .../platform/cash/impl/CashServiceImpl.java | 8 +++---- .../src/main/resources/application-dev.yml | 15 ++++++++----- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 10 ++++----- 13 files changed, 53 insertions(+), 42 deletions(-) diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml index 125dd41..4f0a1a7 100644 --- a/pluss-api-page/src/main/resources/application-dev.yml +++ b/pluss-api-page/src/main/resources/application-dev.yml @@ -1,17 +1,17 @@ spring: +# datasource: +# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: chaozhanggui +# password: CZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver datasource: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 - username: chaozhanggui - password: CZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: prodCZGmysqlroot@123 + driver-class-name: com.mysql.jdbc.Driver # datasource: -# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 -# username: root -# password: prodCZGmysqlroot@123 -# driver-class-name: com.mysql.jdbc.Driver -# datasource: -# url: jdbc:mysql://60.205.224.68:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 -# username: root +# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: ysk_test # password: CZGmysqlroot@123 # driver-class-name: com.mysql.jdbc.Driver parameter: diff --git a/pluss-api-page/src/main/resources/application-prod.yml b/pluss-api-page/src/main/resources/application-prod.yml index 4c3f665..97ecbbd 100644 --- a/pluss-api-page/src/main/resources/application-prod.yml +++ b/pluss-api-page/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root password: prodCZGmysqlroot@123 driver-class-name: com.mysql.jdbc.Driver diff --git a/pluss-api-page/src/main/resources/application.yml b/pluss-api-page/src/main/resources/application.yml index d3d8316..549411a 100644 --- a/pluss-api-page/src/main/resources/application.yml +++ b/pluss-api-page/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: profiles: ### 将一些固定的配置放到下级文件夹下的yml文件中 include: common, ryx, ys - active: test + active: dev mvc: view: prefix: /WEB-INF/jsp/ diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index 8af68ec..d7fbb7d 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -87,7 +87,7 @@ spring: username: admin password: admin host: 127.0.0.1 - port: 5672 + port: 5673 parameter: diff --git a/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml index e65d108..de5b3ab 100644 --- a/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml +++ b/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml @@ -220,7 +220,6 @@ diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml index 3ecf79a..6bc811b 100644 --- a/pluss-manage-page/src/main/resources/application-dev.yml +++ b/pluss-manage-page/src/main/resources/application-dev.yml @@ -1,19 +1,25 @@ spring: - datasource: - druid: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true - username: root - password: CZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver +# datasource: +# druid: +# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true +# username: root +# password: CZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver # datasource: # druid: # url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 # username: root # password: prodCZGmysqlroot@123 # driver-class-name: com.mysql.jdbc.Driver +# #新 + datasource: + url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: prodCZGmysqlroot@123 + driver-class-name: com.mysql.jdbc.Driver # datasource: -# url: jdbc:mysql://60.205.224.68:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 -# username: root +# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: ysk_test # password: CZGmysqlroot@123 # driver-class-name: com.mysql.jdbc.Driver logging: diff --git a/pluss-manage-page/src/main/resources/application-prod.yml b/pluss-manage-page/src/main/resources/application-prod.yml index 9ad70bd..6909e80 100644 --- a/pluss-manage-page/src/main/resources/application-prod.yml +++ b/pluss-manage-page/src/main/resources/application-prod.yml @@ -7,7 +7,7 @@ spring: # driver-class-name: com.mysql.jdbc.Driver datasource: druid: - url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root password: prodCZGmysqlroot@123 driver-class-name: com.mysql.jdbc.Driver diff --git a/pluss-manage-page/src/main/resources/application.yml b/pluss-manage-page/src/main/resources/application.yml index ee5dd00..7ab1667 100644 --- a/pluss-manage-page/src/main/resources/application.yml +++ b/pluss-manage-page/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: profiles: include: common, ryx, ys - active: test + active: prod servlet: multipart: max-file-size: 100MB diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bsj/conn/domain/CodeEnum.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bsj/conn/domain/CodeEnum.java index b35674e..005894a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/bsj/conn/domain/CodeEnum.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bsj/conn/domain/CodeEnum.java @@ -26,8 +26,8 @@ public enum CodeEnum { ORDER_REFUND_ERROR("2002", "订单退款异常"), - PASSWORD_NOT_INIT("2011", "安全密码未初始化，请前往收银呗APP进行初始化"), - PASSWORD_ERROR("2021", "安全密码错误，若忘记密码，可前往收银呗APP进行重置"), + PASSWORD_NOT_INIT("2011", "安全密码未初始化，请前往银收客APP进行初始化"), + PASSWORD_ERROR("2021", "安全密码错误，若忘记密码，可前往银收客APP进行重置"), ; private final String val; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java index 40e6e24..fcac358 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java @@ -279,11 +279,11 @@ public class CashServiceImpl extends ServiceImpl implements Ca throw new MsgException("可提现金额不足！"); } - cash.setRate(8); - cash.setBaseServiceCharge(BigDecimal.valueOf(3)); - cash.setRatioCharge(cash.getCashAmt().multiply(BigDecimal.valueOf(0.08)).setScale(2, RoundingMode.HALF_EVEN)); + cash.setRate(10); + cash.setBaseServiceCharge(BigDecimal.ZERO); + cash.setRatioCharge(new BigDecimal("0.1")); cash.setVirTotalCharge(cash.getBaseServiceCharge().add(cash.getRatioCharge())); - cash.setVirRealCashAmt(cash.getCashAmt().subtract(cash.getVirTotalCharge()).setScale(2, RoundingMode.HALF_EVEN)); + cash.setVirRealCashAmt(cash.getCashAmt().subtract(cash.getCashAmt().multiply(new BigDecimal("0.1"))).setScale(2, RoundingMode.HALF_EVEN)); return cash; } diff --git a/pluss-wap-page/src/main/resources/application-dev.yml b/pluss-wap-page/src/main/resources/application-dev.yml index 57a01be..7843022 100644 --- a/pluss-wap-page/src/main/resources/application-dev.yml +++ b/pluss-wap-page/src/main/resources/application-dev.yml @@ -1,7 +1,12 @@ spring: +# datasource: +# druid: +# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 +# username: ysk_test +# password: CZGmysqlroot@123 +# driver-class-name: com.mysql.jdbc.Driver datasource: - druid: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: CZGmysqlroot@123 - driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: prodCZGmysqlroot@123 + driver-class-name: com.mysql.jdbc.Driver \ No newline at end of file diff --git a/pluss-wap-page/src/main/resources/application-prod.yml b/pluss-wap-page/src/main/resources/application-prod.yml index 3589b4c..191ac7e 100644 --- a/pluss-wap-page/src/main/resources/application-prod.yml +++ b/pluss-wap-page/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: datasource: druid: - url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root password: prodCZGmysqlroot@123 driver-class-name: com.mysql.jdbc.Driver diff --git a/pluss-wap-page/src/main/resources/application.yml b/pluss-wap-page/src/main/resources/application.yml index 88a2b23..c7bd1f8 100644 --- a/pluss-wap-page/src/main/resources/application.yml +++ b/pluss-wap-page/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: allow-bean-definition-overriding: true profiles: include: common, ryx, ys - active: test + active: prod datasource: url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 username: root @@ -30,10 +30,10 @@ spring: resources: static-locations: classpath:/static rabbitmq: - username: - password: - host: - port: 5672 + username: admin + password: admin + host: 127.0.0.1 + port: 5673 jpush: environment: