版本分支提交

elab-db/src/main/java/com/elab/core/dao/BasicBaseDao.java

@@ -484,7 +484,14 @@ public class BasicBaseDao implements ApplicationContextAware,
     public Map<String, Object> executeQueryMap(String sql, Object o) throws Exception {
         JdbcParamsModel jdbcParamsModel = commonParseSql(sql, o);
         long start = System.currentTimeMillis();
-        Map<String, Object> map = this.jdbcTemplate.queryForMap(jdbcParamsModel.getSql(), jdbcParamsModel.getObjects());
+        Map<String, Object> map = null;
+        try {
+            map = this.jdbcTemplate.queryForMap(jdbcParamsModel.getSql(), jdbcParamsModel.getObjects());
+        } catch (EmptyResultDataAccessException e) {
+            
+        } catch (IncorrectResultSizeDataAccessException e) {
+            logger.error("数据异常,只要查询一个,但是结果集是多个!", e);
+        }
         long time = System.currentTimeMillis() - start;
         logger.debug(" SQL 执行耗时 : " + time);
         return map;

elab-kafka/README.md

@@ -14,6 +14,7 @@
 
 2. 如果出现jar包依赖冲突则可以尝试
 
+需要注意的是目前该版本测试是基于SpringBoot 2.1.6.RELEASE 通过。
 ```xml
  <dependency>
      <groupId>com.elab.core</groupId>
@@ -48,7 +49,55 @@
 </dependency>
 ```
 
-需要注意的是目前该版本测试是基于SpringBoot 2.1.6.RELEASE 通过。
+###  基于大麦服务notify的解决冲突jar关系
+
+```xml
+
+<dependency>
+            <groupId>com.elab.core</groupId>
+            <artifactId>elab-kafka</artifactId>
+            <version>${elab.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-kafka</artifactId>
+                    <groupId>org.springframework.kafka</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>kafka-clients</artifactId>
+                    <groupId>org.apache.kafka</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>2.2.0.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kafka-clients</artifactId>
+                    <groupId>org.apache.kafka</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <!-- 解决ribbon自带的rxNetty版本过低会导致问题 -->
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxnetty</artifactId>
+            <version>0.4.20</version>
+            <scope>runtime</scope>
+        </dependency>
+
+```
+过滤掉低版本SpringBoot的自动配置
+```java
+@SpringBootApplication(exclude = {KafkaAutoConfiguration.class})
+```
+
 
 ## 配置文件