Merge branch 'master' of http://114.215.101.231:8099/panhaowen/caiji

@@ -4,3 +4,4 @@
 .settings
 .settings
 .idea
 .idea
 composer.lock
 composer.lock
+data/runtime/cache/c1/4bdd3071f2fb157aceabb720495fd0.php

+# 定义 stages
+stages:
+  - pull
+
+# 定义 job
+job1:
+  stage: pull
+  script:
+    - cd /alidata/www/w/caiji/
+    - git pull

@@ -24,6 +24,7 @@ class IndexController extends HomeBaseController
 
 
     public function caiji(){
     public function caiji(){
         $param=$this->request->param('url');
         $param=$this->request->param('url');
+        dump($param);
         $rules1 = array(
         $rules1 = array(
             //采集标题
             //采集标题
             'header' => array(':header','text'),
             'header' => array(':header','text'),

+<?php	return array (
+  'wechat' =>
+  array (
+    'origin_id' => 'gh_bef62bd5831f',
+    'debug' => true,
+    'app_id' => 'wx44ea987d97dcc17b',
+    'secret' => 'b7099625d2064af384814815fe105069',
+    'token' => 'helloetsy',
+    'aes_key' => 'aCn9BPZVSdgDrBNLmQJasYlvHXlDnkVh0XKeI3bAVs9',
+    'log' =>
+    array (
+      'level' => 'debug',
+      'permission' => 511,
+      'file' => '../data/runtime/log/easywechat.log',
+    ),
+    'oauth' =>
+    array (
+      'scopes' =>
+      array (
+        0 => 'snsapi_userinfo',
+      ),
+      'callback' => '/examples/oauth_callback.php',
+    ),
+    'payment' =>
+    array (
+      'merchant_id' => '1502905831',
+      'key' => '458f7451b8ac8b3d9b64e347af8cde17',
+      'cert_path' =>  ROOT_PATH.'data/cert/apiclient_cert.pem',
+      'key_path' => ROOT_PATH.'data/cert/apiclient_key.pem',
+    ),
+    'guzzle' =>
+    array (
+      'timeout' => 3,
+    ),
+  ),
+  'domain' =>
+  array (
+    'url' => 'http://v.wj090.com',
+    'bizid' => '11805',
+    'appid' => '1253387319',
+    'fangkey' => '01f6ba87fe4f4172f5bca13ae5a038a5',
+    'apikey' => '2b16060ae9f66005fae0be1adaee9c9b',
+  ),
+  'sms' =>
+  array (
+    'key' => '',
+    'secret' => '',
+  ),
+  'ali' =>
+  array (
+    'videohost' => 'rtmp://video-center.alivecdn.com',
+    'appName' => 'AppName',
+    'streamName' => 'StreamName',
+    'privateKey' => 'odFHSYiN3O',
+    'vhost' => 'push.elives.com.cn',
+  ),
+);