Merge branch 'qa_1.1.5_1' into dev

# Conflicts: # .idea/codeStyles/Project.xml
2020-08-31 17:41:22 +08:00
parent 937dfbbd16 0a1cc39b23
commit 72dda574d4
9 changed files with 35 additions and 20 deletions
--- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java
@@ -66,6 +66,12 @@ public interface IMogoTanluProvider extends IProvider {
     */
    String UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO = "5";

+    /**
+     * 策略上报集合
+     */
+    String[] STRATEGY_UPLOAD_TYPE_ARRAY = new String[]{UPLOAD_FROM_STRATEGY_BLOCK_AUTO,
+            UPLOAD_FROM_STRATEGY_CLOUD_CHECK, UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO};
+
    /**
     * 默认视频抓取时长
     */