diff --git a/src/main/conf/dev/config/config.properties b/src/main/conf/dev/config/config.properties
index 80b98fb2..e873d078 100644
--- a/src/main/conf/dev/config/config.properties
+++ b/src/main/conf/dev/config/config.properties
@@ -7,14 +7,6 @@ master.url = jdbc:mysql://localhost:3306/blade?useUnicode=true&characterEncoding
master.username = root
master.password = root
-#oracle数据源配置
-#master.dbType = oracle
-#master.driver = oracle.jdbc.driver.OracleDriver
-#master.url = jdbc:oracle:thin:@127.0.0.1:1521:orcl
-#master.username = blade
-#master.password = blade
-
-
#多数据源数据库配置
#other.dbType = mysql
#other.driver = com.mysql.jdbc.Driver
@@ -22,6 +14,13 @@ master.password = root
#other.username = root
#other.password = qazwsx
+#oracle数据源配置
+#master.dbType = oracle
+#master.driver = oracle.jdbc.driver.OracleDriver
+#master.url = jdbc:oracle:thin:@127.0.0.1:1521:orcl
+#master.username = blade
+#master.password = blade
+
# 初始连接池大小、最小空闲连接数、最大活跃连接数
druid.initialSize = 5
druid.maxActive = 100
diff --git a/src/main/java/com/smallchill/platform/model/Notice.java b/src/main/java/com/smallchill/platform/model/Notice.java
index f3968966..c2ad9063 100644
--- a/src/main/java/com/smallchill/platform/model/Notice.java
+++ b/src/main/java/com/smallchill/platform/model/Notice.java
@@ -2,6 +2,7 @@ package com.smallchill.platform.model;
import java.util.Date;
+import com.smallchill.core.annotation.DbName;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import org.beetl.sql.core.annotatoin.Table;
@@ -11,6 +12,7 @@ import com.smallchill.core.base.model.BaseModel;
@Table(name = "tb_yw_tzgg")
@BindID(name = "f_it_xl")
+//@DbName(name = "other") //多数据源配置注解
@SuppressWarnings("serial")
public class Notice extends BaseModel {
private String f_it_xl;
@@ -23,8 +25,8 @@ public class Notice extends BaseModel {
private Date f_dt_fbsj;
private Integer version;
- @AutoID
- @SeqID(name = "SEQ_NOTICE")
+ @AutoID //mysql自增使用
+ @SeqID(name = "SEQ_NOTICE") //oracle sequence序列使用
public String getF_it_xl() {
return f_it_xl;
}
diff --git a/src/main/resources/spring/applicationContext-datasource.xml b/src/main/resources/spring/applicationContext-datasource.xml
index 8cc0f58e..5f15cdcf 100644
--- a/src/main/resources/spring/applicationContext-datasource.xml
+++ b/src/main/resources/spring/applicationContext-datasource.xml
@@ -57,6 +57,7 @@
+
@@ -64,6 +65,14 @@
+
+
+
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index e05393a3..a4d3632a 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -49,6 +49,36 @@
+
+
+
@@ -58,7 +88,8 @@