郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 3cdaf26463d650f7e3ab89107127304d1144659a 1 个父辈 3c145d92
1 个管道 的构建 通过 耗费 0 秒

修改短信内容

内嵌 并排对比
正在显示 2 个修改的文件 包含 132 行增加 和 132 行删除
... ... @@ -27,69 +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="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" />
<state relative-caret-position="325">
<caret line="84" column="15" lean-forward="true" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="15" />
<folding>
<element signature="e#1491#1720#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" />
<element signature="e#3368#3608#0#PHP" expanded="false" />
<element signature="e#3613#3848#0#PHP" expanded="false" />
<element signature="e#3854#4201#0#PHP" expanded="false" />
<element signature="e#4206#4652#0#PHP" expanded="false" />
<element signature="e#4658#4918#0#PHP" expanded="false" />
<element signature="e#4923#5124#0#PHP" expanded="false" />
<element signature="e#5130#5392#0#PHP" expanded="false" />
<element signature="e#5397#5602#0#PHP" expanded="false" />
<element signature="e#5608#6087#0#PHP" expanded="false" />
<element signature="e#6092#8211#0#PHP" expanded="false" />
<element signature="e#8234#8765#0#PHP" expanded="false" />
<element signature="e#8771#9051#0#PHP" expanded="false" />
<element signature="e#9056#9448#0#PHP" expanded="false" />
<element signature="e#9454#9738#0#PHP" expanded="false" />
<element signature="e#9743#10782#0#PHP" expanded="false" />
<element signature="e#10788#11076#0#PHP" expanded="false" />
<element signature="e#11081#12116#0#PHP" expanded="false" />
<element signature="e#12122#12703#0#PHP" expanded="false" />
<element signature="e#12708#14096#0#PHP" expanded="false" />
<element signature="e#14102#14558#0#PHP" expanded="false" />
<element signature="e#14563#16526#0#PHP" expanded="false" />
<element signature="e#16549#16904#0#PHP" expanded="false" />
<element signature="e#16910#17623#0#PHP" expanded="false" />
<element signature="e#17628#19085#0#PHP" expanded="false" />
<element signature="e#19091#19552#0#PHP" expanded="false" />
<element signature="e#19557#22579#0#PHP" expanded="false" />
<element signature="e#22585#23194#0#PHP" expanded="false" />
<element signature="e#23199#24484#0#PHP" expanded="false" />
<element signature="e#24490#24847#0#PHP" expanded="false" />
<element signature="e#24852#25733#0#PHP" expanded="false" />
<element signature="e#25739#26091#0#PHP" expanded="false" />
<element signature="e#26096#27174#0#PHP" expanded="false" />
<element signature="e#27180#27535#0#PHP" expanded="false" />
<element signature="e#27540#28634#0#PHP" expanded="false" />
<element signature="e#28640#29064#0#PHP" expanded="false" />
<element signature="e#29069#29680#0#PHP" expanded="false" />
<element signature="e#29686#30182#0#PHP" expanded="false" />
<element signature="e#30187#31884#0#PHP" expanded="false" />
<element signature="e#31890#32174#0#PHP" expanded="false" />
<element signature="e#32179#32815#0#PHP" expanded="false" />
<element signature="e#32836#33155#0#PHP" expanded="false" />
<element signature="e#33161#33569#0#PHP" expanded="false" />
<element signature="e#33575#34334#0#PHP" expanded="false" />
<element signature="e#34353#35217#0#PHP" expanded="false" />
<element signature="e#35243#35643#0#PHP" expanded="false" />
<element signature="e#35666#36239#0#PHP" expanded="false" />
<element signature="e#36262#37072#0#PHP" expanded="false" />
<element signature="e#37078#37677#0#PHP" expanded="false" />
<element signature="e#37682#38646#0#PHP" expanded="false" />
<element signature="e#38652#39319#0#PHP" expanded="false" />
<element signature="e#39324#40365#0#PHP" expanded="false" />
<element signature="e#40371#41034#0#PHP" expanded="false" />
<element signature="e#41039#42066#0#PHP" expanded="false" />
<element signature="e#42073#42504#0#PHP" expanded="false" />
<element signature="e#42509#43087#0#PHP" expanded="false" />
<element signature="e#43093#43522#0#PHP" expanded="false" />
<element signature="e#43527#44129#0#PHP" expanded="false" />
<element signature="e#44135#44562#0#PHP" expanded="false" />
<element signature="e#44567#45133#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -98,8 +98,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="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" />
<state relative-caret-position="183">
<caret line="1771" column="9" lean-forward="true" selection-start-line="1771" selection-start-column="9" selection-end-line="1771" selection-end-column="9" />
<folding />
</state>
</provider>
... ... @@ -194,8 +194,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="221" />
<option name="y" value="42" />
<option name="x" value="162" />
<option name="y" value="147" />
<option name="width" value="1700" />
<option name="height" value="1037" />
</component>
... ... @@ -351,15 +351,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="8017000" />
<workItem from="1575527294268" duration="8503000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="489829000" />
<option name="totallyTimeSpent" value="490315000" />
</component>
<component name="ToolWindowManager">
<frame x="221" y="42" width="1700" height="1037" extended-state="1" />
<frame x="162" y="147" 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" />
... ... @@ -900,77 +900,77 @@
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="183">
<caret line="1771" column="9" lean-forward="true" selection-start-line="1771" selection-start-column="9" selection-end-line="1771" selection-end-column="9" />
<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="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" />
<state relative-caret-position="325">
<caret line="84" column="15" lean-forward="true" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="15" />
<folding>
<element signature="e#1491#1720#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" />
<element signature="e#3368#3608#0#PHP" expanded="false" />
<element signature="e#3613#3848#0#PHP" expanded="false" />
<element signature="e#3854#4201#0#PHP" expanded="false" />
<element signature="e#4206#4652#0#PHP" expanded="false" />
<element signature="e#4658#4918#0#PHP" expanded="false" />
<element signature="e#4923#5124#0#PHP" expanded="false" />
<element signature="e#5130#5392#0#PHP" expanded="false" />
<element signature="e#5397#5602#0#PHP" expanded="false" />
<element signature="e#5608#6087#0#PHP" expanded="false" />
<element signature="e#6092#8211#0#PHP" expanded="false" />
<element signature="e#8234#8765#0#PHP" expanded="false" />
<element signature="e#8771#9051#0#PHP" expanded="false" />
<element signature="e#9056#9448#0#PHP" expanded="false" />
<element signature="e#9454#9738#0#PHP" expanded="false" />
<element signature="e#9743#10782#0#PHP" expanded="false" />
<element signature="e#10788#11076#0#PHP" expanded="false" />
<element signature="e#11081#12116#0#PHP" expanded="false" />
<element signature="e#12122#12703#0#PHP" expanded="false" />
<element signature="e#12708#14096#0#PHP" expanded="false" />
<element signature="e#14102#14558#0#PHP" expanded="false" />
<element signature="e#14563#16526#0#PHP" expanded="false" />
<element signature="e#16549#16904#0#PHP" expanded="false" />
<element signature="e#16910#17623#0#PHP" expanded="false" />
<element signature="e#17628#19085#0#PHP" expanded="false" />
<element signature="e#19091#19552#0#PHP" expanded="false" />
<element signature="e#19557#22579#0#PHP" expanded="false" />
<element signature="e#22585#23194#0#PHP" expanded="false" />
<element signature="e#23199#24484#0#PHP" expanded="false" />
<element signature="e#24490#24847#0#PHP" expanded="false" />
<element signature="e#24852#25733#0#PHP" expanded="false" />
<element signature="e#25739#26091#0#PHP" expanded="false" />
<element signature="e#26096#27174#0#PHP" expanded="false" />
<element signature="e#27180#27535#0#PHP" expanded="false" />
<element signature="e#27540#28634#0#PHP" expanded="false" />
<element signature="e#28640#29064#0#PHP" expanded="false" />
<element signature="e#29069#29680#0#PHP" expanded="false" />
<element signature="e#29686#30182#0#PHP" expanded="false" />
<element signature="e#30187#31884#0#PHP" expanded="false" />
<element signature="e#31890#32174#0#PHP" expanded="false" />
<element signature="e#32179#32815#0#PHP" expanded="false" />
<element signature="e#32836#33155#0#PHP" expanded="false" />
<element signature="e#33161#33569#0#PHP" expanded="false" />
<element signature="e#33575#34334#0#PHP" expanded="false" />
<element signature="e#34353#35217#0#PHP" expanded="false" />
<element signature="e#35243#35643#0#PHP" expanded="false" />
<element signature="e#35666#36239#0#PHP" expanded="false" />
<element signature="e#36262#37072#0#PHP" expanded="false" />
<element signature="e#37078#37677#0#PHP" expanded="false" />
<element signature="e#37682#38646#0#PHP" expanded="false" />
<element signature="e#38652#39319#0#PHP" expanded="false" />
<element signature="e#39324#40365#0#PHP" expanded="false" />
<element signature="e#40371#41034#0#PHP" expanded="false" />
<element signature="e#41039#42066#0#PHP" expanded="false" />
<element signature="e#42073#42504#0#PHP" expanded="false" />
<element signature="e#42509#43087#0#PHP" expanded="false" />
<element signature="e#43093#43522#0#PHP" expanded="false" />
<element signature="e#43527#44129#0#PHP" expanded="false" />
<element signature="e#44135#44562#0#PHP" expanded="false" />
<element signature="e#44567#45133#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' => ''//小号
... ...