切换导航条
此项目
正在载入...
登录
何书鹏
/
recruit
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
何书鹏
4 years ago
提交
58496e364723e428048d213ffc153297c56c60a4
1 个父辈
498d34b5
1 个管道 的构建
通过
耗费 0 秒
bug修改
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
19 行增加
和
16 行删除
application/api/controller/User.php
public/api.html
application/api/controller/User.php
查看文件 @
58496e3
...
...
@@ -50,13 +50,14 @@ class User extends Api
"id": 1, //用户ID
"nickname": "admin", //昵称
"mobile": "13888888888", //手机号
"avatar": "
http://www.recruit.top/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //头像
"avatar": "
/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //原始头像地址
"is_work": "0", //是否在职:0=否,1=是
"work_subsidy": "2.00", //工时补贴价格(元/时)
"work_subsidy_month": "600.00", //工时月工资(元/月)
"recruit_subsidy_month": "300.00", //招聘月工资(元/月)
"url": "/u/1",
"realname_status": "0" // 实名认证状态:-1=未申请,0=申请中,1=通过,2=未通过
"realname_status": "0", // 实名认证状态:-1=未申请,0=申请中,1=通过,2=未通过
"full_avatar": "http://www.recruit.top/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //完整头像地址
},
"recruit_subsidy": {
"hour": "1.00", //招聘补贴价格(元/时)
...
...
@@ -70,11 +71,11 @@ class User extends Api
{
$user
=
$this
->
auth
->
getUser
();
// 格式化头像
$user
->
avatar
=
cdnurl
(
$user
->
avatar
,
true
);
$user
->
full_
avatar
=
cdnurl
(
$user
->
avatar
,
true
);
// 实名认证状态
$realname
=
Realname
::
get
([
'user_id'
=>
$this
->
auth
->
id
]);
$user
->
realname_status
=
empty
(
$realname
)
?
'-1'
:
$realname
[
'status'
];
$user
->
visible
([
'id'
,
'avatar'
,
'nickname'
,
'mobile'
,
'is_work'
,
'work_subsidy'
,
'work_subsidy_month'
,
'recruit_subsidy_month'
])
->
append
([
'realname_status'
]);
$user
->
visible
([
'id'
,
'avatar'
,
'nickname'
,
'mobile'
,
'is_work'
,
'work_subsidy'
,
'work_subsidy_month'
,
'recruit_subsidy_month'
])
->
append
([
'realname_status'
,
'full_avatar'
]);
// 招聘补贴
$recruit_subsidy
=
[
'hour'
=>
sprintf
(
"%.2f"
,
config
(
'site.recruit_subsidy'
)),
...
...
@@ -513,15 +514,16 @@ class User extends Api
if
(
$third
)
{
$ip
=
request
()
->
ip
();
$time
=
time
();
$update
=
[
'id'
=>
$third
[
'user_id'
],
'gender'
=>
$user_info
[
'gender'
]
==
2
?
0
:
$user_info
[
'gender'
],
'avatar'
=>
$user_info
[
'avatarUrl'
],
'logintime'
=>
$time
,
'loginip'
=>
$ip
,
'prevtime'
=>
$time
];
$result
=
$user_model
->
isUpdate
(
true
)
->
save
(
$update
);
// 更新用户信息
$user
=
$user_model
->
get
(
$third
[
'user_id'
]);
if
(
!
empty
(
$user_info
[
'avatarUrl'
])
&&
empty
(
$user
[
'avatar'
])){
$user
->
avatar
=
$user_info
[
'avatarUrl'
];
}
$user
->
gender
=
$user_info
[
'gender'
]
==
2
?
0
:
$user_info
[
'gender'
];
$user
->
logintime
=
$time
;
$user
->
loginip
=
$ip
;
$user
->
prevtime
=
$time
;
$result
=
$user
->
save
();
$user_id
=
$third
[
'user_id'
];
}
else
{
$ip
=
request
()
->
ip
();
...
...
public/api.html
查看文件 @
58496e3
...
...
@@ -3031,13 +3031,14 @@
"id": 1, //用户ID
"nickname": "admin", //昵称
"mobile": "13888888888", //手机号
"avatar": "
http://www.recruit.top/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //头像
"avatar": "
/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //原始头像地址
"is_work": "0", //是否在职:0=否,1=是
"work_subsidy": "2.00", //工时补贴价格(元/时)
"work_subsidy_month": "600.00", //工时月工资(元/月)
"recruit_subsidy_month": "300.00", //招聘月工资(元/月)
"url": "/u/1",
"realname_status": "0" // 实名认证状态:-1=未申请,0=申请中,1=通过,2=未通过
"realname_status": "0", // 实名认证状态:-1=未申请,0=申请中,1=通过,2=未通过
"full_avatar": "http://www.recruit.top/uploads/20201123/8894d62100f2f920ffb2f38063b63f2d.jpg", //完整头像地址
},
"recruit_subsidy": {
"hour": "1.00", //招聘补贴价格(元/时)
...
...
@@ -6730,7 +6731,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2020-1
1-26 11:36:20
</div>
Generated on 2020-1
2-03 13:26:52
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"./"
target=
"_blank"
>
人力招聘
</a>
</div>
...
...
请
注册
或
登录
后发表评论