From d34c7c19ab062b8e99b7af7e1d44e009c1b9b739 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 19 Mar 2024 12:02:49 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

---
 common/setting.js |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common/setting.js b/common/setting.js
index 5f5c943..d12e0ca 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -3,25 +3,27 @@
  */
 module.exports = {
 	// 应用名,
-	name: '荆楚水库',
+	name: '饶城格格通',
 	// 应用logo,支持本地路径和网络路径
 	logo: '/static/images/base.ico',
 	// 版本号
 	version: '2.0.0',
 	// 开发环境接口Url
-	// devUrl: 'https://sk.hubeishuiyi.cn',
-	// devUrl: 'http://192.168.1.156:9528',
-	// devUrl:'http://192.168.1.50:9528',
-	// devUrl: 'http://192.168.0.102:9528',
-	devUrl:'http://z4042833u6.wicp.vip',
-	minioBaseUrl: "http://60.220.177.113:9000/jczz/",
+	// devUrl: 'http://z4042833u6.wicp.vip',
+	// devUrl: 'https://srgdjczzxtpt.com:2080/api',
+	devUrl: 'http://192.168.2.140:9528',
+	// devUrl: 'https://kt39592615.goho.co',
+	minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
+	// minioBaseUrl: "http://192.168.0.101:9528/",
 	// 数据中台接口url
-	// dataCenterUrl: 'http://10.10.2.192/services',
 	dataCenterUrl: 'https://sk.hubeishuiyi.cn/services',
 	//洪水预报接口url
 	hsybUrl: "https://sk.hubeishuiyi.cn/hsybApi/api/fh-admin",
 	// 线上环境接口Url
-	prodUrl: 'https://sk.hubeishuiyi.cn',
+	prodUrl: 'https://srgdjczzxtpt.com:2080/api',
+
+	// prodUrl: 'http://192.168.2.140:9528',
+
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
 	contentType: 'application/json;charset=UTF-8',
 	// 后端返回状态码
@@ -37,4 +39,4 @@
 	// token过期时间(秒)
 	// 30天 30*24*60*60
 	tokenTime: 2592000,
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3