规范Session配置参数

php-sword · Sep 14, 2021 · 93f02a6 · 93f02a6
1 parent cec044f
commit 93f02a6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/App/WebSocket/Base.php b/App/WebSocket/Base.php
@@ -16,22 +16,24 @@ class Base extends Controller
     /**
      * Session操作
      * @param string $key
-     * @param string $data
+     * @param mixed $data
      * @return bool|mixed|null
      * @throws \EasySwoole\Redis\Exception\RedisException
      */
     public function session(string $key = SWORD_NULL, $data = SWORD_NULL)
     {
         $args = $this->caller()->getArgs();
 
-        $sname = config('session.sessionName');
-        if(empty($args[$sname])){
+        $name = config('session.session_name');
+        if(empty($args[$name])){
             return false;
         }
 
-        if(empty($args[$sname])) return false;
+        if(empty($args[$name])) return false;
 
-        $value = cache($args[$sname]);
+        $token = $args[$name];
+
+        $value = cache($token);
         if(!$value) return false;
 
         if($key == SWORD_NULL){
@@ -40,10 +42,10 @@ public function session(string $key = SWORD_NULL, $data = SWORD_NULL)
             return $value[$key] ?? null;
         }elseif($data == null){
             unset($value[$key]);
-            cache($args[$sname], $value);
+            cache($token, $value);
         }else{
             $value[$key] = $data;
-            cache($args[$sname], $value);
+            cache($token, $value);
         }
         return true;
     }
@@ -56,11 +58,11 @@ public function sessionId()
     {
         $args = $this->caller()->getArgs();
 
-        $sname = config('session.sessionName');
-        if(empty($args[$sname])){
+        $name = config('session.session_name');
+        if(empty($args[$name])){
             return false;
         }
-        return $args[$sname];
+        return $args[$name];
     }
 
     /**
@@ -88,8 +90,18 @@ public function withData(int $code = 0, string $msg = '', $result = [], int $cou
             $ret['ES_TOKEN'] = $args['ES_TOKEN'];
         }
 
-        $this->response()->setMessage(json_encode($ret));
+        $this->responseImmediately(json_encode($ret));
         return true;
     }
 
+    /**
+     * 获取上传数据
+     * @return array
+     */
+    public function input(): array
+    {
+        $args = $this->caller()->getArgs();
+        return $args['data']??[];
+    }
+
 }
diff --git a/Config/session.php b/Config/session.php
@@ -5,6 +5,6 @@
 return [
     'enable'      => true, //启用Session
     'type'        => 'file', //储存驱动 redis、file
-    'sessionName' => 'sessionId', //Session的CookieName
+    'session_name' => 'sessionId', //Session的CookieName
     'expire'      => 86400 * 7 //过期时间 s
 ];
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ php sword server stop
 
 ## 项目结构
 ```
-PATH  部署目录
+PATH  项目根目录
 ├─App           应用目录
 │  ├─HttpController      Http控制器
 │  ├─WebSocket           WebSocket控制器