Basics

php-sword · Jan 8, 2021 · 836f7b0 · 836f7b0
1 parent 7b887d6
commit 836f7b0
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 69 deletions.
diff --git a/App/HttpController/BaseController.php b/App/HttpController/BaseController.php
@@ -34,23 +34,21 @@ public function input(string $type = '')
     }
 
     //获取Session对象
-    public function session(string $key, $data = 'SWORD_GET')
+    public function session(string $key, $data = SWORD_NULL)
     {
         $session = Session::getInstance();
 
-        if($data == 'SWORD_GET'){
+        if($data === SWORD_NULL){
             $d = $session->get($key);
             if($d){
                 return $d;
-                // return unserialize($d);
             }else{
                 return null;
             }
         }elseif($data == null){
             $session->del($key);
         }else{
             $session->set($key, $data);
-            // $session->set($key,serialize($data));
         }
 
     }
@@ -130,7 +128,7 @@ public function withData(int $code = 0, string $msg = '', $result = [], int $cou
         if($count >= 0) $ret['count'] = $count;
 
         $this->response()->withHeader('Content-type','application/json;charset=utf-8');
-        $this->response()->withHeader('Access-Control-Allow-Origin','*'); //*.kyour.cn
+        $this->response()->withHeader('Access-Control-Allow-Origin','*');
         $this->write(json_encode($ret));
 
         return true;

diff --git a/App/HttpController/Index/Index.php b/App/HttpController/Index/Index.php
@@ -1,16 +1,27 @@
 <?php declare(strict_types=1);
 namespace App\HttpController\Index;
 
-// use App\Common\Utils;
-use App\Model\Identity;
-use EasySwoole\Validate\Validate;
 
-class Index extends BaseAuth
+use App\HttpController\BaseController;
+
+class Index extends BaseController
 {
-    public $authRule = [];
 
-    //项目首页
     public function index()
+    {
+        //直接输出
+        $this->response()->write('hello php-sword!');
+    }
+
+    public function jsonData()
+    {
+        //读取静态文件返回
+        $this->withData(0, 'hello world!', [
+            'tip' => 'json data'
+        ]);
+    }
+
+    public function html()
     {
         //读取静态文件返回
         $this->fetch('index', [], 'raw');

diff --git a/App/WebSocket/Index.php b/App/WebSocket/Index.php
@@ -3,12 +3,6 @@
 
 use EasySwoole\Socket\AbstractInterface\Controller;
 
-use EasySwoole\Session\Session;
-
-use App\WebSocket\Base;
-
-use App\Model\User as UserModel;
-
 /**
  * Class Index
  *
@@ -25,15 +19,7 @@ public function heart()
         $param = $this->caller()->getArgs();
         $base = new Base($param, $this->response());
 
-        $s_user = $base->session('user');
-        //判断是否在别处登录
-        if($s_user){
-            $token = UserModel::create()->where('id', $s_user['id'])->val('token');
-            if($token != $base->sessionId()){
-                //清空session
-                $base->session('user', null);
-            }
-        }
+        $base->withData(0, 'success',['data' => 'hello world!']);
     }
 
 }
diff --git a/App/WebSocket/Index/Index.php b/App/WebSocket/Index/Index.php
@@ -1,17 +1,13 @@
 <?php
 namespace App\WebSocket\Index;
 
-use App\Model\Article;
-use App\Model\UserFollow;
 use EasySwoole\Socket\AbstractInterface\Controller;
 
 use App\WebSocket\Base;
-use EasySwoole\Mysqli\QueryBuilder;
-
-use App\Model\User as UserModel;
 
 /**
- * 前端帖子相关
+ * Class User
+ * @package App\WebSocket\Index
  */
 class User extends Controller
 {
@@ -21,7 +17,7 @@ public function getInfo()
         $args = $this->caller()->getArgs();
         $base = new Base($args, $this->response());
 
-        $base->withData(0, 'success',['data' => 'hello wlord!']);
+        $base->withData(0, 'success',['data' => 'hello world!']);
     }
 
 }
diff --git a/Config/app.php b/Config/app.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * 应用的配置信息
+ * 通过config('app.xx')获取
+ */
+return [
+    // 系统时区
+    'timezone' => 'Asia/Shanghai',
+    // 启用调试模式
+    'debug' => true,
+
+    //===========其他配置===========
+
+    // 应用名 -保证唯一性，避免在同一机器上运行相同的应用
+    'app_name' => 'sword',
+
+    // 服务器域名
+    'host' => 'youhost.cn',
+    // 资源服务器域名
+    'res_host' => 'res.youhost.cn'
+
+];
diff --git a/Config/database.php b/Config/database.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * 数据库连接配置
+ * 通过config('database.xx')获取
+ */
+return [
+    'host'      => '127.0.0.1', //服务器地址
+    'port'      => 3306,    //端口
+    'user'      => 'user',  //用户名
+    'password'  => 'pass',  //密码
+    'charset'   => 'utf8',  //编码
+    'name'      => 'dbname',  //数据库名
+
+];
diff --git a/Config/redis.php b/Config/redis.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * redis连接配置
+ */
+return [
+    'host'      => '127.0.0.1', //服务器地址
+    'port'      => 6379,    //端口
+    'password'  => '',  //密码
+    'db'        => 0 //默认数据库 0-12
+];
diff --git a/EasySwooleEvent.php b/EasySwooleEvent.php
@@ -40,19 +40,19 @@ public static function initialize()
 
         // -------------------- HTTP --------------------
         //onRequest事件
-        Di::getInstance()->set(SysConst::HTTP_GLOBAL_ON_REQUEST,function (Request $request,Response $response){
-
-            //启用Session会话
-            $session_conf = config('session');
-            $cookie = $request->getCookieParams($session_conf['sessionName']);
-            if(empty($cookie)){
-                $sid = Session::getInstance()->sessionId();
-                $response->setCookie($session_conf['sessionName'], $sid, time() + $session_conf['expire']);
-            }else{
-                Session::getInstance()->sessionId($cookie);
-            }
-            return true;
-        });
+//        Di::getInstance()->set(SysConst::HTTP_GLOBAL_ON_REQUEST,function (Request $request,Response $response){
+//
+//            //启用Session会话
+//            $session_conf = config('session');
+//            $cookie = $request->getCookieParams($session_conf['sessionName']);
+//            if(empty($cookie)){
+//                $sid = Session::getInstance()->sessionId();
+//                $response->setCookie($session_conf['sessionName'], $sid, time() + $session_conf['expire']);
+//            }else{
+//                Session::getInstance()->sessionId($cookie);
+//            }
+//            return true;
+//        });
 
         // 注册异常处理
         Di::getInstance()->set(SysConst::HTTP_EXCEPTION_HANDLER, [ExceptionHandler::class,'handle']);

diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
 * 支持更多的`PSR`规范
 * 基于Swoole常驻内存
 * 协程TCP、UDP、WEB_SOCKET 服务端
+* 严格的版本控制
 
 ## 安装
 安装Composer，请先确保正确安装php并配置了环境变量。

diff --git a/composer.json b/composer.json
@@ -1,13 +1,8 @@
 {
     "name": "php-sword/sword",
-    "description": "The phpSword Framework.",
+    "description": "The PhpSword Framework.",
     "type": "project",
-    "keywords": [
-        "php",
-        "swoole",
-        "easyswoole",
-        "sword"
-    ],
+    "keywords": ["php", "swoole", "easyswoole", "sword"],
     "license": "Apache-2.0",
     "authors": [
         {
@@ -16,7 +11,7 @@
         }
     ],
     "require": {
-        "easyswoole/easyswoole": "^3.4",
+        "php-sword/framework": "^0.0",
         "ext-redis": "*"
     },
     "autoload": {
@@ -25,4 +20,4 @@
             "Sword\\": "Sword-Dev/"
         }
     }
-}
+}
diff --git a/dev.php b/dev.php
@@ -1,26 +1,32 @@
 <?php
+/**
+ * EasySwoole框架配置信息
+ *
+ */
 return [
     'SERVER_NAME' => "EasySwoole",
     'MAIN_SERVER' => [
         'LISTEN_ADDRESS' => '0.0.0.0',
-        'PORT' => 8105,
-        'SERVER_TYPE' => EASYSWOOLE_WEB_SOCKET_SERVER, //可选为 EASYSWOOLE_SERVER  EASYSWOOLE_WEB_SERVER EASYSWOOLE_WEB_SOCKET_SERVER,EASYSWOOLE_REDIS_SERVER
+        'PORT' => 8100,
+        'SERVER_TYPE' => EASYSWOOLE_WEB_SERVER, //可选为 EASYSWOOLE_SERVER  EASYSWOOLE_WEB_SERVER EASYSWOOLE_WEB_SOCKET_SERVER,EASYSWOOLE_REDIS_SERVER
         'SOCK_TYPE' => SWOOLE_TCP,
         'RUN_MODEL' => SWOOLE_PROCESS,
+
+        // Swoole配置信息
         'SETTING' => [
             'worker_num' => 8,
             'reload_async' => true,
             'max_wait_time'=> 3,
 
-            //兼容文件上传最大值
-            'package_max_length' => 20 * 1024 * 1024
+            // 兼容文件上传最大值
+            // 'package_max_length' => 20 * 1024 * 1024
         ],
         'TASK' => [
             'workerNum' => 4,
             'maxRunningNum' => 128,
             'timeout' => 15
         ]
     ],
-    'TEMP_DIR' => null,
+    'TEMP_DIR' => './Temp',
     'LOG_DIR' => './Temp/Log'
 ];
diff --git a/nginx_make.php b/nginx_make.php
@@ -2,7 +2,7 @@
 <?php
 /**
  * 因为nginx配置代理、ssl、websocket较为复杂 所以编写了这个工具。
- * 用法：1.在$config变量中配置你的信息
+ * 用法： 1.在$config变量中配置你的信息
  *       2.在该目录运行命令 ./nginx_make.php
  *       3.在该目录会自动生成 nginx.conf,这个文件就是配置文件，将它添加到nginx中
  *       4.重启nginx服务器即可
@@ -18,19 +18,19 @@
     //https端口 第一个是外网端口，第二个是内网服务端口
     'https_port' => [443, 8105],
     //外网访问域名 多个用空格分割
-    'host_name' => 'www.xoshe.cn xoshe.cn xo.kyour.cn',
+    'host_name' => 'sword.kyour.cn',
     //应用根目录 绝对路径，以/结尾
-    'root_path' => '/data/www/xoshe/',
+    'root_path' => __DIR__, //默认当前路径
     //静态资源目录名称
     'public_path' => 'Public',
 
-    //websocket的url,为空则不开启,不支持填写'/'
-    'ws_url' => '/ws',
+    //websocket的url,如:'/ws',为空则不开启,不支持填写'/'
+    'ws_url' => '',
 
     //https的ssl证书文件（绝对路径） -仅开启https有效
-    'ssl_cer' => '/data/www/xoshe/ssl/fullchain.cer',
+    'ssl_cer' => '/data/www/sword/ssl/fullchain.cer',
     //https的ssl密钥文件（绝对路径） -仅开启https有效
-    'ssl_key' => '/data/www/xoshe/ssl/mk.kyour.cn.key',
+    'ssl_key' => '/data/www/sword/ssl/ssl.key',
 
     //图片缓存时间
     'img_cache' => '3d',

diff --git a/sword b/sword
@@ -1,10 +1,41 @@
 #!/usr/bin/env php
 <?php
-
 /**
  * Easyswoole命令行
  * 启动服务：./sword server start
  * 常驻内存：./sword server start -d
  * 停止服务：./sword server stop
  */
-require_once "./vendor/bin/easyswoole";
+
+use EasySwoole\EasySwoole\Command\CommandRunner;
+use EasySwoole\Command\Caller;
+
+$file = __DIR__ . '/vendor/autoload.php';
+
+if (file_exists($file)) {
+    require $file;
+}else{
+    die("include composer autoload.php fail\n Please run: composer install\n");
+}
+
+$realCwd = substr(realpath($file),0,-strlen("/vendor/autoload.php"));
+
+defined('IN_PHAR') or define('IN_PHAR', boolval(\Phar::running(false)));
+defined('RUNNING_ROOT') or define('RUNNING_ROOT', $realCwd);
+defined('EASYSWOOLE_ROOT') or define('EASYSWOOLE_ROOT', IN_PHAR ? \Phar::running() : $realCwd);
+
+if(file_exists(EASYSWOOLE_ROOT.'/bootstrap.php')){
+    require_once EASYSWOOLE_ROOT.'/bootstrap.php';
+}
+
+$caller = new Caller();
+$caller->setScript(current($argv));
+$caller->setCommand(next($argv));
+$caller->setParams($argv);
+reset($argv);
+
+$ret = CommandRunner::getInstance()->run($caller);
+if($ret && !empty($ret->getMsg())){
+    echo $ret->getMsg()."\n";
+}
+