7

support/Jwt.php

@@ -74,16 +74,16 @@ class Jwt
             'score'    => 0,
             'avatar'   => '',
         ];
-        $params = array_merge($data, [
+        $params = array_merge([
             //'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
-            'nickname'  => "wx_".Random::alnum(),
+            'nickname'  => "sl_".strtolower(Random::alnum()),
             //'salt'      => Random::alnum(),
             'join_time'  => $time,
             'join_ip'    => $ip,
             'last_time' => $time,
             'last_ip'   => $ip,
             'status'    => '1'
-        ]);
+        ],$data);
         $region = Request()->post('region');
         if($region){
             $params['region'] = str_replace('+','',$region);

support/OpenImSdk/Api/Message.php

@@ -154,19 +154,19 @@ class Message
      * @param string $ex 扩展字段
      * @return array
      */
-    public function sendBusinessNotification(string $sendID, string $recvID, string $title, string $content, string $notificationUrl = '', string $ex = ''): array
+    public function sendBusinessNotification(string $sendID, string $recvID, array $data): array
     {
         // 获取管理员token
-        $adminToken = Utils::getAdminToken();
         $data = [
-            'sendID' => $sendID,
-            'recvID' => $recvID,
-            'title' => $title,
-            'content' => $content,
-            'notificationUrl' => $notificationUrl,
-            'ex' => $ex
+            'sendUserID' => $sendID,
+            'recvUserID' => $recvID,
+            'recvGroupID' => '',
+            'key'   =>  md5(time()),
+            'data'  =>json_encode($data),
+            'sendMsg'   =>  true,
+            'reliabilityLevel'   =>  1,
         ];
-        return Utils::send(Url::$sendBusinessNotification, $data, '发送业务通知失败', $adminToken);
+        return Utils::send(Url::$sendBusinessNotification, $data, '发送业务通知失败');
     }
 
     /**

support/OpenImSdk/Api/User.php

@@ -112,8 +112,6 @@ class User
      */
     public function searchNotificationAccount(string $keyword, int $pagination = 1, int $showNumber = 20): array
     {
-        // 获取管理员token
-        $adminToken = Utils::getAdminToken();
         $data = [
             'keyword' => $keyword,
             'pagination' => [
@@ -121,7 +119,7 @@ class User
                 'showNumber' => $showNumber
             ]
         ];
-        return Utils::send(Url::$searchNotificationAccount, $data, '搜索通知账号错误', $adminToken);
+        return Utils::send(Url::$searchNotificationAccount, $data, '搜索通知账号错误');
     }
 
     /**
@@ -136,19 +134,13 @@ class User
      * @param string $ex 扩展字段
      * @return array
      */
-    public function addNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', int $gender = 1, string $phoneNumber = '', string $birth = '', string $email = '', string $ex = ''): array
+    public function addNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', int $appMangerLevel = 3): array
     {
-        // 获取管理员token
-        $adminToken = Utils::getAdminToken();
         $data = [
             'userID' => $userID,
             'nickname' => $nickname,
             'faceURL' => $faceURL,
-            'gender' => $gender,
-            'phoneNumber' => $phoneNumber,
-            'birth' => $birth,
-            'email' => $email,
-            'ex' => $ex
+            'appMangerLevel' => $appMangerLevel,
         ];
         return Utils::send(Url::$addNotificationAccount, $data, '添加通知账号错误');
     }
@@ -165,21 +157,15 @@ class User
      * @param string $ex 扩展字段
      * @return array
      */
-    public function updateNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', int $gender = 1, string $phoneNumber = '', string $birth = '', string $email = '', string $ex = ''): array
+    public function updateNotificationAccount(string $userID, string $nickname = '', string $faceURL = ''): array
     {
         // 获取管理员token
-        $adminToken = Utils::getAdminToken();
         $data = [
             'userID' => $userID,
             'nickname' => $nickname,
-            'faceURL' => $faceURL,
-            'gender' => $gender,
-            'phoneNumber' => $phoneNumber,
-            'birth' => $birth,
-            'email' => $email,
-            'ex' => $ex
+            'faceURL' => $faceURL
         ];
-        return Utils::send(Url::$updateNotificationAccount, $data, '更新通知账号错误', $adminToken);
+        return Utils::send(Url::$updateNotificationAccount, $data, '更新通知账号错误');
     }
 
     /**

support/OpenImSdk/Core/Utils.php

@@ -82,7 +82,9 @@ class Utils
      * @return array 响应数据
      */
     public static function send(string $path, array $data, string $errMsg, string $token = ''): array|bool
-    {       
+    {    
+        
+        $token = $token ? $token : Utils::getAdminToken();
         $url = Url::buildUrl($path);
         //cp($url);
         $res = self::request($url, $data, $token);
@@ -100,7 +102,7 @@ class Utils
 
         try {
             $url = Url::buildUrl($path);
-            cp($url);
+            //cp($url);
             return json_decode(self::request($url, $data, $token), true);
         } catch (GuzzleException $e) {
             return ['errCode' => $e->getCode(), 'errMsg' => $errMsg, 'errDlt' => $e->getMessage()];

support/TagLib/Html.php

@@ -6,7 +6,7 @@ class Html extends \think\template\TagLib{
      * 定义标签列表
      */
     protected $tags   =  [
-        'switch'       => ['attr' => 'name,yes,no,value', 'close' => 0],
+        'switch'       => ['attr' => 'name,yes,no,value,title', 'close' => 0],
         'radio'       => ['attr' => 'name,options,value', 'close' => 0],
         'checkbox'       => ['attr' => 'name,options,value', 'close' => 0],
         'upload'       => ['attr' => 'name,value,mimetype,multiple,url,maxsize,maxcount,params', 'close' => 0]
@@ -74,6 +74,7 @@ class Html extends \think\template\TagLib{
     {
         $yes = isset($tag['yes'])?$tag['yes']:1;unset($tag['yes']);
         $no = isset($tag['no'])?$tag['no']:0;unset($tag['no']);
+        $title_text = isset($tag['title'])?$tag['title']:"开|关";unset($tag['title']);
         $value = isset($tag['value'])?$tag['value']:1;unset($tag['value']);
         $name = isset($tag['name'])?$tag['name']:'';unset($tag['name']);
         // 支持用函数传数组
@@ -82,15 +83,17 @@ class Html extends \think\template\TagLib{
         $value = $this->buildvar($value,$parseStr,'value');
         $no = $this->buildvar($no,$parseStr,'no',0);
         $yes = $this->buildvar($yes,$parseStr,'yes',1);
+        $title_text = $this->buildvar($title_text,$parseStr,'title_text','');
         $extendData = $this->buildExtendData($tag);
         $parseStr .= '<?php ';
         $parseStr .= $yes.'='.$yes.'??1;'.PHP_EOL;
         $parseStr .= $no.'='.$no.'??0;'.PHP_EOL;
         $parseStr .= $value.'='.$yes.'=='.$value .' ? '.$yes.' : '.$no.';'.PHP_EOL;
-        $parseStr .= '?><label data-role="switcher" class="lyear-switch switch-success switch-light switch-outline">';
+        $parseStr .= $title_text.'=explode("|",'.$title_text.');'.PHP_EOL;
+        $parseStr .= '?><label data-role="switcher" class="lyear-switch switch-success switch-light">';
         $parseStr .= '    <input type="hidden" data-yes="{'.$yes.'}" data-no="{'.$no.'}" id="c-{'.$name.'}" name="{'.$name.'}" value="{'.$value.'}"/>';
         $parseStr .= '    <input id="c-{'.$name.'}-switch" type="checkbox" {if '.$yes .'=='. $value.'}checked{/if} '.$extendData.' />';
-        $parseStr .= '    <span></span>';
+        $parseStr .= '    <i data-on-text="{'.$title_text.'[0]}" data-off-text="{'.$title_text.'[1]}"></i>';
         $parseStr .= '</label>';
         return $parseStr;
     }