Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

addons/fastim/library/Common.php

@@ -1578,7 +1578,8 @@ class Common
 
         $imUser = [
             'avatar'     => 'zpupload/20230911/bfc12ff4011731d7b4.jpeg',
-            'nickname'   => CommonCode::buildTouristNickname($imUserId),
+//            'nickname'   => CommonCode::buildTouristNickname($imUserId),
+            'nickname'   => create_nickname(rand(1,2)),
             'referrer'   => $referrer,
             'token'      => $token,
             'loginip'    => $loginip,

application/api/controller/Sms.php

@@ -60,7 +60,7 @@ class Sms extends Api
 //        $ret = Smslib::send($mobile, null, $event);
         $ret = DxSms::sendCodeSms($mobile,$event);
         if ($ret) {
-            $this->success(__('发送成功'));
+            $this->success(__('发送成功'),$ret);
         } else {
             $this->error(__('发送失败，请检查短信配置是否正确'));
         }

application/lib/sms/DxSms.php

@@ -37,7 +37,7 @@ class DxSms
             Log::write("错误", json_encode($e));
             return false;
         }
-        return true;
+        return ['msg' =>'success','sms_code' =>$code];
 
     }
 }
\ No newline at end of file