Parcourir la source

Weenier utc项目部署 0625

wesmiler il y a 3 ans
Parent
commit
5910588fd2

+ 1 - 1
config/mail.php

@@ -8,7 +8,7 @@
     array (
       'transport' => 'smtp',
       'host' => 'smtp.163.com',
-      'port' => '465',
+      'port' => '25',
       'encryption' => 'ssl',
       'username' => 'wesmiler@163.com',
       'password' => 'HGXTVTQDYKWEXEKE',

+ 2 - 0
resources/lang/en/api.php

@@ -16,6 +16,7 @@ return [
     '1014'=> 'Verification code sent frequently',
     '1015'=> 'Email verification code sent failed',
     '1016'=> 'Email verification code sent successfully',
+    '1017'=> 'Verification code error',
 
     // 登录注册
     '2001'=> 'Illegal or nonexistent account',
@@ -26,6 +27,7 @@ return [
     '2006'=> 'Incorrect verification code',
     '2007'=> 'Account registration failed',
     '2008'=> 'Account registration succeeded',
+    '2009'=> 'Your account has been suspended',
 
     // 语言设置
     '2101'=> 'Language parameter error',

+ 2 - 1
resources/lang/zh-cn/api.php

@@ -16,7 +16,7 @@ return [
     '1014'=> '验证码发送频繁',
     '1015'=> '邮箱验证码发送失败',
     '1016'=> '邮箱验证码发送成功',
-
+    '1017'=> '验证码错误',
 
     // 登录注册
     '2001'=> '账号非法或不存在',
@@ -27,6 +27,7 @@ return [
     '2006'=> '验证码不正确',
     '2007'=> '注册失败',
     '2008'=> '注册成功',
+    '2009'=> '您的账号已被暂停使用',
 
     // 语言设置
     '2101'=> '语言参数错误',

+ 4 - 2
vendor/phpunit/phpunit/src/Framework/MockObject/Generator/mocked_method_void.tpl

@@ -1,6 +1,6 @@
 
     {modifier} function {reference}{method_name}({arguments_decl}){return_declaration}
-    {{deprecation}
+    {
         $__phpunit_arguments = [{arguments_call}];
         $__phpunit_count     = func_num_args();
 
@@ -14,7 +14,9 @@
 
         $this->__phpunit_getInvocationHandler()->invoke(
             new \PHPUnit\Framework\MockObject\Invocation(
-                '{class_name}', '{method_name}', $__phpunit_arguments, '{return_type}', $this, {clone_arguments}
+                '{class_name}', '{method_name}', $__phpunit_arguments, '{return_type}', $this, {clone_arguments}, true
             )
         );
+
+        call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $__phpunit_arguments);
     }