xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: xinyouhe/crm-server:master_fdesk
Branches Tags
xinyouhe/crm-server:master xinyouhe/crm-server:master_fdesk xinyouhe/crm-server:develop xinyouhe/crm-server:yf/master xinyouhe/crm-server:test xinyouhe/crm-server:feature/fs xinyouhe/crm-server:feature/mzl授权
...
pull from: xinyouhe/crm-server:yf/master
Branches Tags
xinyouhe/crm-server:master_fdesk xinyouhe/crm-server:master xinyouhe/crm-server:develop xinyouhe/crm-server:yf/master xinyouhe/crm-server:test xinyouhe/crm-server:feature/fs xinyouhe/crm-server:feature/mzl授权

4 Commits
master_fdesk ... yf/master

Author SHA1 Message Date
18338781771 9383aae96d 1 2025-04-16 16:33:53 +08:00
18338781771 60adf036d9 1 2025-04-16 16:30:52 +08:00
18338781771 4279935c32 国家使用本地的 2025-04-16 10:26:33 +08:00
18338781771 01b57eb9b3 不请求公共服务 2025-04-16 09:38:48 +08:00
2 changed files with 17 additions and 29 deletions
Expand all files Collapse all files
app/controller/AreaController.php
+1 -13
View File
@@ -45,19 +45,7 @@ class AreaController
public function getCountry (Request $request)
{
$list = RedisHelper::get("rpc_country");
$list = null;
if(!$list){
$res = HttpClient::get(config('const.rpc_domain') . '/country/all');
if ($res['code'] != 200 && $res['data']['code'] != 0){
Log::info('register_rpc',$res);
return Util::fail($res, trans('register_fail'));
}
$list = $res['data']['data']['data'];
RedisHelper::set("rpc_country", $list, 600);
}
// $list = Country::get()->toArray();
$list = Country::get()->toArray();
$language = 'en_addr';
if($request->user['language'] == 'zh_CN'){
$language = 'cn_addr';
app/controller/UserController.php
+16 -16
View File
@@ -164,17 +164,17 @@ class UserController
if (Util::isEmpty($id)) {
$option = ['email' => $email];
$userService = new UserService;
$res = $userService->createOrquery($option);
Log::info('register_rpc',$res);
// $userService = new UserService;
// $res = $userService->createOrquery($option);
// Log::info('register_rpc',$res);
// return Util::fail($res, trans('register_fail'));
if ($res['code'] != 200 && $res['data']['code'] != 0){
return Util::fail($res, trans('register_fail'));
}
$data['sn'] = $res['data']['data']['sn'];
$data['id'] = $res['data']['data']['uid'];
$res = User::firstOrCreate(['sn' => $data['sn']],$data);
$res['id'] = $data['id'];
// if ($res['code'] != 200 && $res['data']['code'] != 0){
// return Util::fail($res, trans('register_fail'));
// }
// $data['sn'] = $res['data']['data']['sn'];
// $data['id'] = $res['data']['data']['uid'];
$res = User::firstOrCreate(['email' => $email],$data);
// $res['id'] = $data['id'];
} else {
$res = User::where('id', $id)
->update($data);
@@ -259,12 +259,12 @@ class UserController
$mobile = $user->isDirty('mobile');
$name = $user->isDirty('name');
$sign = $user->isDirty('sign');
if($mobile || $name || $sign){
$userService = new UserService;
$option = ['uid' => $user->id, 'phone' => $user->mobile, 'name' => $user->name, 'sign' => $user->sign, ];
$res = $userService->update($option);
Log::info('register_rpc',$res);
}
// if($mobile || $name || $sign){
// $userService = new UserService;
// $option = ['uid' => $user->id, 'phone' => $user->mobile, 'name' => $user->name, 'sign' => $user->sign, ];
// $res = $userService->update($option);
// Log::info('register_rpc',$res);
// }
$res = $user->save();