开发梳理；

suweicheng
1 parent a619f762
Showing 8 changed files with 95 additions and 24 deletions Show diff stats
pom.xml
src/main/java/com/essa/framework/ConfigProperties.java
src/main/java/com/essa/framework/DButil.java
src/main/resources/conf/config_dit.properties
src/main/resources/conf/config_hotfix.properties
src/main/resources/conf/config_sit.properties
src/main/resources/conf/config_uat.properties
src/main/resources/config.properties
@@ -14,6 +14,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <jdk.version>1.8</jdk.version>
     </properties>
     <dependencies>
@@ -120,6 +122,18 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <encoding>utf-8</encoding>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                    <meminitial>128m</meminitial>
+                    <maxmem>512m</maxmem>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.7.1</version>
                 <configuration>
@@ -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;
+    }
 }
 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;*/
 	}
 	/**
@@ -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
@@ -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<K123
+
@@ -5,3 +5,7 @@ browserName=Chrome
 serverURL=http://bpms.sit.gz.essa
 buyerURL=http://en.portalsit.cn
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://192.168.1.247:3307/bpms
+jdbc.user=root
+jdbc.pwd=redhat
 \ No newline at end of file
@@ -5,3 +5,7 @@ browserName=Chrome
 serverURL=http://bpms.spstoys.com:7291
 buyerURL=http://en.spstoys.com:889
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://112.74.135.97:3325/bpms
+jdbc.user=essa_uat
+jdbc.pwd=lXI!RqH6thvmMNNh
 \ No newline at end of file
@@ -1,16 +0,0 @@
-#browserName=FireFox
-#browserName=IE
-browserName=Chrome
-
-SIT=http://bpms.sit.gz.essa
-BSIT=http://en.portalsit.cn
-
-HOTFIX=http://bpms.hotfix.gz.essa
-BHOTFIX=http://en.portalhotfix.cn
-
-UAT=http://bpms.spstoys.com:7291
-BUAT=http://en.spstoys.com:889
-
-DIT=http://bpms.dit.gz.essa
-BDIT=http://en.portaldit.cn
-