From e54d86eb71133d0ade9686d459442a1a593364f3 Mon Sep 17 00:00:00 2001
From: dylan <58234511@qq.com>
Date: Mon, 5 Jun 2023 20:34:08 +0800
Subject: [PATCH] 1

---
 docker/task_before.sh | 5 +++--
 jd_sharecode.sh       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/task_before.sh b/docker/task_before.sh
index 10bdc9b..a187294 100644
--- a/docker/task_before.sh
+++ b/docker/task_before.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ## Build 20220831-001-test
-## 6dylan6_0126
+## 6dylan6_0605
 
 name_js=(
   jd_farm_help
@@ -811,6 +811,7 @@ Recombin_CK_cal(){
     ## 末尾Cookie
     combine_bottom(){
         local array_bottom i
+        echo ori_array
         if [[ $Bottom_CK && ! $jdCookie_bottom ]]; then
             bottom_ck="$(def_urldecode $Bottom_CK | perl -pe "{s|,| |g;}")"
             i=0
@@ -948,7 +949,7 @@ gen_pt_pin_array
 #JS_Deps_Replace
 TempBlock_CK
 #remove_void_ck
-if [[ -z $cookieStr ]];then
+if [[ $* != *desi* && $* != *conc* ]];then
 Recombin_CK
 fi
 combine_only
diff --git a/jd_sharecode.sh b/jd_sharecode.sh
index aaed89f..3cd9e66 100644
--- a/jd_sharecode.sh
+++ b/jd_sharecode.sh
@@ -22,7 +22,7 @@ else
     dir_code=$dir_log/6dylan6_jdpro_main_jd_sharecode
     repo='6dylan6_jdpro_main' 
 fi
-grep '6dylan6_0126' /ql/data/config/task_before.sh >/dev/null 2>&1 || grep '6dylan6_0126' /ql/config/task_before.sh > /dev/null 2>&1
+grep '6dylan6_0605' /ql/data/config/task_before.sh >/dev/null 2>&1 || grep '6dylan6_0605' /ql/config/task_before.sh > /dev/null 2>&1
 if [[ $? != 0 ]];then
  cp /ql/repo/${repo}/docker/task_before.sh /ql/config/ >/dev/null 2>&1 || cp /ql/data/repo/${repo}/docker/task_before.sh /ql/data/config/
 fi