From a5f7e2089117dea12aa9aa4c391d48edbc7b8a89 Mon Sep 17 00:00:00 2001
From: yxz <2421405387@qq.com>
Date: Mon, 28 Apr 2025 18:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=A2=E8=B4=AD=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cpop-Jambox-Web/src/main/resources/application-dev.yml  | 4 ++--
 .../cpop/jambox/framework/enums/EasyLearnPayPayEnum.java    | 5 +++++
 .../Cpop-Oam-Web/src/main/resources/application-dev.yml     | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

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