郭盛 / areial · 提交

转到一个项目

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

手机号

内嵌 并排对比
正在显示 2 个修改的文件 包含 17 行增加 和 18 行删除
... ... @@ -2,6 +2,7 @@
<project version="4">
<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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -16,8 +17,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="244">
<caret line="1635" column="37" lean-forward="true" selection-start-line="1635" selection-start-column="37" selection-end-line="1635" selection-end-column="37" />
<state relative-caret-position="344">
<caret line="1654" column="42" lean-forward="true" selection-start-line="1654" selection-start-column="42" selection-end-line="1654" selection-end-column="42" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -79,9 +80,8 @@
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
<element signature="e#57365#58080#0#PHP" expanded="false" />
<element signature="e#58086#58513#0#PHP" expanded="false" />
<element signature="e#58518#58783#0#PHP" expanded="false" />
<element signature="e#57384#58099#0#PHP" expanded="false" />
<element signature="e#58105#58532#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -174,8 +174,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="125" />
<option name="y" value="24" />
<option name="x" value="203" />
<option name="y" value="36" />
<option name="width" value="1776" />
<option name="height" value="1081" />
</component>
... ... @@ -278,7 +278,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="16525000" />
<workItem from="1574831367903" duration="17171000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -291,7 +291,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="270182000" />
<option name="totallyTimeSpent" value="270828000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -303,7 +303,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="125" y="24" width="1776" height="1081" extended-state="1" />
<frame x="203" y="36" width="1776" height="1081" 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.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -775,16 +775,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="8" lean-forward="false" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="8" />
<state relative-caret-position="100">
<caret line="4" column="52" lean-forward="true" selection-start-line="4" selection-start-column="52" selection-end-line="4" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="1635" column="37" lean-forward="true" selection-start-line="1635" selection-start-column="37" selection-end-line="1635" selection-end-column="37" />
<state relative-caret-position="344">
<caret line="1654" column="42" lean-forward="true" selection-start-line="1654" selection-start-column="42" selection-end-line="1654" selection-end-column="42" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -846,9 +846,8 @@
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
<element signature="e#57365#58080#0#PHP" expanded="false" />
<element signature="e#58086#58513#0#PHP" expanded="false" />
<element signature="e#58518#58783#0#PHP" expanded="false" />
<element signature="e#57384#58099#0#PHP" expanded="false" />
<element signature="e#58105#58532#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1652,7 +1652,7 @@ class User extends Api
$return['data'] = json_decode($return['data'],true);
}
return $return;
$this->success('SUCCESS',$return);
}
private function decryptData( $appid,$sessionKey,$encryptedData, $iv, &$data )
... ...