diff --git a/pom.xml b/pom.xml
index 3c8a0a2..aa695f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,8 @@
UTF-8
+ 3.3
+ 1.8
@@ -120,6 +122,18 @@
org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ utf-8
+ ${jdk.version}
+ ${jdk.version}
+ 128m
+ 512m
+
+
+
+ org.apache.maven.plugins
maven-surefire-plugin
2.7.1
diff --git a/src/main/java/com/essa/framework/ConfigProperties.java b/src/main/java/com/essa/framework/ConfigProperties.java
index e515ee2..77500c8 100644
--- a/src/main/java/com/essa/framework/ConfigProperties.java
+++ b/src/main/java/com/essa/framework/ConfigProperties.java
@@ -15,6 +15,15 @@ public class ConfigProperties {
private String serverURL;
private String buyerURL;
+ // 数据库驱动名字
+ private String jdbcName = null;
+ // 数据库协议地址
+ private String dbUrl = null;
+ // 数据库用户名
+ private String dbUser = null;
+ // 数据库密码
+ private String dbPassword = null;
+
private ConfigProperties() {
}
@@ -32,6 +41,10 @@ public class ConfigProperties {
configProperties.setBrowserName(p.getProperty("browserName"));//使用jframe要注释
configProperties.setBuyerURL(p.getProperty("buyerURL"));
configProperties.setServerURL(p.getProperty("serverURL"));
+ configProperties.setJdbcName(p.getProperty("jdbc.driver"));
+ configProperties.setDbUrl(p.getProperty("jdbc.url"));
+ configProperties.setDbUser(p.getProperty("jdbc.user"));
+ configProperties.setDbPassword(p.getProperty("jdbc.pwd"));
configPropertiesMap.put(envEnum.getCode(),configProperties);
ips.close();
} catch (IOException e) {
@@ -67,4 +80,36 @@ public class ConfigProperties {
public void setBuyerURL(String buyerURL) {
this.buyerURL = buyerURL;
}
+
+ public String getJdbcName() {
+ return jdbcName;
+ }
+
+ public void setJdbcName(String jdbcName) {
+ this.jdbcName = jdbcName;
+ }
+
+ public String getDbUrl() {
+ return dbUrl;
+ }
+
+ public void setDbUrl(String dbUrl) {
+ this.dbUrl = dbUrl;
+ }
+
+ public String getDbUser() {
+ return dbUser;
+ }
+
+ public void setDbUser(String dbUser) {
+ this.dbUser = dbUser;
+ }
+
+ public String getDbPassword() {
+ return dbPassword;
+ }
+
+ public void setDbPassword(String dbPassword) {
+ this.dbPassword = dbPassword;
+ }
}
diff --git a/src/main/java/com/essa/framework/DButil.java b/src/main/java/com/essa/framework/DButil.java
index 91c8102..44c3713 100644
--- a/src/main/java/com/essa/framework/DButil.java
+++ b/src/main/java/com/essa/framework/DButil.java
@@ -1,16 +1,16 @@
package com.essa.framework;
+import com.mysql.cj.api.jdbc.Statement;
+import com.mysql.cj.jdbc.CallableStatement;
+import com.mysql.cj.jdbc.PreparedStatement;
+
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
-import com.mysql.cj.api.jdbc.Statement;
-import com.mysql.cj.jdbc.CallableStatement;
-import com.mysql.cj.jdbc.PreparedStatement;
-
public class DButil {
- // 数据库驱动名字
+ /*// 数据库驱动名字
private static String jdbcName = null;
// 数据库协议地址
private static String dbUrl = null;
@@ -18,10 +18,20 @@ public class DButil {
private static String dbUser = null;
// 数据库密码
private static String dbPassword = null;
-
+*/
public static Connection getCon() {
+
Connection conn = null;
- if ("SIT".equals(Model.getEnv())) {
+ try {
+ EnvEnum envEnum = EnvEnum.fromCode(Model.getEnv());
+ ConfigProperties dbConfig = ConfigProperties.getConfig(envEnum);
+ Class.forName(dbConfig.getJdbcName());
+ conn = DriverManager.getConnection(dbConfig.getDbUrl(),dbConfig.getDbUser(), dbConfig.getDbPassword());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return conn;
+ /*if ("SIT".equals(Model.getEnv())) {
try {
jdbcName = DBInfo.getSitJdbcName();
dbUrl = DBInfo.getSitSqlUrl();
@@ -70,7 +80,7 @@ public class DButil {
e.printStackTrace();
}
}
- return null;
+ return null;*/
}
/**
diff --git a/src/main/resources/conf/config_dit.properties b/src/main/resources/conf/config_dit.properties
index b900f8d..002f475 100644
--- a/src/main/resources/conf/config_dit.properties
+++ b/src/main/resources/conf/config_dit.properties
@@ -5,3 +5,7 @@ browserName=Chrome
serverURL=http://bpms.dit.gz.essa
buyerURL=http://en.portaldit.cn
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://192.168.1.202:3307/bpms
+jdbc.user=root
+jdbc.pwd=redhat
\ No newline at end of file
diff --git a/src/main/resources/conf/config_hotfix.properties b/src/main/resources/conf/config_hotfix.properties
index a0bb274..16b350a 100644
--- a/src/main/resources/conf/config_hotfix.properties
+++ b/src/main/resources/conf/config_hotfix.properties
@@ -5,3 +5,9 @@ browserName=Chrome
serverURL=http://bpms.hotfix.gz.essa
buyerURL=http://en.portalhotfix.cn
+
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://192.168.1.19:3321/bpms
+jdbc.user=essa_hotfix
+jdbc.pwd=essa^_hotfix^D