切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
996bbcde23ef817c13bed92c1f728ee8609554bc
1 个父辈
3f1dc60c
1 个管道 的构建
通过
耗费 8 秒
账号信息
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
35 行增加
和
118 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
996bbcd
...
...
@@ -3,7 +3,6 @@
<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/MyinfoController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/MyinfoController.php"
/>
<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"
/>
...
...
@@ -15,12 +14,13 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"MyinfoController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"MyinfoController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"89"
column=
"35"
lean-forward=
"true"
selection-start-line=
"89"
selection-start-column=
"35"
selection-end-line=
"89"
selection-end-column=
"35"
/>
<state
relative-caret-position=
"325"
>
<caret
line=
"20"
column=
"49"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"49"
selection-end-line=
"20"
selection-end-column=
"49"
/>
<folding>
<element
signature=
"e#243#4731#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"
/>
...
...
@@ -31,20 +31,19 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"630"
>
<caret
line=
"82"
column=
"3"
lean-forward=
"true"
selection-start-line=
"82"
selection-start-column=
"3"
selection-end-line=
"82"
selection-end-column=
"3"
/>
<state
relative-caret-position=
"587"
>
<caret
line=
"139"
column=
"43"
lean-forward=
"true"
selection-start-line=
"139"
selection-start-column=
"43"
selection-end-line=
"139"
selection-end-column=
"43"
/>
<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#1838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1843#2719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2725#3089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3094#3421#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -90,8 +89,8 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/DemandController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/MyinfoController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
</list>
</option>
</component>
...
...
@@ -110,8 +109,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"-171"
/>
<option
name=
"y"
value=
"94"
/>
<option
name=
"x"
value=
"483"
/>
<option
name=
"y"
value=
"72"
/>
<option
name=
"width"
value=
"1940"
/>
<option
name=
"height"
value=
"942"
/>
</component>
...
...
@@ -130,7 +129,6 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -172,6 +170,7 @@
</subPane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -216,16 +215,18 @@
<workItem
from=
"1568629056199"
duration=
"4747000"
/>
<workItem
from=
"1568679207375"
duration=
"28265000"
/>
<workItem
from=
"1568711401926"
duration=
"8091000"
/>
<workItem
from=
"1568765630993"
duration=
"1813000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
199496
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
201309
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-171"
y=
"94"
width=
"1940"
height=
"942"
extended-state=
"0"
/>
<frame
x=
"483"
y=
"72"
width=
"1940"
height=
"942"
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
265958
"
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
425532
"
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"
/>
...
...
@@ -415,7 +416,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"296"
>
<caret
line=
"102"
column=
"13"
lean-forward=
"false"
selection-start-line=
"102"
selection-start-column=
"13"
selection-end-line=
"102"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -547,18 +547,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
<caret
line=
"90"
column=
"7"
lean-forward=
"true"
selection-start-line=
"90"
selection-start-column=
"7"
selection-end-line=
"90"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#310#896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#901#1792#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1798#2384#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2389#3307#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3313#3922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3927#5034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5040#5563#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5568#6101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6107#6627#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6632#7165#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -566,34 +554,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"475"
>
<caret
line=
"209"
column=
"32"
lean-forward=
"false"
selection-start-line=
"209"
selection-start-column=
"32"
selection-end-line=
"209"
selection-end-column=
"32"
/>
<folding>
<element
signature=
"e#330#805#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#810#1537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1543#2147#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2152#3064#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3070#3509#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3514#4196#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4202#4745#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4750#5735#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5741#6509#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6514#7697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7703#8464#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8469#9626#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9632#10750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10755#12246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12252#12790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12795#13673#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13679#14438#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14443#15611#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15617#16254#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16259#16727#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16733#17618#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17623#18755#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18761#19238#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19243#19974#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19980#20553#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20558#21395#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -601,16 +561,6 @@
<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>
...
...
@@ -618,10 +568,6 @@
<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>
...
...
@@ -629,67 +575,36 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"729"
>
<caret
line=
"453"
column=
"111"
lean-forward=
"true"
selection-start-line=
"453"
selection-start-column=
"8"
selection-end-line=
"453"
selection-end-column=
"111"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"20"
column=
"49"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"49"
selection-end-line=
"20"
selection-end-column=
"49"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#931#1222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1227#2884#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2890#3142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3147#3602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3608#4163#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4170#5445#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5451#6104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6109#7255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7261#7871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7876#9034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9040#9836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9841#11171#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11177#11906#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11911#13451#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13457#14042#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15061#15477#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15482#16004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16009#16639#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16645#17040#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17045#17748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17754#18260#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18265#19696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19702#19981#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19986#20428#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20434#20668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20673#21066#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#243#4731#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#4108#4373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4378#4728#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=
"630"
>
<caret
line=
"82"
column=
"3"
lean-forward=
"true"
selection-start-line=
"82"
selection-start-column=
"3"
selection-end-line=
"82"
selection-end-column=
"3"
/>
<state
relative-caret-position=
"587"
>
<caret
line=
"139"
column=
"43"
lean-forward=
"true"
selection-start-line=
"139"
selection-start-column=
"43"
selection-end-line=
"139"
selection-end-column=
"43"
/>
<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#1838#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1843#2719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2725#3089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3094#3421#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"89"
column=
"35"
lean-forward=
"true"
selection-start-line=
"89"
selection-start-column=
"35"
selection-end-line=
"89"
selection-end-column=
"35"
/>
<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#4108#4373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4378#4728#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OtherController.php
查看文件 @
996bbcd
...
...
@@ -128,6 +128,7 @@ class OtherController extends RestBaseController
public
function
account_s
()
{
$user_id
=
$this
->
getUserId
();
$res
=
Db
::
name
(
'account'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
...
...
@@ -136,6 +137,7 @@ class OtherController extends RestBaseController
$this
->
success
(
'SUCCESS'
,
$res
);
}
else
{
$res
[
'status'
]
=
0
;
$this
->
success
(
'SUCCESS'
,
$res
);
}
}
}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论