Merge branch 'develop'

app/controller/IndexController.php

@@ -5,32 +5,35 @@ namespace app\controller;
 use app\common\model\User;
 use app\common\model\UserRoles;
 use app\common\model\UserSystems;
+use app\common\utils\scaffold\Generate;
 use support\Request;
 use support\Db;
 use support\Cache;
+use app\inquiry\service\InquiryLogService;
 
 class IndexController
 {
 
-    protected $noNeedLogin = ['index', 'view', 'perm'];
+    protected $noNeedLogin = ['index', 'view', 'perm', 'createResource', 'test'];
+
+    protected $noNeedHeaderData = ['index', 'view', 'perm', 'createResource', 'test'];
   
     public function index(Request $request)
     {
         return htmlpage();
     }
 
+    /**
+     * 调试飞书
+     */
     public function view(Request $request)
     {
         return view('index/qrcode', ['name' => 'webman']);
     }
 
-    public function json(Request $request)
-    {
-        return json(['code' => 0, 'msg' => 'ok']);
-    }
-
-
-    // 临时增加用户权限
+    /**
+     * 临时增加用户权限
+     */
     public function perm(Request $request)
     {
         try { 
@@ -62,13 +65,59 @@ class IndexController
         }
     }
 
-
-    // test function
-    public function test(Request $request)
+    /**
+     * 生成资源
+     */
+    public function createResource()
     {
-        $user = User::find(1);
-        $user->roles()->sync([1]);
-        $user->systems()->sync([1]);
-        return json(['code' => 0, 'msg' => 'success']);
+        $options = [
+            // 'controller'    => [
+            //     'module'    => 'inquiry',
+            //     'name'      => 'country'
+            // ],
+            'model'         => [
+                'module'    => 'common',
+                'name'      => 'crm_customer'
+            ],
+            // 'service'       => [
+            //     'module'    => 'inquiry',
+            //     'name'      => 'country'
+            // ],
+            // 'logic'         => [
+            //     'module'    => 'inquiry',
+            //     'name'      => 'country'
+            // ],
+            // 'validate'      => [
+            //     'module'    => 'inquiry',
+            //     'name'      => 'country'
+            // ],
+            'table'         => 'crm_customer'
+        ];
+
+        $result = (new Generate($options))->doGenerate();
+        return $result;
+    }
+
+
+    public function test()
+    {
+        // $res = ['id'=>25714];
+        // \Webman\RedisQueue\Redis::send('inquiry-to-crm', $res);
+
+        // $res = [
+        //     'id'=>25717,
+        //     'category'=>'inquiry',
+        //     'scene'=>'inquiry-person-allocation',
+        //     'receive_type'=>'person'
+        // ];
+
+        // $res = [
+        //     'id'=>1,
+        //     'category'=>'crm',
+        //     'scene'=>'crm-person-follow-up',
+        //     'receive_type'=>'person'
+        // ];
+        // \Webman\RedisQueue\Redis::send('feishu-message', $res);
+        return 'success';
     }
 }