郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 b6206243399803553b42ad341515889e3aa7d3a4 1 个父辈 4d19672b
1 个管道 的构建 通过 耗费 1 秒

测试搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 150 行增加 和 151 行删除
... ... @@ -5,7 +5,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -20,8 +19,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="658">
<caret line="308" column="37" lean-forward="true" selection-start-line="308" selection-start-column="37" selection-end-line="308" selection-end-column="37" />
<state relative-caret-position="233">
<caret line="297" column="33" lean-forward="true" selection-start-line="297" selection-start-column="33" selection-end-line="297" selection-end-column="33" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -36,74 +35,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7635#0#PHP" expanded="false" />
<element signature="e#10356#10789#0#PHP" expanded="false" />
<element signature="e#10852#11261#0#PHP" expanded="false" />
<element signature="e#11325#11595#0#PHP" expanded="false" />
<element signature="e#11605#12603#0#PHP" expanded="false" />
<element signature="e#12615#13295#0#PHP" expanded="false" />
<element signature="e#13300#14158#0#PHP" expanded="false" />
<element signature="e#14164#14953#0#PHP" expanded="false" />
<element signature="e#14958#16307#0#PHP" expanded="false" />
<element signature="e#16313#17015#0#PHP" expanded="false" />
<element signature="e#17020#18340#0#PHP" expanded="false" />
<element signature="e#18346#18922#0#PHP" expanded="false" />
<element signature="e#18927#19539#0#PHP" expanded="false" />
<element signature="e#19545#20261#0#PHP" expanded="false" />
<element signature="e#20266#24393#0#PHP" expanded="false" />
<element signature="e#24399#25329#0#PHP" expanded="false" />
<element signature="e#25334#30475#0#PHP" expanded="false" />
<element signature="e#30481#30858#0#PHP" expanded="false" />
<element signature="e#30863#31302#0#PHP" expanded="false" />
<element signature="e#31308#32129#0#PHP" expanded="false" />
<element signature="e#32134#35538#0#PHP" expanded="false" />
<element signature="e#32580#35532#0#PHP" expanded="false" />
<element signature="e#35544#36049#0#PHP" expanded="false" />
<element signature="e#36054#36305#0#PHP" expanded="false" />
<element signature="e#36311#36790#0#PHP" expanded="false" />
<element signature="e#36795#37552#0#PHP" expanded="false" />
<element signature="e#37558#38039#0#PHP" expanded="false" />
<element signature="e#38044#38814#0#PHP" expanded="false" />
<element signature="e#38820#39183#0#PHP" expanded="false" />
<element signature="e#39188#39379#0#PHP" expanded="false" />
<element signature="e#39385#39743#0#PHP" expanded="false" />
<element signature="e#39748#39939#0#PHP" expanded="false" />
<element signature="e#39945#41088#0#PHP" expanded="false" />
<element signature="e#41093#43758#0#PHP" expanded="false" />
<element signature="e#43764#44262#0#PHP" expanded="false" />
<element signature="e#44267#46013#0#PHP" expanded="false" />
<element signature="e#46019#46432#0#PHP" expanded="false" />
<element signature="e#46437#46916#0#PHP" expanded="false" />
<element signature="e#46922#47456#0#PHP" expanded="false" />
<element signature="e#47461#48846#0#PHP" expanded="false" />
<element signature="e#48852#49506#0#PHP" expanded="false" />
<element signature="e#49511#51526#0#PHP" expanded="false" />
<element signature="e#51532#52292#0#PHP" expanded="false" />
<element signature="e#52297#55006#0#PHP" expanded="false" />
<element signature="e#55032#55863#0#PHP" expanded="false" />
<element signature="e#55869#56289#0#PHP" expanded="false" />
<element signature="e#56294#56777#0#PHP" expanded="false" />
<element signature="e#56783#57589#0#PHP" expanded="false" />
<element signature="e#57594#60752#0#PHP" expanded="false" />
<element signature="e#59387#60746#0#PHP" expanded="false" />
<element signature="e#60767#62102#0#PHP" expanded="false" />
<element signature="e#60883#61285#0#PHP" expanded="false" />
<element signature="e#62118#63152#0#PHP" expanded="false" />
<element signature="e#63158#63916#0#PHP" expanded="false" />
<element signature="e#63921#67664#0#PHP" expanded="false" />
<element signature="e#67670#68062#0#PHP" expanded="false" />
<element signature="e#68067#69019#0#PHP" expanded="false" />
<element signature="e#69043#69616#0#PHP" expanded="false" />
<element signature="e#69622#70221#0#PHP" expanded="false" />
<element signature="e#70226#71153#0#PHP" expanded="false" />
<element signature="e#71159#71873#0#PHP" expanded="false" />
<element signature="e#71879#72306#0#PHP" expanded="false" />
<element signature="e#72311#72780#0#PHP" expanded="false" />
<element signature="e#72787#73992#0#PHP" expanded="false" />
<element signature="e#73997#75700#0#PHP" expanded="false" />
<element signature="e#75706#76483#0#PHP" expanded="false" />
<element signature="e#76488#80426#0#PHP" expanded="false" />
<element signature="e#80432#80941#0#PHP" expanded="false" />
<element signature="e#80946#81618#0#PHP" expanded="false" />
<element signature="e#10368#10801#0#PHP" expanded="false" />
<element signature="e#10864#11273#0#PHP" expanded="false" />
<element signature="e#11337#11607#0#PHP" expanded="false" />
<element signature="e#11617#12615#0#PHP" expanded="false" />
<element signature="e#12627#13307#0#PHP" expanded="false" />
<element signature="e#13312#14170#0#PHP" expanded="false" />
<element signature="e#14176#14965#0#PHP" expanded="false" />
<element signature="e#14970#16319#0#PHP" expanded="false" />
<element signature="e#16325#17027#0#PHP" expanded="false" />
<element signature="e#17032#18352#0#PHP" expanded="false" />
<element signature="e#18358#18934#0#PHP" expanded="false" />
<element signature="e#18939#19551#0#PHP" expanded="false" />
<element signature="e#19557#20273#0#PHP" expanded="false" />
<element signature="e#20278#24405#0#PHP" expanded="false" />
<element signature="e#24411#25341#0#PHP" expanded="false" />
<element signature="e#25346#30487#0#PHP" expanded="false" />
<element signature="e#30493#30870#0#PHP" expanded="false" />
<element signature="e#30875#31314#0#PHP" expanded="false" />
<element signature="e#31320#32141#0#PHP" expanded="false" />
<element signature="e#32146#35550#0#PHP" expanded="false" />
<element signature="e#32592#35544#0#PHP" expanded="false" />
<element signature="e#35556#36061#0#PHP" expanded="false" />
<element signature="e#36066#36317#0#PHP" expanded="false" />
<element signature="e#36323#36802#0#PHP" expanded="false" />
<element signature="e#36807#37564#0#PHP" expanded="false" />
<element signature="e#37570#38051#0#PHP" expanded="false" />
<element signature="e#38056#38826#0#PHP" expanded="false" />
<element signature="e#38832#39195#0#PHP" expanded="false" />
<element signature="e#39200#39391#0#PHP" expanded="false" />
<element signature="e#39397#39755#0#PHP" expanded="false" />
<element signature="e#39760#39951#0#PHP" expanded="false" />
<element signature="e#39957#41100#0#PHP" expanded="false" />
<element signature="e#41105#43770#0#PHP" expanded="false" />
<element signature="e#43776#44274#0#PHP" expanded="false" />
<element signature="e#44279#46025#0#PHP" expanded="false" />
<element signature="e#46031#46444#0#PHP" expanded="false" />
<element signature="e#46449#46928#0#PHP" expanded="false" />
<element signature="e#46934#47468#0#PHP" expanded="false" />
<element signature="e#47473#48858#0#PHP" expanded="false" />
<element signature="e#48864#49518#0#PHP" expanded="false" />
<element signature="e#49523#51538#0#PHP" expanded="false" />
<element signature="e#51544#52304#0#PHP" expanded="false" />
<element signature="e#52309#55018#0#PHP" expanded="false" />
<element signature="e#55044#55875#0#PHP" expanded="false" />
<element signature="e#55881#56301#0#PHP" expanded="false" />
<element signature="e#56306#56789#0#PHP" expanded="false" />
<element signature="e#56795#57601#0#PHP" expanded="false" />
<element signature="e#57606#60764#0#PHP" expanded="false" />
<element signature="e#59399#60758#0#PHP" expanded="false" />
<element signature="e#60779#62114#0#PHP" expanded="false" />
<element signature="e#60895#61297#0#PHP" expanded="false" />
<element signature="e#62130#63164#0#PHP" expanded="false" />
<element signature="e#63170#63928#0#PHP" expanded="false" />
<element signature="e#63933#67676#0#PHP" expanded="false" />
<element signature="e#67682#68074#0#PHP" expanded="false" />
<element signature="e#68079#69031#0#PHP" expanded="false" />
<element signature="e#69055#69628#0#PHP" expanded="false" />
<element signature="e#69634#70233#0#PHP" expanded="false" />
<element signature="e#70238#71165#0#PHP" expanded="false" />
<element signature="e#71171#71885#0#PHP" expanded="false" />
<element signature="e#71891#72318#0#PHP" expanded="false" />
<element signature="e#72323#72792#0#PHP" expanded="false" />
<element signature="e#72799#74004#0#PHP" expanded="false" />
<element signature="e#74009#75712#0#PHP" expanded="false" />
<element signature="e#75718#76495#0#PHP" expanded="false" />
<element signature="e#76500#80438#0#PHP" expanded="false" />
<element signature="e#80444#80953#0#PHP" expanded="false" />
<element signature="e#80958#81630#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -210,9 +209,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="557" />
<option name="y" value="45" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-146" />
<option name="y" value="88" />
<option name="width" value="1652" />
<option name="height" value="942" />
</component>
... ... @@ -411,7 +410,7 @@
<workItem from="1584794340552" duration="4619000" />
<workItem from="1584922896072" duration="645000" />
<workItem from="1585128834226" duration="698000" />
<workItem from="1585216476771" duration="3775000" />
<workItem from="1585216476771" duration="4188000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -438,7 +437,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="640965000" />
<option name="totallyTimeSpent" value="641378000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -450,7 +449,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="557" y="45" width="1652" height="942" extended-state="0" />
<frame x="-146" y="88" width="1652" height="942" extended-state="1" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16080402" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -884,8 +883,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="658">
<caret line="308" column="37" lean-forward="true" selection-start-line="308" selection-start-column="37" selection-end-line="308" selection-end-column="37" />
<state relative-caret-position="233">
<caret line="297" column="33" lean-forward="true" selection-start-line="297" selection-start-column="33" selection-end-line="297" selection-end-column="33" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -900,74 +899,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7635#0#PHP" expanded="false" />
<element signature="e#10356#10789#0#PHP" expanded="false" />
<element signature="e#10852#11261#0#PHP" expanded="false" />
<element signature="e#11325#11595#0#PHP" expanded="false" />
<element signature="e#11605#12603#0#PHP" expanded="false" />
<element signature="e#12615#13295#0#PHP" expanded="false" />
<element signature="e#13300#14158#0#PHP" expanded="false" />
<element signature="e#14164#14953#0#PHP" expanded="false" />
<element signature="e#14958#16307#0#PHP" expanded="false" />
<element signature="e#16313#17015#0#PHP" expanded="false" />
<element signature="e#17020#18340#0#PHP" expanded="false" />
<element signature="e#18346#18922#0#PHP" expanded="false" />
<element signature="e#18927#19539#0#PHP" expanded="false" />
<element signature="e#19545#20261#0#PHP" expanded="false" />
<element signature="e#20266#24393#0#PHP" expanded="false" />
<element signature="e#24399#25329#0#PHP" expanded="false" />
<element signature="e#25334#30475#0#PHP" expanded="false" />
<element signature="e#30481#30858#0#PHP" expanded="false" />
<element signature="e#30863#31302#0#PHP" expanded="false" />
<element signature="e#31308#32129#0#PHP" expanded="false" />
<element signature="e#32134#35538#0#PHP" expanded="false" />
<element signature="e#32580#35532#0#PHP" expanded="false" />
<element signature="e#35544#36049#0#PHP" expanded="false" />
<element signature="e#36054#36305#0#PHP" expanded="false" />
<element signature="e#36311#36790#0#PHP" expanded="false" />
<element signature="e#36795#37552#0#PHP" expanded="false" />
<element signature="e#37558#38039#0#PHP" expanded="false" />
<element signature="e#38044#38814#0#PHP" expanded="false" />
<element signature="e#38820#39183#0#PHP" expanded="false" />
<element signature="e#39188#39379#0#PHP" expanded="false" />
<element signature="e#39385#39743#0#PHP" expanded="false" />
<element signature="e#39748#39939#0#PHP" expanded="false" />
<element signature="e#39945#41088#0#PHP" expanded="false" />
<element signature="e#41093#43758#0#PHP" expanded="false" />
<element signature="e#43764#44262#0#PHP" expanded="false" />
<element signature="e#44267#46013#0#PHP" expanded="false" />
<element signature="e#46019#46432#0#PHP" expanded="false" />
<element signature="e#46437#46916#0#PHP" expanded="false" />
<element signature="e#46922#47456#0#PHP" expanded="false" />
<element signature="e#47461#48846#0#PHP" expanded="false" />
<element signature="e#48852#49506#0#PHP" expanded="false" />
<element signature="e#49511#51526#0#PHP" expanded="false" />
<element signature="e#51532#52292#0#PHP" expanded="false" />
<element signature="e#52297#55006#0#PHP" expanded="false" />
<element signature="e#55032#55863#0#PHP" expanded="false" />
<element signature="e#55869#56289#0#PHP" expanded="false" />
<element signature="e#56294#56777#0#PHP" expanded="false" />
<element signature="e#56783#57589#0#PHP" expanded="false" />
<element signature="e#57594#60752#0#PHP" expanded="false" />
<element signature="e#59387#60746#0#PHP" expanded="false" />
<element signature="e#60767#62102#0#PHP" expanded="false" />
<element signature="e#60883#61285#0#PHP" expanded="false" />
<element signature="e#62118#63152#0#PHP" expanded="false" />
<element signature="e#63158#63916#0#PHP" expanded="false" />
<element signature="e#63921#67664#0#PHP" expanded="false" />
<element signature="e#67670#68062#0#PHP" expanded="false" />
<element signature="e#68067#69019#0#PHP" expanded="false" />
<element signature="e#69043#69616#0#PHP" expanded="false" />
<element signature="e#69622#70221#0#PHP" expanded="false" />
<element signature="e#70226#71153#0#PHP" expanded="false" />
<element signature="e#71159#71873#0#PHP" expanded="false" />
<element signature="e#71879#72306#0#PHP" expanded="false" />
<element signature="e#72311#72780#0#PHP" expanded="false" />
<element signature="e#72787#73992#0#PHP" expanded="false" />
<element signature="e#73997#75700#0#PHP" expanded="false" />
<element signature="e#75706#76483#0#PHP" expanded="false" />
<element signature="e#76488#80426#0#PHP" expanded="false" />
<element signature="e#80432#80941#0#PHP" expanded="false" />
<element signature="e#80946#81618#0#PHP" expanded="false" />
<element signature="e#10368#10801#0#PHP" expanded="false" />
<element signature="e#10864#11273#0#PHP" expanded="false" />
<element signature="e#11337#11607#0#PHP" expanded="false" />
<element signature="e#11617#12615#0#PHP" expanded="false" />
<element signature="e#12627#13307#0#PHP" expanded="false" />
<element signature="e#13312#14170#0#PHP" expanded="false" />
<element signature="e#14176#14965#0#PHP" expanded="false" />
<element signature="e#14970#16319#0#PHP" expanded="false" />
<element signature="e#16325#17027#0#PHP" expanded="false" />
<element signature="e#17032#18352#0#PHP" expanded="false" />
<element signature="e#18358#18934#0#PHP" expanded="false" />
<element signature="e#18939#19551#0#PHP" expanded="false" />
<element signature="e#19557#20273#0#PHP" expanded="false" />
<element signature="e#20278#24405#0#PHP" expanded="false" />
<element signature="e#24411#25341#0#PHP" expanded="false" />
<element signature="e#25346#30487#0#PHP" expanded="false" />
<element signature="e#30493#30870#0#PHP" expanded="false" />
<element signature="e#30875#31314#0#PHP" expanded="false" />
<element signature="e#31320#32141#0#PHP" expanded="false" />
<element signature="e#32146#35550#0#PHP" expanded="false" />
<element signature="e#32592#35544#0#PHP" expanded="false" />
<element signature="e#35556#36061#0#PHP" expanded="false" />
<element signature="e#36066#36317#0#PHP" expanded="false" />
<element signature="e#36323#36802#0#PHP" expanded="false" />
<element signature="e#36807#37564#0#PHP" expanded="false" />
<element signature="e#37570#38051#0#PHP" expanded="false" />
<element signature="e#38056#38826#0#PHP" expanded="false" />
<element signature="e#38832#39195#0#PHP" expanded="false" />
<element signature="e#39200#39391#0#PHP" expanded="false" />
<element signature="e#39397#39755#0#PHP" expanded="false" />
<element signature="e#39760#39951#0#PHP" expanded="false" />
<element signature="e#39957#41100#0#PHP" expanded="false" />
<element signature="e#41105#43770#0#PHP" expanded="false" />
<element signature="e#43776#44274#0#PHP" expanded="false" />
<element signature="e#44279#46025#0#PHP" expanded="false" />
<element signature="e#46031#46444#0#PHP" expanded="false" />
<element signature="e#46449#46928#0#PHP" expanded="false" />
<element signature="e#46934#47468#0#PHP" expanded="false" />
<element signature="e#47473#48858#0#PHP" expanded="false" />
<element signature="e#48864#49518#0#PHP" expanded="false" />
<element signature="e#49523#51538#0#PHP" expanded="false" />
<element signature="e#51544#52304#0#PHP" expanded="false" />
<element signature="e#52309#55018#0#PHP" expanded="false" />
<element signature="e#55044#55875#0#PHP" expanded="false" />
<element signature="e#55881#56301#0#PHP" expanded="false" />
<element signature="e#56306#56789#0#PHP" expanded="false" />
<element signature="e#56795#57601#0#PHP" expanded="false" />
<element signature="e#57606#60764#0#PHP" expanded="false" />
<element signature="e#59399#60758#0#PHP" expanded="false" />
<element signature="e#60779#62114#0#PHP" expanded="false" />
<element signature="e#60895#61297#0#PHP" expanded="false" />
<element signature="e#62130#63164#0#PHP" expanded="false" />
<element signature="e#63170#63928#0#PHP" expanded="false" />
<element signature="e#63933#67676#0#PHP" expanded="false" />
<element signature="e#67682#68074#0#PHP" expanded="false" />
<element signature="e#68079#69031#0#PHP" expanded="false" />
<element signature="e#69055#69628#0#PHP" expanded="false" />
<element signature="e#69634#70233#0#PHP" expanded="false" />
<element signature="e#70238#71165#0#PHP" expanded="false" />
<element signature="e#71171#71885#0#PHP" expanded="false" />
<element signature="e#71891#72318#0#PHP" expanded="false" />
<element signature="e#72323#72792#0#PHP" expanded="false" />
<element signature="e#72799#74004#0#PHP" expanded="false" />
<element signature="e#74009#75712#0#PHP" expanded="false" />
<element signature="e#75718#76495#0#PHP" expanded="false" />
<element signature="e#76500#80438#0#PHP" expanded="false" />
<element signature="e#80444#80953#0#PHP" expanded="false" />
<element signature="e#80958#81630#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -305,9 +305,9 @@ class User extends Api
->where('text_ids','like','%,'.$id2['id'].',%')
->column('id');
}
}
foreach ($a as $val){
array_push($ids,$val);
foreach ($a as $val){
array_push($ids,$val);
}
}
}
$ids2 = array_unique($ids);
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-26 18:57:31 </div>
Generated on 2020-03-26 19:04:25 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...