From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
index dc41f73..7ca0dcb 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
@@ -39,7 +39,7 @@
static {
YamlPropertiesFactoryBean yamlProFb = new YamlPropertiesFactoryBean();
- yamlProFb.setResources(new ClassPathResource("application.yaml"));
+ yamlProFb.setResources(new ClassPathResource("application.yml"));
Properties properties = yamlProFb.getObject();
System.out.println("mallbook 参数配置初始化");
System.out.println("--------------------------------");
--
Gitblit v1.7.1