edit

api/main.php

@@ -6,18 +6,37 @@ return array
 (
 	'reg.getMCode' => array
 	(
-		'name' => '获取验证码',
+		'name' => '获取验证码：手机号未注册',
 		'request' => array
 		(
 			'sid' => '临时id',
+			'skin' => '模板',
 		),
 		'response' => array
 		(
-			'info' => '领取信息',
+			'info' => '响应信息',
 		),
 		'order' => 100,
 		'type' => 2,
 		# 安全加密
 		'secure' => true,
 	),
+
+	'reg.getMCodeLogin' => array
+	(
+		'name' => '获取验证码：手机号已注册',
+		'request' => array
+		(
+			'sid' => '临时id',
+			'skin' => '模板',
+		),
+		'response' => array
+		(
+			'info' => '响应信息',
+		),
+		'order' => 99,
+		'type' => 2,
+		# 安全加密
+		'secure' => true,
+	),
 );

src/Lib/Base.php

@@ -99,7 +99,7 @@ class Base
         return $code->mcode;
     }
 
-    private function send($mobile, $code, $id)
+    protected function send($mobile, $code, $id = false)
     {
         $url = Dever::config('base', 'project')->mobileCode['url'];
 
@@ -117,7 +117,7 @@ class Base
         $json = Dever::config('base', 'project')->mobileCode['json'];
         $header = Dever::config('base', 'project')->mobileCode['header'];
 
-        Dever::curl($url, $param, $type, $json, $header);
+        return Dever::curl($url, $param, $type, $json, $header);
     }
 
     private function replace($content, $mobile = '', $code = '')
@@ -129,7 +129,8 @@ class Base
         } else {
             $skin = array_shift($skin);
         }
-        $config = array('{code}', '{mobile}', '{sign}', '{skin}');
+
+        $config = array('{code}', '{mobile}', '{sign}', '{skin}', '{param}');
         $replace = array($code, $mobile, Dever::config('base', 'project')->mobileCode['sign'], $skin);
         return str_replace($config, $replace, $content);
     }

src/Reg.php

@@ -4,6 +4,8 @@ namespace Passport\Src;
 use Dever;
 use Passport\Src\Lib\Base;
 
+# 所有手机发送短信操作，后续要独立成一个组件
+
 class Reg extends Base
 {
     /**
@@ -46,7 +48,15 @@ class Reg extends Base
     {
         $mobile = $this->checkMobileExists(1, true);
 
-        $msg = $this->getMcode_action($mobile);
+        $type = Dever::input('type', 'code');
+
+        if ($type == 'code') {
+            $msg = $this->getMcode_action($mobile);
+        } else {
+            $content = Dever::input('content');
+            $msg = $this->send($mobile, $content);
+        }
+        
         return $msg;
     }
 
@@ -256,7 +266,6 @@ class Reg extends Base
             Dever::load('passport/user-update', $param);
 
             if ($id > 0) {
-                return 1;
                 $this->refer();
             } else {
                 Dever::alert('修改失败');