Merge remote-tracking branch 'origin/master'

console/src/main/resources/application-local.yml

@@ -10,6 +10,11 @@ spring:
           username: wip
           password: wip
           driver-class-name: oracle.jdbc.OracleDriver
+        ods:
+          url: jdbc:oracle:thin:@113.98.201.217:1521/ORD
+          username: wip
+          password: wip
+          driver-class-name: oracle.jdbc.OracleDriver
       druid:
         filters: stat,wall,log4j2
         initial-size: 5
@@ -38,7 +43,7 @@ spring:
           merge-sql: true
           slow-sql-millis: 100
   activemq:
-    enabled: false
+    enabled: true
     brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
     password: admin
     user: admin

console/src/main/resources/application-qas.yml

@@ -7,8 +7,13 @@ spring:
         wip:
           driver-class-name: com.sap.db.jdbc.Driver
           jndi-name: jdbc/jts/wipPool
+        ods:
+          url: jdbc:oracle:thin:@172.16.251.133:1521/ORQ
+          username: ods
+          password: ods
+          driver-class-name: oracle.jdbc.OracleDriver
   activemq:
-    enabled: false
+    enabled: true
     brokerUrl: tcp://172.16.251.133:61616?wireFormat.maxInactivityDuration=0
     password: admin
     user: admin

equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EdcDataResourceMapper.java

@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.equip.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.foreverwin.mesnac.equip.model.EdcDataResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -38,6 +39,7 @@ public interface EdcDataResourceMapper extends BaseMapper<EdcDataResource> {
      * @param sqlStr
      * @return
      */
+    @DS("ods")
     int insertBySql(@Param(value="sqlStr") String sqlStr);
 
 }