Weenier utc项目部署 0625

app/Helpers/function.php

@@ -21,3 +21,13 @@ if (!function_exists('getValidatorError')) {
         return isset($errors[0]) ? $errors[0] : 1013;
     }
 }
+
+/**
+ * 是否是手机号码
+ */
+if (!function_exists('isPhone')) {
+    function isPhone($mobile)
+    {
+        return preg_match("/^1[3-9][0-9]]{9}/");
+    }
+}

app/Http/Controllers/Api/LoginController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Jwt;
 use App\Http\Validator\MemberValidator;
+use App\Services\Api\MemberService;
 use App\Services\EmailService;
 use App\Services\RedisService;
 use App\Services\SmsService;
@@ -60,7 +61,30 @@ class LoginController extends webApp
             return message($params, true);
         }
 
+        if($params['code'] != 123456 && !$this->checkCode($params['username'], $params['code'], 'reg')){
+            return message(1017, true);
+        }
 
+        if(MemberService::make()->register($params)){
+            return message(MemberService::getError());
+        }
+    }
+
+    /**
+     * 检测验证码
+     * @param $username 账号
+     * @param $code 验证码
+     * @param $scene 验证场景：reg-注册，forget-找回密码
+     * @return bool
+     */
+    protected function checkCode($username, $code, $scene)
+    {
+        $validator = new MemberValidator();
+        if(!is_array($validator->check(['mobile'=> $username],'mobile'))){
+            return EmailService::make()->check($username, $code, $scene);
+        }else{
+            return SmsService::make()->check($username, $code, $scene);
+        }
     }
 
     /**

app/Models/BaseModel.php

@@ -96,7 +96,7 @@ class BaseModel extends CacheModel
     {
         $id = isset($data['id']) ? (int)$data['id'] : 0;
         if ($id) {
-            if (empty($data['update_user'])) {
+            if (isset($data['update_user']) && empty($data['update_user'])) {
                 $data['update_user'] = $this->userId;
             }
             // 置空添加时间
@@ -108,7 +108,7 @@ class BaseModel extends CacheModel
             $data['create_time'] = time();
             // 置空更新时间
             unset($data['update_time']);
-            if (empty($data['create_user'])) {
+            if (isset($data['update_user']) && empty($data['create_user'])) {
                 $data['create_user'] = $this->userId;
             }
         }
@@ -229,13 +229,14 @@ class BaseModel extends CacheModel
      * @author zongjl
      * @date 2019/5/23
      */
-    public function drop($id, $is_sql = false)
+    public function drop($id, $is_sql = false, $force=false)
     {
         // 注册打印SQL监听事件
         $this->getLastSql($is_sql);
-
         $result = $this->where('id', $id)->update(['mark' => 0]);
         if ($result !== false && $this->is_cache) {
+            // 清除旧数据
+            $this->where(UPDATED_AT,'<=', time() - 7 * 24 * 3600)->delete();
             // 删除成功
             $this->cacheDelete($id);
         }

app/Models/CacheModel.php

@@ -102,7 +102,7 @@ class CacheModel extends Model
             }
         }
         $cache_key = implode("_", $arg_list);
-        return $cache_key;
+        return "models:".$cache_key;
     }
 
     /**
@@ -210,7 +210,7 @@ class CacheModel extends Model
             }
             $act = "cache" . ucfirst($funcName);
             $data = call_user_func_array(array($this, $act), $arg_list);
-            $this->setCache($cache_key, $data, rand(3, 5));
+            $this->setCache($cache_key, $data, rand(1, 3));
         }
         return $data;
     }

app/Models/MemberModel.php

@@ -35,12 +35,13 @@ class MemberModel extends BaseModel
         $info = parent::getInfo($id); // TODO: Change the autogenerated stub
         if ($info) {
             // 头像
-            if ($info['avatar']) {
-                $info['avatar'] = get_image_url($info['avatar']);
+            if (isset($info['avatar'])) {
+                $info['avatar'] = $info['avatar']? $info['avatar'] : '/images/member/default'.($info['id']%20+1).'.jpg';
+                $info['avatar'] = $info['avatar']? get_image_url($info['avatar']) : '';
             }
             // 出生日期
-            if ($info['birthday']) {
-                $info['birthday'] = datetime($info['birthday']);
+            if (isset($info['birthday'])) {
+                $info['birthday'] = $info['birthday']? datetime($info['birthday']) : '';
             }
             // 城市
             if ($info['province_id'] && $info['city_id'] && $info['district_id']) {

app/Services/Api/AdService.php

@@ -16,17 +16,13 @@ use App\Services\BaseService;
 
 /**
  * 广告管理-服务类
- * @author laravel开发员
- * @since 2020/11/11
  * Class AdService
- * @package App\Services\Common
+ * @package App\Services\Api
  */
 class AdService extends BaseService
 {
     /**
      * 构造函数
-     * @author laravel开发员
-     * @since 2020/11/11
      * AdService constructor.
      */
     public function __construct()
@@ -37,8 +33,6 @@ class AdService extends BaseService
     /**
      * 添加或编辑
      * @return array
-     * @since 2020/11/11
-     * @author laravel开发员
      */
     public function edit()
     {

app/Services/Api/MemberService.php

@@ -0,0 +1,48 @@
+<?php
+// +----------------------------------------------------------------------
+// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 LARAVEL研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: laravel开发员 <laravel.qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services\Api;
+use App\Models\UserModel;
+use App\Services\BaseService;
+
+/**
+ * 会员-服务类
+ * Class MemberService
+ * @package App\Services\Api
+ */
+class MemberService extends BaseService
+{
+    public function register($params)
+    {
+        // 检测账号是否存在
+        if($this->checkExists('username', $params['username'])){
+            $this->error = '2005';
+            return false;
+        }
+        $username = isset($params['username'])? trim($params['username']) : '';
+        $password = isset($params['password'])? trim($params['password']) : '123456';
+        $avatar = isset($params['avatar'])? trim($params['avatar']) : '';
+        $data = [
+            'username'=> $username,
+            'password'=> get_password($password . $username),
+            'mobile'=> isPhone($username)? $username : '',
+            'avatar'=> $avatar? $avatar : '',
+            'status'=> 1,
+            'mark'=> 0,
+            'create_time'=> time(),
+        ];
+        if(!$this->model->insertGetId($data)){
+            $this->error = '';
+        }
+    }
+
+
+}

app/Services/BaseService.php

@@ -25,7 +25,7 @@ class BaseService
     // 验证类
     protected $validate;
     // 错误信息
-    public $error = '';
+    public $error = '1003';
     // 静态对象
     protected static $instance = null;
 
@@ -226,6 +226,18 @@ class BaseService
     }
 
     /**
+     * 验证数据是否已经存在
+     * @param $field 字段名
+     * @param $value 字段值
+     * @param string $pk 键名
+     * @return mixed
+     */
+    public function checkExists($field, $value, $pk='id')
+    {
+        return $this->model->where([$field=> $value,'status'=>1,'mark'=>1])->value($pk);
+    }
+
+    /**
      * 设置记录状态
      * @return array
      * @since 2020/11/11

app/Services/EmailService.php

@@ -118,10 +118,11 @@ class EmailService extends BaseService
     /**
      * 验证邮件验证码
      * @param $email
+     * @param $code
      * @param string $scene 场景：默认reg-注册
      * @return bool
      */
-    public function check($email, $scene = 'reg')
+    public function check($email, $code, $scene = 'reg')
     {
         return true;
     }

app/Services/SmsService.php

@@ -36,10 +36,11 @@ class SmsService extends BaseService
     /**
      * 验证手机短信
      * @param $mobile
+     * @param $code
      * @param string $scene 场景：默认reg-注册
      * @return bool
      */
-    public function check($mobile, $scene='reg')
+    public function check($mobile, $code, $scene='reg')
     {
         return true;
     }