切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
979e2772cc794ec27fe46454b4d0d1c864bc2c41
1 个父辈
f5dc5302
1 个管道 的构建
通过
耗费 1 秒
账户信息
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
72 行增加
和
147 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
979e277
...
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -14,32 +13,16 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"FinanceController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<file
leaf-file-name=
"MyinfoController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"false"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<state
relative-caret-position=
"542"
>
<caret
line=
"106"
column=
"7"
lean-forward=
"false"
selection-start-line=
"106"
selection-start-column=
"7"
selection-end-line=
"106"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"750"
>
<caret
line=
"115"
column=
"33"
lean-forward=
"true"
selection-start-line=
"115"
selection-start-column=
"33"
selection-end-line=
"115"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3107#3537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3542#4447#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3077#3342#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -104,11 +87,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"-29"
/>
<option
name=
"y"
value=
"65"
/>
<option
name=
"width"
value=
"1907"
/>
<option
name=
"height"
value=
"957"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"363"
/>
<option
name=
"y"
value=
"62"
/>
<option
name=
"width"
value=
"1940"
/>
<option
name=
"height"
value=
"945"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -210,18 +193,18 @@
<workItem
from=
"1568594548281"
duration=
"28629000"
/>
<workItem
from=
"1568629056199"
duration=
"4747000"
/>
<workItem
from=
"1568679207375"
duration=
"28265000"
/>
<workItem
from=
"1568711401926"
duration=
"
2884
000"
/>
<workItem
from=
"1568711401926"
duration=
"
5006
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"19
4289
000"
/>
<option
name=
"totallyTimeSpent"
value=
"19
6411
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
-29"
y=
"65"
width=
"1907"
height=
"957"
extended-state=
"1
"
/>
<frame
x=
"
363"
y=
"62"
width=
"1940"
height=
"945"
extended-state=
"0
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.15
538712
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.15
265958
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.34076828"
sideWeight=
"0.50296295"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -593,24 +576,53 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Myinfo
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Send
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"400"
>
<caret
line=
"39"
column=
"27"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"27"
selection-end-line=
"39"
selection-end-column=
"27"
/>
<state
relative-caret-position=
"325"
>
<caret
line=
"50"
column=
"9"
lean-forward=
"false"
selection-start-line=
"50"
selection-start-column=
"9"
selection-end-line=
"60"
selection-end-column=
"10"
/>
<folding>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2196#3071#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3077#3342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3347#3697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2060#2244#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2249#2443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2449#3508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3513#4822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4828#5701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5706#6808#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6814#7508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7513#8499#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Resour
ceController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Finan
ceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"false"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"18"
column=
"3"
lean-forward=
"true"
selection-start-line=
"18"
selection-start-column=
"3"
selection-end-line=
"18"
selection-end-column=
"3"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1263#1922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1927#2803#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"900"
>
<caret
line=
"453"
column=
"111"
lean-forward=
"true"
selection-start-line=
"453"
selection-start-column=
"8"
selection-end-line=
"453"
selection-end-column=
"111"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
...
...
@@ -646,46 +658,15 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"50"
column=
"9"
lean-forward=
"false"
selection-start-line=
"50"
selection-start-column=
"9"
selection-end-line=
"60"
selection-end-column=
"10"
/>
<folding>
<element
signature=
"e#2060#2244#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2249#2443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2449#3508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3513#4822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4828#5701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5706#6808#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6814#7508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7513#8499#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"false"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"750"
>
<caret
line=
"115"
column=
"33"
lean-forward=
"true"
selection-start-line=
"115"
selection-start-column=
"33"
selection-end-line=
"115"
selection-end-column=
"33"
/>
<state
relative-caret-position=
"542"
>
<caret
line=
"106"
column=
"7"
lean-forward=
"false"
selection-start-line=
"106"
selection-start-column=
"7"
selection-end-line=
"106"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3107#3537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3542#4447#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3077#3342#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OtherController.php
查看文件 @
979e277
...
...
@@ -69,12 +69,11 @@ class OtherController extends RestBaseController
* @header name:XX-Token require:1 default: desc:token
*
* @param name:city type:int require:1 desc: 城市
* @param name:infostatus type:int require:1 desc:消息通知
* @param name:infostatus type:int require:1 desc:消息通知
(1关闭 2开启)
* @param name:company type:string require:1 desc:所在企业
* @param name:position type:string require:1 desc:职位
* @param name:content type:string require:1 desc:企业简介
*
* @return user_nickname:昵称
* @return city:所选城市
* @return infostatus:消息通知 (0关闭 1开启)
* @return company:所在企业
...
...
@@ -86,21 +85,7 @@ class OtherController extends RestBaseController
{
$user_id
=
$this
->
getUserId
();
$param
=
$this
->
request
->
param
();
$validate
=
new
Validate
([
'city'
=>
'require'
,
'infostatus'
=>
'require'
,
'city'
=>
'require'
,
'position'
=>
'require|number|max:11'
,
'company'
=>
'require'
,
'content'
=>
'require'
,
]);
if
(
!
$validate
->
check
(
$param
))
{
$this
->
error
([
'code'
=>
40005
,
'msg'
=>
$validate
->
getError
()]);
}
$res
=
Db
::
name
(
'account'
)
->
alias
(
'a'
)
->
join
(
'user u'
,
'a.user_id = u.id'
)
->
field
(
'a.*,u.user_nickname'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
if
(
$res
)
{
...
...
@@ -108,60 +93,19 @@ class OtherController extends RestBaseController
Db
::
name
(
'account'
)
->
where
(
'user_id'
,
$user_id
)
->
update
(
$param
);
$this
->
success
(
'SUCCESS'
);
$data
=
Db
::
name
(
'account'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
$this
->
success
(
'SUCCESS'
,
$data
);
}
else
{
$param
[
'create_time'
]
=
time
();
$param
[
'user_id'
]
=
$user_id
;
Db
::
name
(
'account'
)
->
insert
(
$param
);
$this
->
success
(
'SUCCESS'
);
$data
=
Db
::
name
(
'account'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
$this
->
success
(
'SUCCESS'
,
$data
);
}
}
/**
* @title 账户信息只携带token
* @description
* @author GuoSheng
* @url /index/Other/account_s
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @return user_nickname:昵称
* @return city:所选城市
* @return infostatus:消息通知 (0关闭 1开启)
* @return company:所在企业
* @return position:职位
* @return content:企业简介
* @return status:0没认证 1已认证过
*
*/
public
function
account_s
()
{
$user_id
=
$this
->
getUserId
();
$res
=
Db
::
name
(
'account'
)
->
alias
(
'a'
)
->
join
(
'user u'
,
'a.user_id = u.id'
)
->
field
(
'a.*,u.user_nickname'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
$city
=
Db
::
name
(
'area'
)
->
where
(
'id'
,
$res
[
'city'
])
->
find
();
if
(
$res
){
$data
[
'status'
]
=
1
;
$data
[
'user_nickname'
]
=
$res
[
'user_nickname'
];
$data
[
'city'
]
=
$city
[
'name'
];
$data
[
'infostatus'
]
=
$res
[
'infostatus'
];
$data
[
'company'
]
=
$res
[
'company'
];
$data
[
'position'
]
=
$res
[
'position'
];
$data
[
'content'
]
=
strip_tags
(
cmf_replace_content_file_url
(
htmlspecialchars_decode
(
$res
[
'content'
])));
}
else
{
$data
[
'status'
]
=
0
;
}
$this
->
success
(
'SUCCESS'
,
$data
);
}
}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论