From e013e819f7d544c5c8c59e69ce42c3d10e2215e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applet/src/main/resources/application.yml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/applet/src/main/resources/application.yml b/applet/src/main/resources/application.yml
index ab54239..0ed5237 100644
--- a/applet/src/main/resources/application.yml
+++ b/applet/src/main/resources/application.yml
@@ -13,7 +13,8 @@
       max-request-size: 500MB
       resolve-lazily: true #设置为懒加载,不然依然会捕获不到异常
   profiles:
-    active: prod
+    active: dev
+  #    active: prod
   main:
     allow-bean-definition-overriding: true
 #  rabbitmq:
@@ -66,8 +67,8 @@
   conf:
     # 开启或关闭,默认开启,当支付信息无效时不能正常启动项目,可设为false
     enabled: true
-    appId: wxb17e909bb2b1975f
-    secretId: eee8aae16bab075f1b3e51784e5dff6d
+    appId: wx9368902cab914aea
+    secretId: 1ec8263ae9ed9f475546c971fc702979
     templateApproveId: jAt2UR8LtaDplqwHQFmAjvaqdLY0WVo16CVYKoZtcuo #申请审批消息模板id
 #OSS及短信配置
 oss:

--
Gitblit v1.7.1