commie/im
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4

Browse Source
This commit is contained in:
commie
2025-12-24 16:59:05 +08:00
parent b52a51c09b
commit b68946fe79
218 changed files with 10790 additions and 3878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
support/Jwt.php
+10 -3
View File
@@ -75,7 +75,8 @@ class Jwt
'avatar' => '',
];
$params = array_merge($data, [
'nickname' => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
//'nickname' => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
'nickname' => "wx_".Random::alnum(),
//'salt' => Random::alnum(),
'join_time' => $time,
'join_ip' => $ip,
@@ -83,6 +84,10 @@ class Jwt
'last_ip' => $ip,
'status' => '1'
]);
$region = Request()->post('region');
if($region){
$params['region'] = str_replace('+','',$region);
}
$params['password'] = \plugin\admin\app\common\Util::passwordHash($password);
$params = array_merge($params, $extend);
@@ -102,9 +107,9 @@ class Jwt
}
$_token = \support\Jwt\JwtToken::generateToken($user->toArray());
$user->token = $_token['access_token'];
Db::commit();
//注册成功的事件
Hook("user.register_successed", $user);
Db::commit();
return self::getUserinfo($user);
} catch (\Exception $e) {
Db::rollback();
@@ -130,7 +135,9 @@ class Jwt
* @var User $user
* */
if($field=='mobile'){
$user = User::where($field , $account)->where('region',Request()->post('region'))->find();
$region = Request()->post('region');
$region = str_replace('+','',$region);
$user = User::where($field , $account)->where('region',$region)->find();
}else{
$user = User::where($field , $account)->find();
}
support/OpenImSdk/Api/Auth.php
+6 -5
View File
@@ -27,30 +27,31 @@ class Auth
* 获取用户token
* 直接从服务器获取，不使用缓存
* @param string $userID 用户ID
* @param int $platformID 平台ID，默认为1
* @param string $platformID 平台ID，默认为android
* @return array
*/
public function getUserToken(string $userID, int $platformID = 1): array
public function getUserToken(string $userID, string $platformID = 'android'): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$platformID = Utils::getPlatformId( $platformID );
return Utils::send(Url::$getUserToken, ['userID' => $userID, 'platformID' => $platformID], '获取用户token错误', $adminToken);
}
/**
* 强制登出
* @param string $userID 要登出的用户ID
* @param int $platformID 平台ID，默认为1
* @param string $platformID 平台ID，默认为android
* @return array
*/
public function forceLogout(string $userID, int $platformID = 1): array
public function forceLogout(string $userID, string $platformID = 'android'): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
// 清除本地缓存的用户token
Utils::clearToken($userID);
$platformID = Utils::getPlatformId( $platformID );
return Utils::send(Url::$forceLogout, ['userID' => $userID, 'platformID' => $platformID], '强制登出错误', $adminToken);
}
support/OpenImSdk/Api/User.php
+5 -2
View File
@@ -92,11 +92,14 @@ class User
* @param array $data 用户信息
* @return array
*/
public function updateUserInfo(string $userID, array $data): array
public function updateUserInfo(string $userID, array $data): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = array_merge(['userID' => $userID], $data);
$data = [
'userInfo' => $data
];
return Utils::send(Url::$updateUserInfo, $data, '修改用户信息错误', $adminToken);
}
@@ -244,7 +247,7 @@ class User
* @param string $faceURL 头像地址
* @return array
*/
public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array
public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
support/OpenImSdk/Core/Utils.php
+26 -4
View File
@@ -85,7 +85,10 @@ class Utils
{
$url = Url::buildUrl($path);
//cp($url);
$res = json_decode(self::request($url, $data, $token), true);
$res = self::request($url, $data, $token);
//cp($data);
//cp($res);
$res = json_decode($res, true);
if($res['errCode'] !==0 ){
throw new \Exception($res['errMsg'],$res['errCode']);
//throw new \Exception($res['errDlt'],$res['errCode']);
@@ -139,10 +142,10 @@ class Utils
* 获取用户Token
* 如果缓存中没有，则自动获取并缓存
* @param string $userID 用户ID
* @param int $platformID 平台ID
* @param string $platformID 平台ID
* @return string|null
*/
public static function getUserToken(string $userID, int $platformID = 1): ?string
public static function getUserToken(string $userID, string $platformID = 'android'): ?string
{
$tokenManager = self::getTokenManager();
$token = $tokenManager->getUserToken($userID);
@@ -156,7 +159,7 @@ class Utils
$result = self::send(Url::$getUserToken, [
'userID' => $userID,
'platformID' => $platformID
'platformID' => self::getPlatformId($platformID)
], '获取用户Token失败', $adminToken);
$token = $result['token'];
@@ -181,4 +184,23 @@ class Utils
{
return self::getTokenManager()->clearToken($userID, $isAdmin);
}
public static function getPlatformId($name=''): int{
$arr = [
'ios' => 1,
'android' => 2,
'windows' => 3,
'macos' => 4,
'web' => 5,
'mp-weixin' => 6,
'linux' => 7,
'androidpad' => 8,
'ipad' => 9,
'admin' => 10,
];
$name = strtolower($name);
if(isset($arr[$name])){
return $arr[$name];
}
return 2;
}
}
support/TagLib/Html.php
+2 -2
View File
@@ -39,7 +39,7 @@ class Html extends \think\template\TagLib{
$parseStr .= '<ul class="list-inline clearfix lyear-uploads-pic" data-template="preview" id="p-{'.$name.'}">';
$parseStr .= ' <li nodelete class="col-xs-4 col-sm-3 col-md-2">';
$parseStr .= ' <a class="pic-add faupload" style="height: auto;border: 0;"';
$parseStr .= ' permission="app.admin.upload.avatar" id="add-pic-btn" href="#!" title="点击上传"';
$parseStr .= ' permission="app.admin.files.upload" id="add-pic-btn" href="#!" title="点击上传"';
$parseStr .= ' data-input-id="c-{'.$name.'}"';
$parseStr .= ' data-mimetype="{'.$mimetype.'}"';
$parseStr .= ' data-multiple="{'.$multiple.'}" ';
@@ -49,7 +49,7 @@ class Html extends \think\template\TagLib{
$parseStr .= ' '.$extendData.' ';
$parseStr .= ' data-preview-id="p-{'.$name.'}"></a>';
$parseStr .= ' <a class="pic-add fachoose" style="height: auto;border: 0;"';
$parseStr .= ' permission="app.admin.upload.attachment" ';
$parseStr .= ' permission="app.admin.files.list" ';
$parseStr .= ' id="choose-pic-btn" href="#!" title="选择文件"';
$parseStr .= ' data-input-id="c-{'.$name.'}" ';
$parseStr .= ' data-mimetype="{'.$mimetype.'}" ';