diff --git a/build.gradle b/build.gradle
index fb29e29960..e4da99cf9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ buildscript {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
         classpath "com.mogo.sticky:service:${plugin_version}"
         classpath "io.github.knight-zxw:lancet-plugin:${lancetx_plugin_version}"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0"
         classpath 'com.mogo.cloud:matrix:1.0.0'
 //        classpath 'com.bytedance.btrace:rhea-gradle-plugin:2.0.0'
     }
diff --git a/codequality/detekt.gradle b/codequality/detekt.gradle
index ec3d539fd0..b6f417e01b 100644
--- a/codequality/detekt.gradle
+++ b/codequality/detekt.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("io.gitlab.arturbosch.detekt")  version "1.21.0"
+    id("io.gitlab.arturbosch.detekt")  version "1.15.0"
 }
 
 def pmdConfigPath = rootProject.file("codequality").path
@@ -8,9 +8,12 @@ detekt{
     //将配置文件应用于detekt的默认配置文件之上
     buildUponDefaultConfig = true
     source = files(
+            "src/main/kotlin",
             "src/main/java",
             "src/jinlvvan/java",
-            "src/driverm1/java"
+            "src/jinlvvan/kotlin",
+            "src/driverm1/java",
+            "src/driverm1/kotlin"
     )
     //规则集
     config.setFrom("${pmdConfigPath}/detekt.yml")
@@ -27,6 +30,10 @@ detekt{
 //    ignoredVariants = ["productionRelease"]
 }
 
+dependencies {
+    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0"
+}
+
 tasks.detekt.jvmTarget = "1.8"
 
 tasks.named("detekt").configure {
@@ -36,4 +43,11 @@ tasks.named("detekt").configure {
         html.required.set(true)
         html.outputLocation.set(destination)
     }
+}
+
+project.afterEvaluate {
+    if (tasks.findByName("preBuild") != null) {
+        project.preBuild.dependsOn tasks.findByName("detekt")
+        println("project.preBuild.dependsOn tasks.findByName(\"detekt\")")
+    }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
index 0132da1f0b..9162f89d09 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -150,9 +150,6 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener,
 
     private fun outOfCrossRange(){
         CallerLogger.d(M_V2X + TAG, "离开路口 , inRange:$inRange")
-        if(!inRange){
-            return
-        }
         CallerTrafficLightListenerManager.invokeEnterCrossRoad(false)
         inRange = false
         trafficLightResult = null
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
index 2337daae66..7ebb4b74a6 100644
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -1,5 +1,5 @@
 ext {
-    gradle_version = '3.5.3'
+    gradle_version = '4.0.1'
     kotlin_plugin_version = '1.5.30'
     plugin_version = '10.0.0_mogo'
     service_chain_version = '5.3.6'