郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 a723c6bd5532525556af98786abee89a883b3ae1 1 个父辈 ef24fb90
1 个管道 的构建 通过 耗费 10 秒

修改非必填字段

内嵌 并排对比
正在显示 4 个修改的文件 包含 64 行增加 和 118 行删除
... ... @@ -3,7 +3,9 @@
<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/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/HomePicController.php" afterPath="$PROJECT_DIR$/app/admin/controller/HomePicController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PicController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PicController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShopPicController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShopPicController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,41 +27,28 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<file leaf-file-name="PicController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/PicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="185" column="29" lean-forward="false" selection-start-line="185" selection-start-column="29" selection-end-line="185" selection-end-column="29" />
<state relative-caret-position="-694">
<caret line="61" column="38" lean-forward="false" selection-start-line="61" selection-start-column="38" selection-end-line="61" selection-end-column="38" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4018#0#PHP" expanded="false" />
<element signature="e#4023#4547#0#PHP" expanded="false" />
<element signature="e#4553#5143#0#PHP" expanded="false" />
<element signature="e#5148#6155#0#PHP" expanded="false" />
<element signature="e#6161#6479#0#PHP" expanded="false" />
<element signature="e#6484#6860#0#PHP" expanded="false" />
<element signature="e#6866#7221#0#PHP" expanded="false" />
<element signature="e#7226#7635#0#PHP" expanded="false" />
<element signature="e#7641#8026#0#PHP" expanded="false" />
<element signature="e#8031#8702#0#PHP" expanded="false" />
<element signature="e#8708#9154#0#PHP" expanded="false" />
<element signature="e#9159#10010#0#PHP" expanded="false" />
<element signature="e#10016#10286#0#PHP" expanded="false" />
<element signature="e#10291#10767#0#PHP" expanded="false" />
<element signature="e#10773#11403#0#PHP" expanded="false" />
<element signature="e#11408#13273#0#PHP" expanded="false" />
<element signature="e#598#1219#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomePicController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="68" column="52" lean-forward="false" selection-start-line="68" selection-start-column="52" selection-end-line="68" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -80,9 +69,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<option value="$PROJECT_DIR$/public/info.php" />
... ... @@ -131,6 +117,9 @@
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PicController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShopPicController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/HomePicController.php" />
</list>
</option>
</component>
... ... @@ -149,10 +138,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="283" />
<option name="y" value="56" />
<option name="x" value="314" />
<option name="y" value="94" />
<option name="width" value="1618" />
<option name="height" value="1092" />
<option name="height" value="1093" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -169,6 +158,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -179,53 +170,25 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="php-sdk" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -352,27 +315,27 @@
<workItem from="1576910858540" duration="1077000" />
<workItem from="1576913187617" duration="921000" />
<workItem from="1577063593250" duration="115000" />
<workItem from="1577063832311" duration="26000" />
<workItem from="1577063832311" duration="622000" />
<workItem from="1577244175098" duration="302000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="582119000" />
<option name="totallyTimeSpent" value="583017000" />
</component>
<component name="ToolWindowManager">
<frame x="283" y="56" width="1618" height="1092" extended-state="1" />
<editor active="true" />
<frame x="314" y="94" width="1618" height="1093" extended-state="1" />
<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.2195122" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22207959" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -414,27 +377,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -847,7 +789,6 @@
<state split_layout="SPLIT">
<first_editor relative-caret-position="375">
<caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="32" />
<folding />
</first_editor>
<second_editor />
</state>
... ... @@ -857,9 +798,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="855">
<caret line="105" column="36" lean-forward="false" selection-start-line="105" selection-start-column="36" selection-end-line="105" selection-end-column="36" />
<folding>
<element signature="e#867#1785#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -912,5 +850,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopPicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-694">
<caret line="61" column="38" lean-forward="false" selection-start-line="61" selection-start-column="38" selection-end-line="61" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-694">
<caret line="61" column="38" lean-forward="false" selection-start-line="61" selection-start-column="38" selection-end-line="61" selection-end-column="38" />
<folding>
<element signature="e#598#1219#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="68" column="52" lean-forward="false" selection-start-line="68" selection-start-column="52" selection-end-line="68" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -36,12 +36,9 @@ class HomePicController extends AdminBaseController
$param=$this->request->param();
$param['create_time']=time();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ... @@ -63,12 +60,9 @@ class HomePicController extends AdminBaseController
if($this->request->isPost()){
$param=$this->request->param();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ...
... ... @@ -36,12 +36,9 @@ class PicController extends AdminBaseController
$param=$this->request->param();
$param['create_time']=time();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ... @@ -63,12 +60,9 @@ class PicController extends AdminBaseController
if($this->request->isPost()){
$param=$this->request->param();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ...
... ... @@ -36,12 +36,9 @@ class ShopPicController extends AdminBaseController
$param=$this->request->param();
$param['create_time']=time();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ... @@ -63,12 +60,9 @@ class ShopPicController extends AdminBaseController
if($this->request->isPost()){
$param=$this->request->param();
$validate = new Validate([
'url'=>'require|url',
'thumbnail'=>'require',
]);
$validate->message([
'url.require'=>'链接地址不能为空',
'url.url'=>'链接地址格式不正确',
'thumbnail'=>'请上传缩略图',
]);
if (!$validate->check($param)) {
... ...