update

gjjs-bd-business/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <scope>com.brilliance.mda.runtime</scope>
+            <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -79,11 +79,15 @@
             <groupId>com.brilliance</groupId>
             <artifactId>jrxx-bean</artifactId>
             <version>0.0.1</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/jrxx-bean.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.brilliance</groupId>
             <artifactId>jrxx</artifactId>
             <version>0.0.1</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/jrxx.jar</systemPath>
         </dependency>
     </dependencies>
 

gjjs-bd-business/src/main/java/com/ceb/gjjs/mda/manager/module/Rcvp.java

@@ -832,13 +832,13 @@ public class Rcvp extends AbstractModule{
 			//20190827新增电子信用证查询语句
 			else if("exl".equals(this.getMsgtyp()))
 			{
-				DynamicDataSourceContextHolder.setDataSourceType("datasource1");
+				DynamicDataSourceContextHolder.setDataSourceType("datasource2");
 			  // sql = " WHERE m1.inr=m2.inr AND m1.dir='>' AND m1.pntinr IS NULL AND m2.subtyp<>'990' and m2.subtyp<>'900'";
 			  sql = " WHERE m1.inr=m2.inr AND m1.dir='>' AND m1.pntinr IS NULL AND m2.subtyp<>'990'";
 			}
 			else
 			{
-				DynamicDataSourceContextHolder.setDataSourceType("datasource2");
+				DynamicDataSourceContextHolder.setDataSourceType("datasource1");
 			  //sql = " WHERE m1.inr=m2.inr AND m1.dir='>' AND m1.pntinr IS NULL AND m2.subtyp<>'601' AND m2.subtyp<>'900' ";
 			  sql = " WHERE m1.inr=m2.inr AND m1.dir='>' AND m1.pntinr IS NULL AND m2.subtyp<>'NCK' AND m2.subtyp<>'ACK' AND m2.subtyp<>'010' AND m2.subtyp<>'020' ";
 			}
@@ -2092,7 +2092,6 @@ public class Rcvp extends AbstractModule{
 	 */
 	@Check(target="msgtyp",order=100)
 	public boolean checkMsgtypN100(){
-		DynamicDataSourceContextHolder.setDataSourceType("datasource2");
 		IContext ctx = MdaEnv.getContext();
 		if(MdaUtils.isEmpty(this.getMsgtyp()))
 		{

gjjs-bd-mybatis-support/src/main/java/com/brilliance/mda/support/mybatis/dync/mapper/DbExecuteMapper.java

@@ -17,7 +17,6 @@ public class DbExecuteMapper {
     final String FNAME = this.getClass().getName();
 
     public List<Map<String,Object>> dyncReadForMap(Map<String,Object> params){
-        DynamicDataSourceContextHolder.setDataSourceType("datasource2");
         return sqlSessionTemplate.selectList(FNAME+".dyncReadForMap",params);
     }
     public int dyncUpdateForMap(Map<String,Object> params){

gjjs-bd-runtime/pom.xml

@@ -86,7 +86,9 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
+            <version>12.1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/../lib/ojdbc6-12.1.0.2.jar</systemPath>
         </dependency>
 
     </dependencies>

pom.xml

@@ -99,7 +99,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-devtools</artifactId>
                 <version>${spring.version}</version>
-                <scope>com.brilliance.mda.runtime</scope>
+                <scope>runtime</scope>
                 <optional>true</optional>
             </dependency>
             <!-- Mybatis配置 -->