From be1267c82755ea2217e3e84d6b47661eaf075497 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 25 九月 2018 16:04:15 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index 4c6e1bc..4195765 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -15,9 +15,10 @@
 	//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";

--
Gitblit v1.9.1