Browse Source

数据源增加name字段

sunyj 8 years ago
parent
commit
490bdb0099

+ 9 - 9
kanban-console/src/main/java/com/uas/kanban/model/DataSource.java

@@ -19,6 +19,8 @@ public class DataSource extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	private String name;
+
 	/**
 	 * 驱动名
 	 */
@@ -43,14 +45,12 @@ public class DataSource extends BaseEntity {
 	@FieldProperty(nullable = false)
 	private String password;
 
-	public DataSource() {
+	public String getName() {
+		return name;
 	}
 
-	public DataSource(String driverClassName, String url, String username, String password) {
-		this.driverClassName = driverClassName;
-		this.url = url;
-		this.username = username;
-		this.password = password;
+	public void setName(String name) {
+		this.name = name;
 	}
 
 	public String getDriverClassName() {
@@ -87,9 +87,9 @@ public class DataSource extends BaseEntity {
 
 	@Override
 	public String toString() {
-		return "DataSource [driverClassName=" + driverClassName + ", url=" + url + ", username=" + username
-				+ ", password=" + password + ", id=" + id + ", code=" + code + ", createTime=" + createTime
-				+ ", lastModified=" + lastModified + ", version=" + version + "]";
+		return "DataSource [name=" + name + ", driverClassName=" + driverClassName + ", url=" + url + ", username="
+				+ username + ", password=" + password + ", id=" + id + ", createTime=" + createTime + ", lastModified="
+				+ lastModified + ", version=" + version + ", code=" + code + "]";
 	}
 
 	public DruidDataSource toDruidDataSource() throws SQLException {

+ 2 - 2
kanban-console/src/main/webapp/WEB-INF/views/console.html

@@ -20,8 +20,8 @@
 			</ol>
 			<strong><li class="title">数据源</li></strong>
 			<ol>
-				<li><a target="_blank">datasource/save?json={"driverClassName": "driver_class_name","password": "password","url": "url","username": "username"}</a></li>
-				<li><a target="_blank">datasource/update?json={"driverClassName":"oracle.jdbc.driver.OracleDriver","code":"4EC3C69D011","password":"select!%23%25*(","url":"jdbc:oracle:thin:@192.168.253.6:1521:orcl","username":"UAS"}</a></li>
+				<li><a target="_blank">datasource/save?json={"name": "UAS标准版", "driverClassName": "driver_class_name","password": "password","url": "url","username": "username"}</a></li>
+				<li><a target="_blank">datasource/update?json={"name": "UAS标准版", "driverClassName":"oracle.jdbc.driver.OracleDriver","code":"4EC3C69D011","password":"select!%23%25*(","url":"jdbc:oracle:thin:@192.168.253.6:1521:orcl","username":"UAS"}</a></li>
 				<li><a target="_blank">datasource/delete/all</a></li>
 				<li><a target="_blank">datasource/delete/4EC2735D343</a></li>
 				<li><a target="_blank">datasource/get/all</a></li>