郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 49c40af8cee5f7927bb77f4d85f9b64b8f922ee7 1 个父辈 2fdbae4a
1 个管道 的构建 通过 耗费 0 秒

修改短信

内嵌 并排对比
正在显示 2 个修改的文件 包含 142 行增加 和 142 行删除
... ... @@ -2,7 +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$/simplewind/cmf/common.php" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" />
<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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,83 +24,83 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<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="475">
<caret line="91" column="23" lean-forward="true" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
<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" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3844#0#PHP" expanded="false" />
<element signature="e#3850#4197#0#PHP" expanded="false" />
<element signature="e#4202#4648#0#PHP" expanded="false" />
<element signature="e#4654#4914#0#PHP" expanded="false" />
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6083#0#PHP" expanded="false" />
<element signature="e#6088#8207#0#PHP" expanded="false" />
<element signature="e#8230#8761#0#PHP" expanded="false" />
<element signature="e#8767#9047#0#PHP" expanded="false" />
<element signature="e#9052#9444#0#PHP" expanded="false" />
<element signature="e#9450#9734#0#PHP" expanded="false" />
<element signature="e#9739#10778#0#PHP" expanded="false" />
<element signature="e#10784#11072#0#PHP" expanded="false" />
<element signature="e#11077#12112#0#PHP" expanded="false" />
<element signature="e#12118#12699#0#PHP" expanded="false" />
<element signature="e#12704#14092#0#PHP" expanded="false" />
<element signature="e#14098#14554#0#PHP" expanded="false" />
<element signature="e#14559#16522#0#PHP" expanded="false" />
<element signature="e#16545#16900#0#PHP" expanded="false" />
<element signature="e#16906#17619#0#PHP" expanded="false" />
<element signature="e#17624#19081#0#PHP" expanded="false" />
<element signature="e#19087#19548#0#PHP" expanded="false" />
<element signature="e#19553#22575#0#PHP" expanded="false" />
<element signature="e#22581#23190#0#PHP" expanded="false" />
<element signature="e#23195#24480#0#PHP" expanded="false" />
<element signature="e#24486#24843#0#PHP" expanded="false" />
<element signature="e#24848#25729#0#PHP" expanded="false" />
<element signature="e#25735#26087#0#PHP" expanded="false" />
<element signature="e#26092#27170#0#PHP" expanded="false" />
<element signature="e#27176#27531#0#PHP" expanded="false" />
<element signature="e#27536#28630#0#PHP" expanded="false" />
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31880#0#PHP" expanded="false" />
<element signature="e#31886#32170#0#PHP" expanded="false" />
<element signature="e#32175#32811#0#PHP" expanded="false" />
<element signature="e#32832#33151#0#PHP" expanded="false" />
<element signature="e#33157#33565#0#PHP" expanded="false" />
<element signature="e#33571#34330#0#PHP" expanded="false" />
<element signature="e#34349#35213#0#PHP" expanded="false" />
<element signature="e#35239#35639#0#PHP" expanded="false" />
<element signature="e#35662#36235#0#PHP" expanded="false" />
<element signature="e#36258#37068#0#PHP" expanded="false" />
<element signature="e#37074#37673#0#PHP" expanded="false" />
<element signature="e#37678#38642#0#PHP" expanded="false" />
<element signature="e#38648#39315#0#PHP" expanded="false" />
<element signature="e#39320#40361#0#PHP" expanded="false" />
<element signature="e#40367#41030#0#PHP" expanded="false" />
<element signature="e#41035#42062#0#PHP" expanded="false" />
<element signature="e#42069#42500#0#PHP" expanded="false" />
<element signature="e#42505#43083#0#PHP" expanded="false" />
<element signature="e#43089#43518#0#PHP" expanded="false" />
<element signature="e#43523#44125#0#PHP" expanded="false" />
<element signature="e#44131#44558#0#PHP" expanded="false" />
<element signature="e#44563#45129#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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="common.php" pinned="false" current-in-tab="true">
<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="416">
<caret line="1780" column="30" lean-forward="true" selection-start-line="1780" selection-start-column="30" selection-end-line="1780" selection-end-column="30" />
<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" />
<folding />
</state>
</provider>
... ... @@ -167,7 +167,6 @@
<option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
... ... @@ -177,6 +176,7 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -195,8 +195,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="116" />
<option name="y" value="72" />
<option name="x" value="245" />
<option name="y" value="84" />
<option name="width" value="1700" />
<option name="height" value="1037" />
</component>
... ... @@ -352,15 +352,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="5899000" />
<workItem from="1575527294268" duration="6040000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="487711000" />
<option name="totallyTimeSpent" value="487852000" />
</component>
<component name="ToolWindowManager">
<frame x="116" y="72" width="1700" height="1037" extended-state="1" />
<frame x="245" y="84" 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" />
... ... @@ -899,83 +899,83 @@
</state>
</provider>
</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" />
<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="475">
<caret line="91" column="23" lean-forward="true" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
<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" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3844#0#PHP" expanded="false" />
<element signature="e#3850#4197#0#PHP" expanded="false" />
<element signature="e#4202#4648#0#PHP" expanded="false" />
<element signature="e#4654#4914#0#PHP" expanded="false" />
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6083#0#PHP" expanded="false" />
<element signature="e#6088#8207#0#PHP" expanded="false" />
<element signature="e#8230#8761#0#PHP" expanded="false" />
<element signature="e#8767#9047#0#PHP" expanded="false" />
<element signature="e#9052#9444#0#PHP" expanded="false" />
<element signature="e#9450#9734#0#PHP" expanded="false" />
<element signature="e#9739#10778#0#PHP" expanded="false" />
<element signature="e#10784#11072#0#PHP" expanded="false" />
<element signature="e#11077#12112#0#PHP" expanded="false" />
<element signature="e#12118#12699#0#PHP" expanded="false" />
<element signature="e#12704#14092#0#PHP" expanded="false" />
<element signature="e#14098#14554#0#PHP" expanded="false" />
<element signature="e#14559#16522#0#PHP" expanded="false" />
<element signature="e#16545#16900#0#PHP" expanded="false" />
<element signature="e#16906#17619#0#PHP" expanded="false" />
<element signature="e#17624#19081#0#PHP" expanded="false" />
<element signature="e#19087#19548#0#PHP" expanded="false" />
<element signature="e#19553#22575#0#PHP" expanded="false" />
<element signature="e#22581#23190#0#PHP" expanded="false" />
<element signature="e#23195#24480#0#PHP" expanded="false" />
<element signature="e#24486#24843#0#PHP" expanded="false" />
<element signature="e#24848#25729#0#PHP" expanded="false" />
<element signature="e#25735#26087#0#PHP" expanded="false" />
<element signature="e#26092#27170#0#PHP" expanded="false" />
<element signature="e#27176#27531#0#PHP" expanded="false" />
<element signature="e#27536#28630#0#PHP" expanded="false" />
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31880#0#PHP" expanded="false" />
<element signature="e#31886#32170#0#PHP" expanded="false" />
<element signature="e#32175#32811#0#PHP" expanded="false" />
<element signature="e#32832#33151#0#PHP" expanded="false" />
<element signature="e#33157#33565#0#PHP" expanded="false" />
<element signature="e#33571#34330#0#PHP" expanded="false" />
<element signature="e#34349#35213#0#PHP" expanded="false" />
<element signature="e#35239#35639#0#PHP" expanded="false" />
<element signature="e#35662#36235#0#PHP" expanded="false" />
<element signature="e#36258#37068#0#PHP" expanded="false" />
<element signature="e#37074#37673#0#PHP" expanded="false" />
<element signature="e#37678#38642#0#PHP" expanded="false" />
<element signature="e#38648#39315#0#PHP" expanded="false" />
<element signature="e#39320#40361#0#PHP" expanded="false" />
<element signature="e#40367#41030#0#PHP" expanded="false" />
<element signature="e#41035#42062#0#PHP" expanded="false" />
<element signature="e#42069#42500#0#PHP" expanded="false" />
<element signature="e#42505#43083#0#PHP" expanded="false" />
<element signature="e#43089#43518#0#PHP" expanded="false" />
<element signature="e#43523#44125#0#PHP" expanded="false" />
<element signature="e#44131#44558#0#PHP" expanded="false" />
<element signature="e#44563#45129#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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="1780" column="30" lean-forward="true" selection-start-line="1780" selection-start-column="30" selection-end-line="1780" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -116,7 +116,7 @@ class UserController extends RestBaseController
// $this->error(['code' => 40006, 'msg' => 'sql执行失败']);
// }
$this->success('SUCCESS', ['code' => $number]);
$this->success('SUCCESS');
}
/**
... ...