删除数据源driver属性，由url自动识别

zhou-hao · zhou-hao · commit ba5b5a677de0 · 2016-12-03T11:37:08.000+08:00
diff --git a/hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/datasource/DataSource.java b/hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/datasource/DataSource.java
@@ -26,22 +26,19 @@
 public class DataSource extends GenericPo<String> {
     //数据源名称
     @NotBlank
-    private String name;
-    //驱动
-    @NotBlank
-    private String driver;
+    private String         name;
     //url
     @NotBlank
-    private String url;
+    private String         url;
     //用户名
     @NotBlank
-    private String username;
+    private String         username;
     //测试sql
-    private String testSql;
+    private String         testSql;
     //密码
-    private String password;
+    private String         password;
     //是否启用
-    private int enabled;
+    private int            enabled;
     //创建日期
     private java.util.Date createDate;
 
@@ -125,13 +122,6 @@ public void setCreateDate(java.util.Date createDate) {
         this.createDate = createDate;
     }
 
-    public String getDriver() {
-        return driver;
-    }
-
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
 
     public String getUrl() {
         return url;
@@ -151,52 +141,39 @@ public void setTestSql(String testSql) {
 
     public int getHash() {
         StringBuilder builder = new StringBuilder();
-        builder.append(driver).append(url).append(username).append(password).append(enabled);
+        builder.append(url).append(username).append(password).append(enabled);
         return builder.toString().hashCode();
     }
 
 
-
-public interface Property extends GenericPo.Property{
-	/**
-	 *
-	 * @see DataSource#name
-	 */
-	String name="name";
-	/**
-	 *
-	 * @see DataSource#driver
-	 */
-	String driver="driver";
-	/**
-	 *
-	 * @see DataSource#url
-	 */
-	String url="url";
-	/**
-	 *
-	 * @see DataSource#username
-	 */
-	String username="username";
-	/**
-	 *
-	 * @see DataSource#testSql
-	 */
-	String testSql="testSql";
-	/**
-	 *
-	 * @see DataSource#password
-	 */
-	String password="password";
-	/**
-	 *
-	 * @see DataSource#enabled
-	 */
-	String enabled="enabled";
-	/**
-	 *
-	 * @see DataSource#createDate
-	 */
-	String createDate="createDate";
-	}
+    public interface Property extends GenericPo.Property {
+        /**
+         * @see DataSource#name
+         */
+        String name       = "name";
+        /**
+         * @see DataSource#url
+         */
+        String url        = "url";
+        /**
+         * @see DataSource#username
+         */
+        String username   = "username";
+        /**
+         * @see DataSource#testSql
+         */
+        String testSql    = "testSql";
+        /**
+         * @see DataSource#password
+         */
+        String password   = "password";
+        /**
+         * @see DataSource#enabled
+         */
+        String enabled    = "enabled";
+        /**
+         * @see DataSource#createDate
+         */
+        String createDate = "createDate";
+    }
 }
diff --git a/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/datasource/DataSourceMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/datasource/DataSourceMapper.xml
@@ -6,7 +6,6 @@
     <resultMap id="DataSourceResultMap" type="org.hsweb.web.bean.po.datasource.DataSource">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
-        <result property="driver" column="driver" javaType="String" jdbcType="VARCHAR"/>
         <result property="url" column="url" javaType="String" jdbcType="VARCHAR"/>
         <result property="username" column="username" javaType="String" jdbcType="VARCHAR"/>
         <result property="password" column="password" javaType="String" jdbcType="VARCHAR"/>
diff --git a/hsweb-web-starter/src/main/resources/org/hsweb/start/scripts/install/install.groovy b/hsweb-web-starter/src/main/resources/org/hsweb/start/scripts/install/install.groovy
@@ -114,7 +114,6 @@ database.createOrAlter("s_role")
 database.createOrAlter("s_data_source")
         .addColumn().name("u_id").jdbcType(JDBCType.VARCHAR).length(32).notNull().primaryKey().comment("id").commit()
         .addColumn().name("name").jdbcType(JDBCType.VARCHAR).length(64).notNull().comment("数据源名称").commit()
-        .addColumn().name("driver").jdbcType(JDBCType.VARCHAR).length(128).notNull().comment("驱动").commit()
         .addColumn().name("url").jdbcType(JDBCType.VARCHAR).length(512).notNull().comment("url").commit()
         .addColumn().name("username").jdbcType(JDBCType.VARCHAR).length(128).notNull().comment("用户名").commit()
         .addColumn().name("password").jdbcType(JDBCType.VARCHAR).length(128).notNull().comment("密码").commit()
