郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 4cdd273d3bbdbffecf1b5b32d7dd80c6ba994b6a 1 个父辈 44c20687
1 个管道 的构建 通过 耗费 0 秒

修改短信时间

内嵌 并排对比
正在显示 2 个修改的文件 包含 134 行增加 和 133 行删除
... ... @@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" 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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -28,70 +27,71 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="82" column="15" lean-forward="true" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="15" />
<state relative-caret-position="189">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3344#3584#0#PHP" expanded="false" />
<element signature="e#3589#3824#0#PHP" expanded="false" />
<element signature="e#3830#4177#0#PHP" expanded="false" />
<element signature="e#4182#4628#0#PHP" expanded="false" />
<element signature="e#4634#4894#0#PHP" expanded="false" />
<element signature="e#4899#5100#0#PHP" expanded="false" />
<element signature="e#5106#5368#0#PHP" expanded="false" />
<element signature="e#5373#5578#0#PHP" expanded="false" />
<element signature="e#5584#6063#0#PHP" expanded="false" />
<element signature="e#6068#8187#0#PHP" expanded="false" />
<element signature="e#8210#8741#0#PHP" expanded="false" />
<element signature="e#8747#9027#0#PHP" expanded="false" />
<element signature="e#9032#9424#0#PHP" expanded="false" />
<element signature="e#9430#9714#0#PHP" expanded="false" />
<element signature="e#9719#10758#0#PHP" expanded="false" />
<element signature="e#10764#11052#0#PHP" expanded="false" />
<element signature="e#11057#12092#0#PHP" expanded="false" />
<element signature="e#12098#12679#0#PHP" expanded="false" />
<element signature="e#12684#14072#0#PHP" expanded="false" />
<element signature="e#14078#14534#0#PHP" expanded="false" />
<element signature="e#14539#16502#0#PHP" expanded="false" />
<element signature="e#16525#16880#0#PHP" expanded="false" />
<element signature="e#16886#17599#0#PHP" expanded="false" />
<element signature="e#17604#19061#0#PHP" expanded="false" />
<element signature="e#19067#19528#0#PHP" expanded="false" />
<element signature="e#19533#22555#0#PHP" expanded="false" />
<element signature="e#22561#23170#0#PHP" expanded="false" />
<element signature="e#23175#24460#0#PHP" expanded="false" />
<element signature="e#24466#24823#0#PHP" expanded="false" />
<element signature="e#24828#25709#0#PHP" expanded="false" />
<element signature="e#25715#26067#0#PHP" expanded="false" />
<element signature="e#26072#27150#0#PHP" expanded="false" />
<element signature="e#27156#27511#0#PHP" expanded="false" />
<element signature="e#27516#28610#0#PHP" expanded="false" />
<element signature="e#28616#29040#0#PHP" expanded="false" />
<element signature="e#29045#29656#0#PHP" expanded="false" />
<element signature="e#29662#30158#0#PHP" expanded="false" />
<element signature="e#30163#31860#0#PHP" expanded="false" />
<element signature="e#31866#32150#0#PHP" expanded="false" />
<element signature="e#32155#32791#0#PHP" expanded="false" />
<element signature="e#32812#33131#0#PHP" expanded="false" />
<element signature="e#33137#33545#0#PHP" expanded="false" />
<element signature="e#33551#34310#0#PHP" expanded="false" />
<element signature="e#34329#35193#0#PHP" expanded="false" />
<element signature="e#35219#35619#0#PHP" expanded="false" />
<element signature="e#35642#36215#0#PHP" expanded="false" />
<element signature="e#36238#37048#0#PHP" expanded="false" />
<element signature="e#37054#37653#0#PHP" expanded="false" />
<element signature="e#37658#38622#0#PHP" expanded="false" />
<element signature="e#38628#39295#0#PHP" expanded="false" />
<element signature="e#39300#40341#0#PHP" expanded="false" />
<element signature="e#40347#41010#0#PHP" expanded="false" />
<element signature="e#41015#42042#0#PHP" expanded="false" />
<element signature="e#42049#42480#0#PHP" expanded="false" />
<element signature="e#42485#43063#0#PHP" expanded="false" />
<element signature="e#43069#43498#0#PHP" expanded="false" />
<element signature="e#43503#44105#0#PHP" expanded="false" />
<element signature="e#44111#44538#0#PHP" expanded="false" />
<element signature="e#44543#45109#0#PHP" expanded="false" />
<element signature="e#1725#3339#0#PHP" expanded="false" />
<element signature="e#3345#3585#0#PHP" expanded="false" />
<element signature="e#3590#3825#0#PHP" expanded="false" />
<element signature="e#3831#4178#0#PHP" expanded="false" />
<element signature="e#4183#4629#0#PHP" expanded="false" />
<element signature="e#4635#4895#0#PHP" expanded="false" />
<element signature="e#4900#5101#0#PHP" expanded="false" />
<element signature="e#5107#5369#0#PHP" expanded="false" />
<element signature="e#5374#5579#0#PHP" expanded="false" />
<element signature="e#5585#6064#0#PHP" expanded="false" />
<element signature="e#6069#8188#0#PHP" expanded="false" />
<element signature="e#8211#8742#0#PHP" expanded="false" />
<element signature="e#8748#9028#0#PHP" expanded="false" />
<element signature="e#9033#9425#0#PHP" expanded="false" />
<element signature="e#9431#9715#0#PHP" expanded="false" />
<element signature="e#9720#10759#0#PHP" expanded="false" />
<element signature="e#10765#11053#0#PHP" expanded="false" />
<element signature="e#11058#12093#0#PHP" expanded="false" />
<element signature="e#12099#12680#0#PHP" expanded="false" />
<element signature="e#12685#14073#0#PHP" expanded="false" />
<element signature="e#14079#14535#0#PHP" expanded="false" />
<element signature="e#14540#16503#0#PHP" expanded="false" />
<element signature="e#16526#16881#0#PHP" expanded="false" />
<element signature="e#16887#17600#0#PHP" expanded="false" />
<element signature="e#17605#19062#0#PHP" expanded="false" />
<element signature="e#19068#19529#0#PHP" expanded="false" />
<element signature="e#19534#22556#0#PHP" expanded="false" />
<element signature="e#22562#23171#0#PHP" expanded="false" />
<element signature="e#23176#24461#0#PHP" expanded="false" />
<element signature="e#24467#24824#0#PHP" expanded="false" />
<element signature="e#24829#25710#0#PHP" expanded="false" />
<element signature="e#25716#26068#0#PHP" expanded="false" />
<element signature="e#26073#27151#0#PHP" expanded="false" />
<element signature="e#27157#27512#0#PHP" expanded="false" />
<element signature="e#27517#28611#0#PHP" expanded="false" />
<element signature="e#28617#29041#0#PHP" expanded="false" />
<element signature="e#29046#29657#0#PHP" expanded="false" />
<element signature="e#29663#30159#0#PHP" expanded="false" />
<element signature="e#30164#31861#0#PHP" expanded="false" />
<element signature="e#31867#32151#0#PHP" expanded="false" />
<element signature="e#32156#32792#0#PHP" expanded="false" />
<element signature="e#32813#33132#0#PHP" expanded="false" />
<element signature="e#33138#33546#0#PHP" expanded="false" />
<element signature="e#33552#34311#0#PHP" expanded="false" />
<element signature="e#34330#35194#0#PHP" expanded="false" />
<element signature="e#35220#35620#0#PHP" expanded="false" />
<element signature="e#35643#36216#0#PHP" expanded="false" />
<element signature="e#36239#37049#0#PHP" expanded="false" />
<element signature="e#37055#37654#0#PHP" expanded="false" />
<element signature="e#37659#38623#0#PHP" expanded="false" />
<element signature="e#38629#39296#0#PHP" expanded="false" />
<element signature="e#39301#40342#0#PHP" expanded="false" />
<element signature="e#40348#41011#0#PHP" expanded="false" />
<element signature="e#41016#42043#0#PHP" expanded="false" />
<element signature="e#42050#42481#0#PHP" expanded="false" />
<element signature="e#42486#43064#0#PHP" expanded="false" />
<element signature="e#43070#43499#0#PHP" expanded="false" />
<element signature="e#43504#44106#0#PHP" expanded="false" />
<element signature="e#44112#44539#0#PHP" expanded="false" />
<element signature="e#44544#45110#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -100,8 +100,8 @@
<file leaf-file-name="common.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<caret line="1776" column="17" lean-forward="true" selection-start-line="1776" selection-start-column="17" selection-end-line="1776" selection-end-column="17" />
<state relative-caret-position="408">
<caret line="1780" column="28" lean-forward="false" selection-start-line="1780" selection-start-column="19" selection-end-line="1780" selection-end-column="28" />
<folding />
</state>
</provider>
... ... @@ -196,8 +196,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="284" />
<option name="y" value="58" />
<option name="x" value="410" />
<option name="y" value="32" />
<option name="width" value="1700" />
<option name="height" value="1037" />
</component>
... ... @@ -353,15 +353,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="6685000" />
<workItem from="1575527294268" duration="6996000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="488497000" />
<option name="totallyTimeSpent" value="488808000" />
</component>
<component name="ToolWindowManager">
<frame x="284" y="58" width="1700" height="1037" extended-state="0" />
<frame x="410" y="32" width="1700" height="1037" 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.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -902,78 +902,79 @@
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<caret line="1776" column="17" lean-forward="true" selection-start-line="1776" selection-start-column="17" selection-end-line="1776" selection-end-column="17" />
<state relative-caret-position="408">
<caret line="1780" column="28" lean-forward="false" selection-start-line="1780" selection-start-column="19" selection-end-line="1780" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="82" column="15" lean-forward="true" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="15" />
<state relative-caret-position="189">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3344#3584#0#PHP" expanded="false" />
<element signature="e#3589#3824#0#PHP" expanded="false" />
<element signature="e#3830#4177#0#PHP" expanded="false" />
<element signature="e#4182#4628#0#PHP" expanded="false" />
<element signature="e#4634#4894#0#PHP" expanded="false" />
<element signature="e#4899#5100#0#PHP" expanded="false" />
<element signature="e#5106#5368#0#PHP" expanded="false" />
<element signature="e#5373#5578#0#PHP" expanded="false" />
<element signature="e#5584#6063#0#PHP" expanded="false" />
<element signature="e#6068#8187#0#PHP" expanded="false" />
<element signature="e#8210#8741#0#PHP" expanded="false" />
<element signature="e#8747#9027#0#PHP" expanded="false" />
<element signature="e#9032#9424#0#PHP" expanded="false" />
<element signature="e#9430#9714#0#PHP" expanded="false" />
<element signature="e#9719#10758#0#PHP" expanded="false" />
<element signature="e#10764#11052#0#PHP" expanded="false" />
<element signature="e#11057#12092#0#PHP" expanded="false" />
<element signature="e#12098#12679#0#PHP" expanded="false" />
<element signature="e#12684#14072#0#PHP" expanded="false" />
<element signature="e#14078#14534#0#PHP" expanded="false" />
<element signature="e#14539#16502#0#PHP" expanded="false" />
<element signature="e#16525#16880#0#PHP" expanded="false" />
<element signature="e#16886#17599#0#PHP" expanded="false" />
<element signature="e#17604#19061#0#PHP" expanded="false" />
<element signature="e#19067#19528#0#PHP" expanded="false" />
<element signature="e#19533#22555#0#PHP" expanded="false" />
<element signature="e#22561#23170#0#PHP" expanded="false" />
<element signature="e#23175#24460#0#PHP" expanded="false" />
<element signature="e#24466#24823#0#PHP" expanded="false" />
<element signature="e#24828#25709#0#PHP" expanded="false" />
<element signature="e#25715#26067#0#PHP" expanded="false" />
<element signature="e#26072#27150#0#PHP" expanded="false" />
<element signature="e#27156#27511#0#PHP" expanded="false" />
<element signature="e#27516#28610#0#PHP" expanded="false" />
<element signature="e#28616#29040#0#PHP" expanded="false" />
<element signature="e#29045#29656#0#PHP" expanded="false" />
<element signature="e#29662#30158#0#PHP" expanded="false" />
<element signature="e#30163#31860#0#PHP" expanded="false" />
<element signature="e#31866#32150#0#PHP" expanded="false" />
<element signature="e#32155#32791#0#PHP" expanded="false" />
<element signature="e#32812#33131#0#PHP" expanded="false" />
<element signature="e#33137#33545#0#PHP" expanded="false" />
<element signature="e#33551#34310#0#PHP" expanded="false" />
<element signature="e#34329#35193#0#PHP" expanded="false" />
<element signature="e#35219#35619#0#PHP" expanded="false" />
<element signature="e#35642#36215#0#PHP" expanded="false" />
<element signature="e#36238#37048#0#PHP" expanded="false" />
<element signature="e#37054#37653#0#PHP" expanded="false" />
<element signature="e#37658#38622#0#PHP" expanded="false" />
<element signature="e#38628#39295#0#PHP" expanded="false" />
<element signature="e#39300#40341#0#PHP" expanded="false" />
<element signature="e#40347#41010#0#PHP" expanded="false" />
<element signature="e#41015#42042#0#PHP" expanded="false" />
<element signature="e#42049#42480#0#PHP" expanded="false" />
<element signature="e#42485#43063#0#PHP" expanded="false" />
<element signature="e#43069#43498#0#PHP" expanded="false" />
<element signature="e#43503#44105#0#PHP" expanded="false" />
<element signature="e#44111#44538#0#PHP" expanded="false" />
<element signature="e#44543#45109#0#PHP" expanded="false" />
<element signature="e#1725#3339#0#PHP" expanded="false" />
<element signature="e#3345#3585#0#PHP" expanded="false" />
<element signature="e#3590#3825#0#PHP" expanded="false" />
<element signature="e#3831#4178#0#PHP" expanded="false" />
<element signature="e#4183#4629#0#PHP" expanded="false" />
<element signature="e#4635#4895#0#PHP" expanded="false" />
<element signature="e#4900#5101#0#PHP" expanded="false" />
<element signature="e#5107#5369#0#PHP" expanded="false" />
<element signature="e#5374#5579#0#PHP" expanded="false" />
<element signature="e#5585#6064#0#PHP" expanded="false" />
<element signature="e#6069#8188#0#PHP" expanded="false" />
<element signature="e#8211#8742#0#PHP" expanded="false" />
<element signature="e#8748#9028#0#PHP" expanded="false" />
<element signature="e#9033#9425#0#PHP" expanded="false" />
<element signature="e#9431#9715#0#PHP" expanded="false" />
<element signature="e#9720#10759#0#PHP" expanded="false" />
<element signature="e#10765#11053#0#PHP" expanded="false" />
<element signature="e#11058#12093#0#PHP" expanded="false" />
<element signature="e#12099#12680#0#PHP" expanded="false" />
<element signature="e#12685#14073#0#PHP" expanded="false" />
<element signature="e#14079#14535#0#PHP" expanded="false" />
<element signature="e#14540#16503#0#PHP" expanded="false" />
<element signature="e#16526#16881#0#PHP" expanded="false" />
<element signature="e#16887#17600#0#PHP" expanded="false" />
<element signature="e#17605#19062#0#PHP" expanded="false" />
<element signature="e#19068#19529#0#PHP" expanded="false" />
<element signature="e#19534#22556#0#PHP" expanded="false" />
<element signature="e#22562#23171#0#PHP" expanded="false" />
<element signature="e#23176#24461#0#PHP" expanded="false" />
<element signature="e#24467#24824#0#PHP" expanded="false" />
<element signature="e#24829#25710#0#PHP" expanded="false" />
<element signature="e#25716#26068#0#PHP" expanded="false" />
<element signature="e#26073#27151#0#PHP" expanded="false" />
<element signature="e#27157#27512#0#PHP" expanded="false" />
<element signature="e#27517#28611#0#PHP" expanded="false" />
<element signature="e#28617#29041#0#PHP" expanded="false" />
<element signature="e#29046#29657#0#PHP" expanded="false" />
<element signature="e#29663#30159#0#PHP" expanded="false" />
<element signature="e#30164#31861#0#PHP" expanded="false" />
<element signature="e#31867#32151#0#PHP" expanded="false" />
<element signature="e#32156#32792#0#PHP" expanded="false" />
<element signature="e#32813#33132#0#PHP" expanded="false" />
<element signature="e#33138#33546#0#PHP" expanded="false" />
<element signature="e#33552#34311#0#PHP" expanded="false" />
<element signature="e#34330#35194#0#PHP" expanded="false" />
<element signature="e#35220#35620#0#PHP" expanded="false" />
<element signature="e#35643#36216#0#PHP" expanded="false" />
<element signature="e#36239#37049#0#PHP" expanded="false" />
<element signature="e#37055#37654#0#PHP" expanded="false" />
<element signature="e#37659#38623#0#PHP" expanded="false" />
<element signature="e#38629#39296#0#PHP" expanded="false" />
<element signature="e#39301#40342#0#PHP" expanded="false" />
<element signature="e#40348#41011#0#PHP" expanded="false" />
<element signature="e#41016#42043#0#PHP" expanded="false" />
<element signature="e#42050#42481#0#PHP" expanded="false" />
<element signature="e#42486#43064#0#PHP" expanded="false" />
<element signature="e#43070#43499#0#PHP" expanded="false" />
<element signature="e#43504#44106#0#PHP" expanded="false" />
<element signature="e#44112#44539#0#PHP" expanded="false" />
<element signature="e#44544#45110#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -93,7 +93,7 @@ class UserController extends RestBaseController
if (substr($result, 0, strpos($result, ',')) != "1") {
$this->error(['code' => 42001, 'msg' => $result]);
}
Cache::set($phone,$number,600);
Cache::set($phone,$number,6000);
// $code = Db::name('code')
// ->where('phone',$phone)
// ->find();
... ...