郭盛 / areial · 提交

转到一个项目

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

修改图片详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 21 行增加 和 49 行删除
... ... @@ -5,11 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -23,8 +19,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-183">
<caret line="364" column="25" lean-forward="true" selection-start-line="364" selection-start-column="25" selection-end-line="364" selection-end-column="25" />
<state relative-caret-position="-252">
<caret line="623" column="13" lean-forward="false" selection-start-line="623" selection-start-column="13" selection-end-line="623" selection-end-column="13" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -44,14 +40,13 @@
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#18083#21577#0#PHP" expanded="false" />
<element signature="e#21583#22513#0#PHP" expanded="false" />
<element signature="e#22518#26568#0#PHP" expanded="false" />
<element signature="e#26574#26951#0#PHP" expanded="false" />
... ... @@ -211,9 +206,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="141" />
<option name="y" value="101" />
<component name="ProjectFrameBounds">
<option name="x" value="372" />
<option name="y" value="119" />
<option name="width" value="1652" />
<option name="height" value="917" />
</component>
... ... @@ -250,27 +245,6 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="pic" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -423,7 +397,7 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="14571000" />
<workItem from="1583886688361" duration="15391000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -450,7 +424,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="611710000" />
<option name="totallyTimeSpent" value="612530000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -462,8 +436,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="141" y="101" width="1652" height="917" extended-state="1" />
<editor active="true" />
<frame x="372" y="119" width="1652" height="917" extended-state="0" />
<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.16520101" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -472,7 +445,7 @@
<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="1" 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="5" 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="2" 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.46666667" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46666667" sideWeight="0.5" order="2" 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="0" 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="6" 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="7" side_tool="false" content_ui="tabs" />
... ... @@ -918,8 +891,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-183">
<caret line="364" column="25" lean-forward="true" selection-start-line="364" selection-start-column="25" selection-end-line="364" selection-end-column="25" />
<state relative-caret-position="-252">
<caret line="623" column="13" lean-forward="false" selection-start-line="623" selection-start-column="13" selection-end-line="623" selection-end-column="13" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -939,14 +912,13 @@
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#18083#21577#0#PHP" expanded="false" />
<element signature="e#21583#22513#0#PHP" expanded="false" />
<element signature="e#22518#26568#0#PHP" expanded="false" />
<element signature="e#26574#26951#0#PHP" expanded="false" />
... ...
... ... @@ -586,6 +586,9 @@ class User extends Api
->field('text_ids,address_ids,id,keyword,title,thumbnail,price,water_url,url,code,click_num')
->where('id',$pic_id)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$keyword = str_replace(' ',',',$data['keyword']);
//单取出所有关键字合并数组
... ... @@ -599,10 +602,6 @@ class User extends Api
$key = $keywords.','.$keyword;
$a = trim($key,',');
$data['keyword'] = explode(',',$a);
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['accredit'] = $rule.$accredit['thumbnail'];
... ... @@ -620,6 +619,9 @@ class User extends Api
->field('text_ids,address_ids,keyword,id,title,thumbnail,price,water_url,url,code,click_num')
->where('id',$pic_id)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$keyword = str_replace(' ',',',$data['keyword']);
//单取出所有关键字合并数组
... ... @@ -637,9 +639,7 @@ class User extends Api
$accredit = Db::name('accredit')
->where('id',1)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['is_vip'] = 1;
... ...
... ... @@ -7530,7 +7530,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-11 14:18:12 </div>
Generated on 2020-03-11 14:34:55 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...