diff --git a/Cpop-Jambox/Cpop-Jambox-Web/src/main/resources/application-dev.yml b/Cpop-Jambox/Cpop-Jambox-Web/src/main/resources/application-dev.yml index 6140f6a..4b18347 100644 --- a/Cpop-Jambox/Cpop-Jambox-Web/src/main/resources/application-dev.yml +++ b/Cpop-Jambox/Cpop-Jambox-Web/src/main/resources/application-dev.yml @@ -8,9 +8,9 @@ cpop: gateway: rsa-keypair: # 公钥文件 - publicKeyFile: E:\Cpop\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\publicKey + publicKeyFile: E:\Code_Project\Jambox_Project\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\publicKey # 公钥文件 - privateKeyFile: E:\Cpop\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\privateKey + privateKeyFile: E:\Code_Project\Jambox_Project\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\privateKey # DataSource Config spring: diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java index 424d987..85c927a 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/framework/enums/EasyLearnPayPayEnum.java @@ -30,6 +30,11 @@ public enum EasyLearnPayPayEnum { */ DIGITAL_CURRENCY("DigitalCurrency",3), + /** + * 团购 + */ + GROUP_BOOKING("GROUP_BOOKING",4), + /** * 预付 */ diff --git a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-dev.yml b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-dev.yml index 8db2430..9d2a32b 100644 --- a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-dev.yml +++ b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-dev.yml @@ -8,9 +8,9 @@ cpop: gateway: rsa-keypair: # 公钥文件 - publicKeyFile: E:\Cpop\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\publicKey + publicKeyFile: E:\Code_Project\Jambox_Project\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\publicKey # 公钥文件 - privateKeyFile: E:\Cpop\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\privateKey + privateKeyFile: E:\Code_Project\Jambox_Project\Cpop-Union\Cpop-Core\src\main\resources\static\keyPair\privateKey # DataSource Config spring: @@ -60,7 +60,7 @@ mybatis-flex: oam: url: jdbc:mysql://localhost:3306/cpop_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: Admin@123 + password: root jambox: url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/jambox_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true username: root