From 59f4dc012a2c42eebd31301444e0f8df9af088e0 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期三, 26 六月 2024 10:13:12 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx

---
 common/config.js |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/config.js b/common/config.js
index c171ea5..ad8596c 100644
--- a/common/config.js
+++ b/common/config.js
@@ -3,14 +3,14 @@
 	hasHead: true,
 	authCallBackUrl: 'https://wxbank.hnnx.com/mer/payOut/getAuthCode.do?authCallBackUrl=',
 	webURL: 'https://jmy.jinmingyuan.com/ecosphere-user',
-	serverTempl:"http://172.16.61.31:8089",
+	serverTempl:"http://172.16.61.11:8089",
 	socketTempl:"wss://yqzx.jinmingyuan.com/wsPerCode",
 	h5Temp:"https://yqzx.jinmingyuan.com/ecosphere-h5",
-	serverUrl: 'http://172.16.61.31:8089',
-	h5Url: 'http://172.16.61.31:8089/service-merchant',
+	serverUrl: 'http://172.16.61.11:8089',
+	h5Url: 'http://172.16.61.11:8089/service-merchant',
 	ftpUrl: 'https://yqzx.jinmingyuan.com/file',
 	// ftpUrl: 'https://echftp.jinmingyuan.com',
-	baseUrl: 'http://172.16.61.31:8089',
+	baseUrl: 'http://172.16.61.11:8089',
 	wx_appid: 'wxad8cc511da676bd4',
 	ali_appid: '2021003199690698'
 }
@@ -33,7 +33,7 @@
 
 module.exports = {
 	kefuTel: '15824668510',
-	config: test,
+	config: prod,
 	ACCESSTOKEN: "Authorization",
 	/* 鏄惁鎵撳嵃璇锋眰鏃ュ織 */
 	DEBUG: false,

--
Gitblit v1.9.1