diff --git a/config/appConfig.js b/config/appConfig.js
index 007f281..7e9ab69 100644
--- a/config/appConfig.js
+++ b/config/appConfig.js
@@ -1,29 +1,108 @@
+//当前环境 test,prod
+export const ENV = 'prod'
+export const ENV_BASE_URL = {
+	java: {
+		prod: 'https://cashier.sxczgkj.com/',
+		test: 'http://192.168.1.42/',
+		h5ProdProxy: '/prodJavaApi/',
+		h5TestProxy: '/testJavaApi/',
+	},
+	php: {
+		prod: 'https://cashier.sxczgkj.com/',
+		test: 'http://192.168.1.42:8787/',
+		h5ProdProxy: '/prodPhpApi/api/',
+		h5TestProxy: '/testPhpApi/api/',
+	}
+}
+
+/**
+ * @param {String} env  环境，测试或者正式 
+ * @param {String} apiType 语言，java或者php 
+ */
+export function returnBaseUrl(param) {
+	let {
+		env,
+		apiType
+	} = param
+	if(!env){
+		env=ENV
+	}
+	console.log('env', env);
+	console.log('apiType', apiType);
+	if (env === 'prod') {
+		//正式环境
+		// #ifdef H5
+		if (apiType === 'php') {
+			return ENV_BASE_URL.php.h5ProdProxy
+		}
+		if (apiType === 'java') {
+			return ENV_BASE_URL.java.h5ProdProxy
+		}
+		// #endif
+
+		if (apiType === 'php') {
+			return ENV_BASE_URL.php.prod
+		}
+		if (apiType === 'java') {
+			return ENV_BASE_URL.java.prod
+		}
+
+	} else {
+		//测试环境
+		// #ifdef H5
+		if (apiType === 'php') {
+			return ENV_BASE_URL.php.h5TestProxy
+		}
+		if (apiType === 'java') {
+			return ENV_BASE_URL.java.h5TestProxy
+		}
+		// #endif
+
+		if (apiType === 'php') {
+			return ENV_BASE_URL.php.test
+		}
+		if (apiType === 'java') {
+			return ENV_BASE_URL.java.test
+		}
+
+	}
+
+}
+
+
+
 const appConfig = {
-	
+
 	// 项目名称
 	appName: '银收客',
-	
+
 	// token取值key
 	tokenKey: 'iToken',
 	// tokenKey: 'satoken',
-	
+
 	// 环境变量相关
 	env: {},
-	
+
 	// wss: "wss://sockets.sxczgkj.com/wss", //测试环境
 	wss: "wss://czgeatws.sxczgkj.com/wss", //正式环境
 	// 环境变量常量
 	ENV_ENUM: {
-		DEVELOPMENT: 'development',  // 本地调试地址 
+		DEVELOPMENT: 'development', // 本地调试地址 
 		TEST: 'test', // 测试地址
 		DEMO: 'demo', // 演示环境
-		PRODUCTION: 'production'  // 生产环境
+		PRODUCTION: 'production' // 生产环境
 	},
-	
+
+	returnBaseUrl: returnBaseUrl,
 	storeEnvEnumKey: 'currentEnvEnum', // 本地存储的envkey的值
-	
-	encryptKey: '1234567890123456' // http数据加解密的key 
-	
+
+	encryptKey: '1234567890123456', // http数据加解密的key 
+	baseUrl: "",
 }
 
+
+
+
+
+
 export default appConfig;
\ No newline at end of file
diff --git a/http/http.js b/http/http.js
index eb2d791..54b4552 100644
--- a/http/http.js
+++ b/http/http.js
@@ -16,22 +16,9 @@ import go from "@/commons/utils/go.js";
 import { reject } from "lodash";
 // 设置node环境
 // envConfig.changeEnv(storageManage.env('production')) //正式
-envConfig.changeEnv(storageManage.env("development")); //测试
-
-// 测试服
-// #ifdef H5
-let baseUrl = "/javaapi/";
-// #endif
-// #ifndef H5
-// let baseUrl = 'https://tapi.cashier.sxczgkj.cn/'
-//预发布
-// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
-
-//正式
-// let baseUrl = 'https://cashier.sxczgkj.com/'
-let baseUrl = appConfig.env.JEEPAY_BASE_URL;
-// #endif
+// envConfig.changeEnv(storageManage.env("development")); //测试
 
+let baseUrl = appConfig.returnBaseUrl({apiType:'java'});
 const loadingShowTime = 200;
 
 function getHeader() {
diff --git a/http/php/request.ts b/http/php/request.ts
index 5147f91..b7eec9c 100644
--- a/http/php/request.ts
+++ b/http/php/request.ts
@@ -2,7 +2,7 @@
 // const baseURL : string = 'https://newblockwlx.sxczgkj.cn/index.php/api/'
 let baseURL: string = "http://192.168.1.42:8787/api/";
 // #ifdef H5
-baseURL = "/phpapi/api/";
+baseURL = "/prodPhpApi/api/";
 // #endif
 
 import go from "@/commons/utils/go.js";
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index c901f41..fe371ef 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -14,23 +14,7 @@ import storageManage from '@/commons/utils/storageManage.js'
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
-// 设置node环境
-// envConfig.changeEnv(storageManage.env('production'))
-
-// 测试服
-// #ifdef H5
-let baseUrl = '/api/'
-// #endif
-// #ifndef H5
-// let baseUrl = 'https://tapi.cashier.sxczgkj.cn/'
-//预发布
-// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
-
-//正式
-// let baseUrl = 'https://cashier.sxczgkj.com/'
-let baseUrl = appConfig.env.JEEPAY_BASE_URL
-// #endif
-
+let baseUrl = appConfig.returnBaseUrl({apiType:'php'});
 const loadingShowTime = 200
 
 function getHeader(){
diff --git a/vite.config.js b/vite.config.js
index 821fc63..8891cbb 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,17 +7,25 @@ export default defineConfig({
 	],
 	server: {
 		proxy: {
-			'/javaapi': {
+			'/prodJavaApi': {
 				target: 'https://cashier.sxczgkj.com', // 目标服务器地址
-				// target: 'http://192.168.1.42/', // 目标服务器地址
 				changeOrigin: true,                   // 是否更改请求源
-				rewrite: path => path.replace(/^\/javaapi/, '')
+				rewrite: path => path.replace(/^\/prodJavaApi/, '')
 			},
-			'/phpapi': {
-				target: 'https://cashier.sxczgkj.com', // 目标服务器地址
-				// target: 'http://192.168.1.42:8787/', // 目标服务器地址
+			'/testJavaApi': {
+				target: 'http://192.168.1.42/', // 目标服务器地址
 				changeOrigin: true,                   // 是否更改请求源
-				rewrite: path => path.replace(/^\/phpapi/, '')
+				rewrite: path => path.replace(/^\/testJavaApi/, '')
+			},
+			'/prodPhpApi': {
+				target: 'https://cashier.sxczgkj.com', // 目标服务器地址
+				changeOrigin: true,                   // 是否更改请求源
+				rewrite: path => path.replace(/^\/prodPhpApi/, '')
+			},
+			'/testPhpApi': {
+				target: 'http://192.168.1.42:8787/', // 目标服务器地址
+				changeOrigin: true,                   // 是否更改请求源
+				rewrite: path => path.replace(/^\/testPhpApi/, '')
 			}
 		}
 	}