Merge branch 'master' of http://mindant.cn:9999/ice/haishi

application/Appapi/Controller/AuthController.class.php

@@ -7,7 +7,6 @@ use Common\Controller\HomebaseController;
 class AuthController extends HomebaseController {
 class AuthController extends HomebaseController {
 
 
 	public function index(){
 	public function index(){
-	    var_dump(sendTip());
 		$uid=I("uid");
 		$uid=I("uid");
 		$token=I("token");
 		$token=I("token");
 		if( !$uid || !$token || checkToken($uid,$token)==700 ){
 		if( !$uid || !$token || checkToken($uid,$token)==700 ){

application/Common/Common/function.php

@@ -2481,14 +2481,12 @@ function sp_delete_physics_img($imglist){
         require_once API_ROOT.'/../sdk/ChuanglanSmsApi.php';
         require_once API_ROOT.'/../sdk/ChuanglanSmsApi.php';
         $clapi  = new ChuanglanSmsApi();
         $clapi  = new ChuanglanSmsApi();
 //        $msg = '【海狮live】有新的主播申请认证，请您尽快登录后台进行审核！';
 //        $msg = '【海狮live】有新的主播申请认证，请您尽快登录后台进行审核！';
-        $msg = '【海狮live】您的验证码为test，请您尽快填写！';
+        $msg = '【海狮live】您的验证码为审核通知，请您尽快填写！';
         $result = $clapi->sendSMS($m, $msg);
         $result = $clapi->sendSMS($m, $msg);
 //        $result = $clapi->sendVariableSMS($msg, $params);
 //        $result = $clapi->sendVariableSMS($msg, $params);
 
 
         if(!is_null(json_decode($result))){
         if(!is_null(json_decode($result))){
             $output=json_decode($result,true);
             $output=json_decode($result,true);
-            var_dump($output);
-            die;
             if(isset($output['code'])  && $output['code']=='0'){
             if(isset($output['code'])  && $output['code']=='0'){
                 return $rs;
                 return $rs;
             }else{
             }else{