模版更新

app/Admin/Repositories/DistAdminDistributor.php

@@ -20,13 +20,25 @@ class DistAdminDistributor extends EloquentRepository
      */
     protected $eloquentClass = Model::class;
 
+    /*
+     * 清缓存
+     */
+    public static function clearCache($distId,$timeOut = 2)
+    {
+        //使用二级域名清缓存
+        $domain = self::getDomain($distId,1);
+        $url = $domain . '/?__clear_cache=1';
+        curlGet($url,$timeOut);
+    }
+
     /*
      * 得到指定分销商的域名
+     * type 0:当前域名 1:二级域名 2:自定义域名
      */
-    public static function getDomain($distId)
+    public static function getDomain($distId,$type=0)
     {
         $model = new Model();
-        return $model->getDomain($distId);
+        return $model->getDomain($distId,$type);
     }
     /*
      * 获取一个标签

app/Admin/Repositories/DistAppearance.php

@@ -60,6 +60,8 @@ class DistAppearance extends EloquentRepository
         DistAppearanceVariable::copyAppearanceVariable($appearanceId, $distId);
         //发报到正式环境
         DistAppearancePublishList::publish($appearanceId,$distId);
+        //清除缓存
+        DistAdminDistributor::clearCache($distId);
         return true;
     }
 

app/Distributor/Controllers/CacheController.php

@@ -41,9 +41,7 @@ class CacheController extends Controller
         //更新版本
         //DistAppearancePublishList::publishVersion();
         //清除缓存
-        $url = $request->input('url');
-        $url = $url . '/?__clear_cache=1';
-        curlGet($url,2);
+        DistAdminDistributor::clearCache();
         $form = new Form();
         return $form->response()->success('Success');
     }

app/Distributor/Repositories/DistAdminDistributor.php

@@ -16,14 +16,26 @@ class DistAdminDistributor extends EloquentRepository
 
 
 
+    /*
+     * 清缓存
+     */
+    public static function clearCache($timeOut = 2)
+    {
+        $domain = self::getDomain(1);
+        $url = $domain . '/?__clear_cache=1';
+        curlGet($url,$timeOut);
+    }
+
+
     /*
      * 得到当前分销商的域名
+     * type 0:当前域名 1:二级域名 2:自定义域名
      */
-    public static function getDomain()
+    public static function getDomain($type=0)
     {
         $distId = getDistributorId();
         $model = new Model();
-        return $model->getDomain($distId);
+        return $model->getDomain($distId,$type);
     }
 
     /*

app/Distributor/Repositories/DistAppearance.php

@@ -27,6 +27,8 @@ class DistAppearance extends EloquentRepository
         DistAppearanceVariable::copyAppearanceVariable($appearanceId, $distId);
         //发报到正式环境
         DistAppearancePublishList::publish($appearanceId, $distId);
+        //清除缓存
+        DistAdminDistributor::clearCache();
         return true;
     }
 

app/Models/DistAdminDistributor.php

@@ -29,13 +29,20 @@ class DistAdminDistributor extends Model
 
     /*
      * 得到分销商域名
+     * type 0:当前域名 1:二级域名 2:自定义域名
      */
-    public function getDomain($distId)
+    public function getDomain($distId,$type = 0)
     {
         $domain = '';
         $row = $this->where('id', $distId)->first();
         if ($row) {
-            if ($row->domain_type == 0) {
+            if ($type == 0) {
+                if ($row->domain_type == 0) {
+                    $domain = 'http://'.$row->secondary_domain;
+                } else {
+                    $domain = 'http://'.$row->custom_domain;
+                }
+            } else if ($type == 1) {
                 $domain = 'http://'.$row->secondary_domain;
             } else {
                 $domain = 'http://'.$row->custom_domain;