Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-data/amos-boot-data-accessapi/src/main/resources/logback-dev.xml

@@ -32,7 +32,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-data/amos-boot-data-accessapi/src/main/resources/logback-dev1.xml

@@ -32,7 +32,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-data/amos-boot-data-accessapi/src/main/resources/logback-qa.xml

@@ -20,7 +20,7 @@
         </triggeringPolicy>
     </appender>
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.apache.ibatis" level="ERROR"/>
     <logger name="org.mybatis" level="ERROR" />
     <logger name="java.sql.Connection" level="ERROR"/>
     <logger name="java.sql.Statement" level="ERROR"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-cyl.xml

@@ -20,7 +20,7 @@
         </triggeringPolicy>
     </appender>
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.apache.ibatis" level="ERROR"/>
     <logger name="org.mybatis" level="ERROR" />
     <logger name="java.sql.Connection" level="ERROR"/>
     <logger name="java.sql.Statement" level="ERROR"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-dev.xml

@@ -15,7 +15,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.apache.ibatis" level="ERROR"/>
     <logger name="java.sql.Connection" level="ERROR"/>
     <logger name="java.sql.Statement" level="ERROR"/>
     <logger name="java.sql.PreparedStatement" level="ERROR"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-jd.xml

@@ -15,7 +15,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-jyjc.xml

@@ -27,7 +27,7 @@
         </encoder>
     </appender>
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.apache.ibatis" level="ERROR"/>
     <logger name="org.mybatis" level="ERROR" />
     <logger name="java.sql.Connection" level="ERROR"/>
     <logger name="java.sql.Statement" level="ERROR"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-qa.xml

@@ -27,7 +27,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-tzs.xml

@@ -15,7 +15,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-vb.xml

@@ -15,7 +15,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="org.apache.ibatis" level="ERROR"/>
     <logger name="java.sql.Connection" level="ERROR"/>
     <logger name="java.sql.Statement" level="ERROR"/>
     <logger name="java.sql.PreparedStatement" level="ERROR"/>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/logback-cyl.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

@@ -26,7 +26,17 @@ public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrat
                     targetField = "notice.estateUnitSeq",
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitSeqByCreditCode",
-                    secondParamValue = "CQ")
+                    secondParamValue = "CQ"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.inspectUnitCreditCode",
+                    targetField = "notice.inspectUnitCreditCode",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryTcmUnitSeqByCreditCode",
+                    secondParamValue = "JY"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.installUnitCode",
+                    targetField = "notice.installUnitCode",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryTcmUnitSeqByCreditCode",
+                    secondParamValue = "AGW")
     })
     public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
         JgVehicleInformationVo vo = vehicleInformationService.queryBySequenceNbr(sequenceNbr);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/DataSourceConfiguration.java

@@ -40,6 +40,7 @@ public class DataSourceConfiguration {
         dataSource.setConnectionTimeout(hikariDataSourceProperties.getConnectionTimeout());
         dataSource.setIdleTimeout(hikariDataSourceProperties.getIdleTimeout());
         dataSource.setConnectionInitSql(hikariDataSourceProperties.getConnectionInitSql());
+        dataSource.setRegisterMbeans(hikariDataSourceProperties.getRegisterMbeans());
         return new DataSourceProxy(dataSource);
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/HikariDataSourceProperties.java

@@ -33,4 +33,6 @@ public class HikariDataSourceProperties {
 
     private String connectionInitSql;
 
+    private Boolean registerMbeans = false;
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
@@ -265,6 +266,7 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "报检信息手工推送至kafka", notes = "报检信息手工推送至kafka,预留")
     @GetMapping(value = "/data-push")
+    @Transactional
     public void pushTest(
             @RequestParam("id") Long id) {
         JyjcInspectionApplicationModel model = jyjcInspectionApplicationServiceImpl.queryBySeq(id);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
@@ -118,7 +119,7 @@ public class InspectionApplicationPushEventListener {
     IdxBizJgFactoryInfoMapper factoryInfoMapper;
 
     @Autowired
-    MaintenanceInfoMapper maintenanceInfoMapper;
+    IdxBizJgMaintenanceRecordInfoMapper maintenanceInfoMapper;
 
     @Autowired
     JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
@@ -249,7 +250,7 @@ public class InspectionApplicationPushEventListener {
             pushDataPipeline.setPipelineClass(applicationModel.getEquCategory());
             pushDataPipeline.setSuperviseOrgName(this.getSuperviseNameByCode(applicationModel.getApplicationUnitCode()));
             IdxBizJgProjectContraption projectContraption = this.setProjectContraptionInfo(applicationModel.getProjectContraptionId(), pushDataPipeline);
-            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel,projectContraption));
+            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel, projectContraption));
             pushDataPipeline.setTotalLength(calTotalLength(pushDataPipeline.getInspectionEquips()));
             pushDataPipeline.setTraceId(traceId + "");
             pushDataPipeline.setApplicationUnitAddress(applicationUnitAddress);
@@ -362,9 +363,11 @@ public class InspectionApplicationPushEventListener {
     }
 
     private void setMaintenanceInfo(InspectionEquipData equipData, String equipUnicode) {
-        MaintenanceInfo maintenanceInfo = maintenanceInfoMapper.selectOne(new LambdaQueryWrapper<MaintenanceInfo>()
-                .eq(AbstractEquipBaseEntity::getRecord, equipUnicode)
-                .select(MaintenanceInfo::getRecord, MaintenanceInfo::getMeUnitCreditCode, MaintenanceInfo::getMeUnitName));
+        QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord, equipUnicode)
+                .select(IdxBizJgMaintenanceRecordInfo::getRecord,IdxBizJgMaintenanceRecordInfo::getMeUnitCreditCode, IdxBizJgMaintenanceRecordInfo::getMeUnitName)
+                .orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
+        IdxBizJgMaintenanceRecordInfo maintenanceInfo = maintenanceInfoMapper.selectOne(queryWrapper);
         if (maintenanceInfo != null) {
             equipData.setMeUnitCreditCode(maintenanceInfo.getMeUnitCreditCode());
             equipData.setMeUnitName(maintenanceInfo.getMeUnitName());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -12,17 +12,18 @@ spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.max-lifetime=120000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.register-mbeans=true
 
 ## eureka properties:
 eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${spring.cloud.client.ip-address}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.20:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.20
+eureka.instance.status-page-url=http://${spring.cloud.client.ip-address}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${spring.cloud.client.ip-address}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${spring.cloud.client.ip-address}
 
 #redis properties:
 spring.redis.database=1

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

@@ -41,3 +41,6 @@ spring.main.allow-bean-definition-overriding=true
 
 # rule config
 rule.definition.model-package=com.yeejoin.amos.boot.module.jyjc.biz.rule
+
+eureka.instance.metadata-map.user.name=${spring.security.user.name}
+eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/logback-dev.xml

@@ -32,7 +32,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/logback-jcs.xml

@@ -32,7 +32,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="org.mybatis" level="DEBUG" />
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/logback-qa.xml

@@ -32,7 +32,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="org.mybatis" level="DEBUG" />
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/resources/logback-cluster.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="debug"/>
+    <logger name="org.apache.ibatis" level="debug"/>
     <logger name="org.mybatis" level="debug" />
     <logger name="java.sql.Connection" level="debug"/>
     <logger name="java.sql.Statement" level="debug"/>

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/resources/logback-dev.xml

@@ -37,7 +37,7 @@
     <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
     -->
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis" level="INFO" />
     <logger name="java.sql.Connection" level="INFO"/>
     <logger name="java.sql.Statement" level="INFO"/>