郭盛 / scrap · 提交

转到一个项目

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

修改短信内容

内嵌 并排对比
正在显示 2 个修改的文件 包含 130 行增加 和 134 行删除
... ... @@ -27,71 +27,69 @@
<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="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" />
<state relative-caret-position="350">
<caret line="85" column="22" lean-forward="true" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#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" />
<element signature="e#3355#3595#0#PHP" expanded="false" />
<element signature="e#3600#3835#0#PHP" expanded="false" />
<element signature="e#3841#4188#0#PHP" expanded="false" />
<element signature="e#4193#4639#0#PHP" expanded="false" />
<element signature="e#4645#4905#0#PHP" expanded="false" />
<element signature="e#4910#5111#0#PHP" expanded="false" />
<element signature="e#5117#5379#0#PHP" expanded="false" />
<element signature="e#5384#5589#0#PHP" expanded="false" />
<element signature="e#5595#6074#0#PHP" expanded="false" />
<element signature="e#6079#8198#0#PHP" expanded="false" />
<element signature="e#8221#8752#0#PHP" expanded="false" />
<element signature="e#8758#9038#0#PHP" expanded="false" />
<element signature="e#9043#9435#0#PHP" expanded="false" />
<element signature="e#9441#9725#0#PHP" expanded="false" />
<element signature="e#9730#10769#0#PHP" expanded="false" />
<element signature="e#10775#11063#0#PHP" expanded="false" />
<element signature="e#11068#12103#0#PHP" expanded="false" />
<element signature="e#12109#12690#0#PHP" expanded="false" />
<element signature="e#12695#14083#0#PHP" expanded="false" />
<element signature="e#14089#14545#0#PHP" expanded="false" />
<element signature="e#14550#16513#0#PHP" expanded="false" />
<element signature="e#16536#16891#0#PHP" expanded="false" />
<element signature="e#16897#17610#0#PHP" expanded="false" />
<element signature="e#17615#19072#0#PHP" expanded="false" />
<element signature="e#19078#19539#0#PHP" expanded="false" />
<element signature="e#19544#22566#0#PHP" expanded="false" />
<element signature="e#22572#23181#0#PHP" expanded="false" />
<element signature="e#23186#24471#0#PHP" expanded="false" />
<element signature="e#24477#24834#0#PHP" expanded="false" />
<element signature="e#24839#25720#0#PHP" expanded="false" />
<element signature="e#25726#26078#0#PHP" expanded="false" />
<element signature="e#26083#27161#0#PHP" expanded="false" />
<element signature="e#27167#27522#0#PHP" expanded="false" />
<element signature="e#27527#28621#0#PHP" expanded="false" />
<element signature="e#28627#29051#0#PHP" expanded="false" />
<element signature="e#29056#29667#0#PHP" expanded="false" />
<element signature="e#29673#30169#0#PHP" expanded="false" />
<element signature="e#30174#31871#0#PHP" expanded="false" />
<element signature="e#31877#32161#0#PHP" expanded="false" />
<element signature="e#32166#32802#0#PHP" expanded="false" />
<element signature="e#32823#33142#0#PHP" expanded="false" />
<element signature="e#33148#33556#0#PHP" expanded="false" />
<element signature="e#33562#34321#0#PHP" expanded="false" />
<element signature="e#34340#35204#0#PHP" expanded="false" />
<element signature="e#35230#35630#0#PHP" expanded="false" />
<element signature="e#35653#36226#0#PHP" expanded="false" />
<element signature="e#36249#37059#0#PHP" expanded="false" />
<element signature="e#37065#37664#0#PHP" expanded="false" />
<element signature="e#37669#38633#0#PHP" expanded="false" />
<element signature="e#38639#39306#0#PHP" expanded="false" />
<element signature="e#39311#40352#0#PHP" expanded="false" />
<element signature="e#40358#41021#0#PHP" expanded="false" />
<element signature="e#41026#42053#0#PHP" expanded="false" />
<element signature="e#42060#42491#0#PHP" expanded="false" />
<element signature="e#42496#43074#0#PHP" expanded="false" />
<element signature="e#43080#43509#0#PHP" expanded="false" />
<element signature="e#43514#44116#0#PHP" expanded="false" />
<element signature="e#44122#44549#0#PHP" expanded="false" />
<element signature="e#44554#45120#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -195,9 +193,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="410" />
<option name="y" value="32" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="221" />
<option name="y" value="42" />
<option name="width" value="1700" />
<option name="height" value="1037" />
</component>
... ... @@ -256,7 +254,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -353,15 +351,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="6996000" />
<workItem from="1575527294268" duration="8017000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="488808000" />
<option name="totallyTimeSpent" value="489829000" />
</component>
<component name="ToolWindowManager">
<frame x="410" y="32" width="1700" height="1037" extended-state="0" />
<frame x="221" y="42" width="1700" height="1037" extended-state="1" />
<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" />
... ... @@ -910,71 +908,69 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="350">
<caret line="85" column="22" lean-forward="true" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#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" />
<element signature="e#3355#3595#0#PHP" expanded="false" />
<element signature="e#3600#3835#0#PHP" expanded="false" />
<element signature="e#3841#4188#0#PHP" expanded="false" />
<element signature="e#4193#4639#0#PHP" expanded="false" />
<element signature="e#4645#4905#0#PHP" expanded="false" />
<element signature="e#4910#5111#0#PHP" expanded="false" />
<element signature="e#5117#5379#0#PHP" expanded="false" />
<element signature="e#5384#5589#0#PHP" expanded="false" />
<element signature="e#5595#6074#0#PHP" expanded="false" />
<element signature="e#6079#8198#0#PHP" expanded="false" />
<element signature="e#8221#8752#0#PHP" expanded="false" />
<element signature="e#8758#9038#0#PHP" expanded="false" />
<element signature="e#9043#9435#0#PHP" expanded="false" />
<element signature="e#9441#9725#0#PHP" expanded="false" />
<element signature="e#9730#10769#0#PHP" expanded="false" />
<element signature="e#10775#11063#0#PHP" expanded="false" />
<element signature="e#11068#12103#0#PHP" expanded="false" />
<element signature="e#12109#12690#0#PHP" expanded="false" />
<element signature="e#12695#14083#0#PHP" expanded="false" />
<element signature="e#14089#14545#0#PHP" expanded="false" />
<element signature="e#14550#16513#0#PHP" expanded="false" />
<element signature="e#16536#16891#0#PHP" expanded="false" />
<element signature="e#16897#17610#0#PHP" expanded="false" />
<element signature="e#17615#19072#0#PHP" expanded="false" />
<element signature="e#19078#19539#0#PHP" expanded="false" />
<element signature="e#19544#22566#0#PHP" expanded="false" />
<element signature="e#22572#23181#0#PHP" expanded="false" />
<element signature="e#23186#24471#0#PHP" expanded="false" />
<element signature="e#24477#24834#0#PHP" expanded="false" />
<element signature="e#24839#25720#0#PHP" expanded="false" />
<element signature="e#25726#26078#0#PHP" expanded="false" />
<element signature="e#26083#27161#0#PHP" expanded="false" />
<element signature="e#27167#27522#0#PHP" expanded="false" />
<element signature="e#27527#28621#0#PHP" expanded="false" />
<element signature="e#28627#29051#0#PHP" expanded="false" />
<element signature="e#29056#29667#0#PHP" expanded="false" />
<element signature="e#29673#30169#0#PHP" expanded="false" />
<element signature="e#30174#31871#0#PHP" expanded="false" />
<element signature="e#31877#32161#0#PHP" expanded="false" />
<element signature="e#32166#32802#0#PHP" expanded="false" />
<element signature="e#32823#33142#0#PHP" expanded="false" />
<element signature="e#33148#33556#0#PHP" expanded="false" />
<element signature="e#33562#34321#0#PHP" expanded="false" />
<element signature="e#34340#35204#0#PHP" expanded="false" />
<element signature="e#35230#35630#0#PHP" expanded="false" />
<element signature="e#35653#36226#0#PHP" expanded="false" />
<element signature="e#36249#37059#0#PHP" expanded="false" />
<element signature="e#37065#37664#0#PHP" expanded="false" />
<element signature="e#37669#38633#0#PHP" expanded="false" />
<element signature="e#38639#39306#0#PHP" expanded="false" />
<element signature="e#39311#40352#0#PHP" expanded="false" />
<element signature="e#40358#41021#0#PHP" expanded="false" />
<element signature="e#41026#42053#0#PHP" expanded="false" />
<element signature="e#42060#42491#0#PHP" expanded="false" />
<element signature="e#42496#43074#0#PHP" expanded="false" />
<element signature="e#43080#43509#0#PHP" expanded="false" />
<element signature="e#43514#44116#0#PHP" expanded="false" />
<element signature="e#44122#44549#0#PHP" expanded="false" />
<element signature="e#44554#45120#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' => ''//小号
... ...