Merge remote-tracking branch 'origin/master'

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java

@@ -164,6 +164,9 @@ public class SdsInfoServiceImpl extends BaseServiceImpl<SdsInfoDao, SdsInfoEntit
         //查看详情 新增浏览次数
         log.info("查询ID为：" + id);
         SdsInfoEntity sdsInfoEntity = selectById(id);
+        if(sdsInfoEntity==null){
+            return new Result<EpdcSelectSdsInfoDetailResultDTO>().error("未查找到该顺道捎信息");
+        }
         sdsInfoEntity.setBrowseNum(sdsInfoEntity.getBrowseNum()==null?1:sdsInfoEntity.getBrowseNum()+1);
         updateById(sdsInfoEntity);
         return new Result<EpdcSelectSdsInfoDetailResultDTO>().ok(this.baseDao.getSdsDetail(id));

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml

@@ -133,14 +133,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.elink.esua.epdc" level="INFO"/>
-        <logger name="com.elink.esua.epdc.modules.archives.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.archivesdept.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.dept.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.epidemic.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.feign.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.module.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.specialuser.dao" level="DEBUG"/>
-        <logger name="com.elink.esua.epdc.modules.groupbuy.dao" level="DEBUG"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -151,10 +144,10 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <logger name="org.springframework.web" level="ERROR"/>
-        <logger name="org.springboot.sample" level="ERROR"/>
-        <logger name="com.elink.esua.epdc" level="ERROR"/>
-        <root level="ERROR">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>