From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/db/DBUtil.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index f7043dc..633017e 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -15,9 +15,11 @@
 	//private static String username="website";
 	//private static String password="amtb3737";
 	
-	//private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
+	
 	private static String username="root";
 	private static String password="lmx8688139";
+	//private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
+	//private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
 	private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
     //private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
 	/*private static String username="root";

--
Gitblit v1.9.1