郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 44c206873332ca4daf27ae1f37f01ab36213683b 1 个父辈 49c40af8
1 个管道 的构建 通过 耗费 1 秒

修改短信内容

内嵌 并排对比
正在显示 2 个修改的文件 包含 130 行增加 和 129 行删除
... ... @@ -2,6 +2,7 @@
<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" />
... ... @@ -27,70 +28,70 @@
<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="775">
<caret line="118" column="34" lean-forward="true" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
<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" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3343#3583#0#PHP" expanded="false" />
<element signature="e#3588#3823#0#PHP" expanded="false" />
<element signature="e#3829#4176#0#PHP" expanded="false" />
<element signature="e#4181#4627#0#PHP" expanded="false" />
<element signature="e#4633#4893#0#PHP" expanded="false" />
<element signature="e#4898#5099#0#PHP" expanded="false" />
<element signature="e#5105#5367#0#PHP" expanded="false" />
<element signature="e#5372#5577#0#PHP" expanded="false" />
<element signature="e#5583#6062#0#PHP" expanded="false" />
<element signature="e#6067#8186#0#PHP" expanded="false" />
<element signature="e#8209#8740#0#PHP" expanded="false" />
<element signature="e#8746#9026#0#PHP" expanded="false" />
<element signature="e#9031#9423#0#PHP" expanded="false" />
<element signature="e#9429#9713#0#PHP" expanded="false" />
<element signature="e#9718#10757#0#PHP" expanded="false" />
<element signature="e#10763#11051#0#PHP" expanded="false" />
<element signature="e#11056#12091#0#PHP" expanded="false" />
<element signature="e#12097#12678#0#PHP" expanded="false" />
<element signature="e#12683#14071#0#PHP" expanded="false" />
<element signature="e#14077#14533#0#PHP" expanded="false" />
<element signature="e#14538#16501#0#PHP" expanded="false" />
<element signature="e#16524#16879#0#PHP" expanded="false" />
<element signature="e#16885#17598#0#PHP" expanded="false" />
<element signature="e#17603#19060#0#PHP" expanded="false" />
<element signature="e#19066#19527#0#PHP" expanded="false" />
<element signature="e#19532#22554#0#PHP" expanded="false" />
<element signature="e#22560#23169#0#PHP" expanded="false" />
<element signature="e#23174#24459#0#PHP" expanded="false" />
<element signature="e#24465#24822#0#PHP" expanded="false" />
<element signature="e#24827#25708#0#PHP" expanded="false" />
<element signature="e#25714#26066#0#PHP" expanded="false" />
<element signature="e#26071#27149#0#PHP" expanded="false" />
<element signature="e#27155#27510#0#PHP" expanded="false" />
<element signature="e#27515#28609#0#PHP" expanded="false" />
<element signature="e#28615#29039#0#PHP" expanded="false" />
<element signature="e#29044#29655#0#PHP" expanded="false" />
<element signature="e#29661#30157#0#PHP" expanded="false" />
<element signature="e#30162#31859#0#PHP" expanded="false" />
<element signature="e#31865#32149#0#PHP" expanded="false" />
<element signature="e#32154#32790#0#PHP" expanded="false" />
<element signature="e#32811#33130#0#PHP" expanded="false" />
<element signature="e#33136#33544#0#PHP" expanded="false" />
<element signature="e#33550#34309#0#PHP" expanded="false" />
<element signature="e#34328#35192#0#PHP" expanded="false" />
<element signature="e#35218#35618#0#PHP" expanded="false" />
<element signature="e#35641#36214#0#PHP" expanded="false" />
<element signature="e#36237#37047#0#PHP" expanded="false" />
<element signature="e#37053#37652#0#PHP" expanded="false" />
<element signature="e#37657#38621#0#PHP" expanded="false" />
<element signature="e#38627#39294#0#PHP" expanded="false" />
<element signature="e#39299#40340#0#PHP" expanded="false" />
<element signature="e#40346#41009#0#PHP" expanded="false" />
<element signature="e#41014#42041#0#PHP" expanded="false" />
<element signature="e#42048#42479#0#PHP" expanded="false" />
<element signature="e#42484#43062#0#PHP" expanded="false" />
<element signature="e#43068#43497#0#PHP" expanded="false" />
<element signature="e#43502#44104#0#PHP" expanded="false" />
<element signature="e#44110#44537#0#PHP" expanded="false" />
<element signature="e#44542#45108#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" />
</folding>
</state>
</provider>
... ... @@ -194,9 +195,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="245" />
<option name="y" value="84" />
<component name="ProjectFrameBounds">
<option name="x" value="284" />
<option name="y" value="58" />
<option name="width" value="1700" />
<option name="height" value="1037" />
</component>
... ... @@ -352,15 +353,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="6040000" />
<workItem from="1575527294268" duration="6685000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="487852000" />
<option name="totallyTimeSpent" value="488497000" />
</component>
<component name="ToolWindowManager">
<frame x="245" y="84" width="1700" height="1037" extended-state="1" />
<frame x="284" y="58" 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" />
... ... @@ -909,70 +910,70 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="118" column="34" lean-forward="true" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
<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" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3343#3583#0#PHP" expanded="false" />
<element signature="e#3588#3823#0#PHP" expanded="false" />
<element signature="e#3829#4176#0#PHP" expanded="false" />
<element signature="e#4181#4627#0#PHP" expanded="false" />
<element signature="e#4633#4893#0#PHP" expanded="false" />
<element signature="e#4898#5099#0#PHP" expanded="false" />
<element signature="e#5105#5367#0#PHP" expanded="false" />
<element signature="e#5372#5577#0#PHP" expanded="false" />
<element signature="e#5583#6062#0#PHP" expanded="false" />
<element signature="e#6067#8186#0#PHP" expanded="false" />
<element signature="e#8209#8740#0#PHP" expanded="false" />
<element signature="e#8746#9026#0#PHP" expanded="false" />
<element signature="e#9031#9423#0#PHP" expanded="false" />
<element signature="e#9429#9713#0#PHP" expanded="false" />
<element signature="e#9718#10757#0#PHP" expanded="false" />
<element signature="e#10763#11051#0#PHP" expanded="false" />
<element signature="e#11056#12091#0#PHP" expanded="false" />
<element signature="e#12097#12678#0#PHP" expanded="false" />
<element signature="e#12683#14071#0#PHP" expanded="false" />
<element signature="e#14077#14533#0#PHP" expanded="false" />
<element signature="e#14538#16501#0#PHP" expanded="false" />
<element signature="e#16524#16879#0#PHP" expanded="false" />
<element signature="e#16885#17598#0#PHP" expanded="false" />
<element signature="e#17603#19060#0#PHP" expanded="false" />
<element signature="e#19066#19527#0#PHP" expanded="false" />
<element signature="e#19532#22554#0#PHP" expanded="false" />
<element signature="e#22560#23169#0#PHP" expanded="false" />
<element signature="e#23174#24459#0#PHP" expanded="false" />
<element signature="e#24465#24822#0#PHP" expanded="false" />
<element signature="e#24827#25708#0#PHP" expanded="false" />
<element signature="e#25714#26066#0#PHP" expanded="false" />
<element signature="e#26071#27149#0#PHP" expanded="false" />
<element signature="e#27155#27510#0#PHP" expanded="false" />
<element signature="e#27515#28609#0#PHP" expanded="false" />
<element signature="e#28615#29039#0#PHP" expanded="false" />
<element signature="e#29044#29655#0#PHP" expanded="false" />
<element signature="e#29661#30157#0#PHP" expanded="false" />
<element signature="e#30162#31859#0#PHP" expanded="false" />
<element signature="e#31865#32149#0#PHP" expanded="false" />
<element signature="e#32154#32790#0#PHP" expanded="false" />
<element signature="e#32811#33130#0#PHP" expanded="false" />
<element signature="e#33136#33544#0#PHP" expanded="false" />
<element signature="e#33550#34309#0#PHP" expanded="false" />
<element signature="e#34328#35192#0#PHP" expanded="false" />
<element signature="e#35218#35618#0#PHP" expanded="false" />
<element signature="e#35641#36214#0#PHP" expanded="false" />
<element signature="e#36237#37047#0#PHP" expanded="false" />
<element signature="e#37053#37652#0#PHP" expanded="false" />
<element signature="e#37657#38621#0#PHP" expanded="false" />
<element signature="e#38627#39294#0#PHP" expanded="false" />
<element signature="e#39299#40340#0#PHP" expanded="false" />
<element signature="e#40346#41009#0#PHP" expanded="false" />
<element signature="e#41014#42041#0#PHP" expanded="false" />
<element signature="e#42048#42479#0#PHP" expanded="false" />
<element signature="e#42484#43062#0#PHP" expanded="false" />
<element signature="e#43068#43497#0#PHP" expanded="false" />
<element signature="e#43502#44104#0#PHP" expanded="false" />
<element signature="e#44110#44537#0#PHP" expanded="false" />
<element signature="e#44542#45108#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -84,7 +84,7 @@ class UserController extends RestBaseController
$number = generateCode();
//发送验证码
$data = array(
'content' => "【垃圾回收变现】您的验证码是：" . $number."十分钟之内有效",//短信内容
'content' => "【垃圾回收变现】您的验证码是：" . $number.",十分钟之内有效",//短信内容
'mobile' => $phone,//手机号码
'productid' => '676767',//产品id
'xh' => ''//小号
... ...