From a220fe323e37523f76996b0eb91ca55f1f7af5ce Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 12 十月 2018 14:04:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index 4c6e1bc..8ebd76d 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -15,12 +15,13 @@
 	//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://123.207.82.239:3360/db_user";
+	//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 url="jdbc:mysql://127.0.0.1:3360/db_user";
 	/*private static String username="root";
 	private static String password="123456";*/
 	

--
Gitblit v1.9.1