郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 c98d1b549e1f8f3ca184760be5972b2a7ee0b16d 1 个父辈 2cc38d40
1 个管道 的构建 通过 耗费 9 秒

修改内容审核

内嵌 并排对比
正在显示 6 个修改的文件 包含 565 行增加 和 230 行删除
... ... @@ -3,7 +3,11 @@
<component name="ChangeListManager">
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/AreaController.php" afterPath="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/config.php" afterPath="$PROJECT_DIR$/api/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ActiveController.php" afterPath="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" afterPath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" afterPath="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,37 +18,24 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AreaController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<file leaf-file-name="SendController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
<state relative-caret-position="419">
<caret line="366" column="4" lean-forward="false" selection-start-line="366" selection-start-column="4" selection-end-line="473" selection-end-column="5" />
<folding>
<element signature="e#2995#3546#0#PHP" expanded="false" />
<element signature="e#3924#4475#0#PHP" expanded="false" />
<element signature="e#4853#5404#0#PHP" expanded="false" />
<element signature="e#11385#11564#0#PHP" expanded="false" />
<element signature="e#11591#11843#0#PHP" expanded="false" />
<element signature="e#11856#12107#0#PHP" expanded="false" />
<element signature="e#12120#12371#0#PHP" expanded="false" />
<element signature="e#12384#12636#0#PHP" expanded="false" />
<element signature="e#14194#28404#0#PHP" expanded="false" />
<element signature="e#28421#30917#0#PHP" expanded="false" />
<element signature="e#12767#13167#0#PHP" expanded="false" />
<element signature="e#13190#13763#0#PHP" expanded="false" />
<element signature="e#13770#13865#0#PHP" expanded="false" />
<element signature="e#13870#15269#0#PHP" expanded="false" />
<element signature="e#15274#15394#0#PHP" expanded="false" />
<element signature="e#15399#15694#0#PHP" expanded="false" />
<element signature="e#15713#16533#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5000">
<caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -68,9 +59,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/data/conf/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" />
... ... @@ -90,7 +78,6 @@
<option value="$PROJECT_DIR$/app/admin/controller/PictureController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/app/admin/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" />
... ... @@ -99,17 +86,30 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" />
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" />
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="&lt;c9443056-b22d-4117-b33a-1fa8bdfc3f9d&gt;/var/www/dev/back/resource/api/config.php" />
<option value="$PROJECT_DIR$/public/p.php" />
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php" />
<option value="&lt;c9443056-b22d-4117-b33a-1fa8bdfc3f9d&gt;/var/www/dev/back/resource/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" />
<option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/MyinfoController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/ReleaseController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/ActiveController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/SendController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/OtherController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
<option value="&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/ResourceController.php" />
</list>
</option>
</component>
... ... @@ -127,11 +127,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="185" />
<option name="y" value="67" />
<option name="width" value="1704" />
<option name="height" value="1065" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="241" />
<option name="y" value="75" />
<option name="width" value="1394" />
<option name="height" value="937" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -149,7 +149,6 @@
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -160,66 +159,37 @@
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="area" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" />
<property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
... ... @@ -306,22 +276,42 @@
<workItem from="1571120047201" duration="74000" />
<workItem from="1571126130237" duration="622000" />
<workItem from="1571128588622" duration="2923000" />
<workItem from="1571131859095" duration="65000" />
<workItem from="1571131859095" duration="740000" />
<workItem from="1571134937752" duration="1484000" />
<workItem from="1571186914794" duration="7013000" />
<workItem from="1571204218084" duration="657000" />
<workItem from="1571722195817" duration="8026000" />
<workItem from="1571795791431" duration="646000" />
<workItem from="1571796495113" duration="386000" />
<workItem from="1571963929136" duration="138000" />
<workItem from="1571964690911" duration="3293000" />
<workItem from="1571969489494" duration="243000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="477159000" />
<option name="totallyTimeSpent" value="499720000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="185" y="67" width="1704" height="1065" extended-state="1" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17761557" 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="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24093817" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1705757" 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.3297062" 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.34076828" sideWeight="0.50296295" 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.33" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" 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.2992383" sideWeight="0.49703702" 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" />
... ... @@ -330,6 +320,7 @@
<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" />
<window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" 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="combo" />
<window_info id="Find" 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="Ant Build" active="false" anchor="right" 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" />
... ... @@ -343,56 +334,23 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="9" />
<breakpoints>
<line-breakpoint enabled="true" type="php">
<url>remoteDeploymentFS://&lt;e8f0e519-7296-4827-aff7-3bdf7e4951c0&gt;/api/index/controller/SendController.php</url>
<line>222</line>
<option name="timeStamp" value="11" />
</line-breakpoint>
</breakpoints>
<option name="time" value="12" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Validate.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="23" column="28" lean-forward="true" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="70" column="84" lean-forward="false" selection-start-line="70" selection-start-column="84" selection-end-line="70" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/JobModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/d8585d9b898179f2871f8bd4c760c0ec.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/09a03adff86b1ef6d96ab3496f48a45a.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="248" column="6" lean-forward="true" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
... ... @@ -444,20 +402,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2406">
<caret line="59" column="33" lean-forward="false" selection-start-line="59" selection-start-column="33" selection-end-line="59" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-181">
<caret line="222" column="28" lean-forward="true" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
... ... @@ -515,34 +459,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/yuan1.png" />
<entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5073">
<caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-55">
<caret line="538" column="35" lean-forward="false" selection-start-line="538" selection-start-column="35" selection-end-line="538" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/conf/route.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -550,13 +466,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="599">
<caret line="300" column="32" lean-forward="false" selection-start-line="300" selection-start-column="32" selection-end-line="300" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/convention.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -578,13 +487,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
... ... @@ -603,15 +505,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="835">
<caret line="104" column="14" lean-forward="false" selection-start-line="104" selection-start-column="14" selection-end-line="104" selection-end-column="14" />
<folding>
<element signature="e#4078#4931#0#PHP" expanded="false" />
<element signature="e#4946#5282#0#PHP" expanded="false" />
<element signature="e#5297#5738#0#PHP" expanded="false" />
<element signature="e#5753#6664#0#PHP" expanded="false" />
<element signature="e#6669#6969#0#PHP" expanded="false" />
<element signature="e#6986#8411#0#PHP" expanded="false" />
<element signature="e#8428#9159#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -626,9 +519,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="835">
<caret line="53" column="84" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="84" />
<folding>
<element signature="e#1934#4707#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -636,7 +526,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -654,29 +543,132 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="15" column="39" lean-forward="false" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5000">
<state relative-caret-position="1953">
<caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="49" column="25" lean-forward="false" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="755">
<caret line="100" column="85" lean-forward="false" selection-start-line="100" selection-start-column="74" selection-end-line="100" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="990">
<caret line="155" column="80" lean-forward="true" selection-start-line="155" selection-start-column="80" selection-end-line="155" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/p.php" />
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="945">
<caret line="246" column="20" lean-forward="true" selection-start-line="246" selection-start-column="20" selection-end-line="246" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="445" column="5" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="792" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-29">
<caret line="58" column="7" lean-forward="true" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-12845">
<caret line="180" column="40" lean-forward="true" selection-start-line="180" selection-start-column="40" selection-end-line="180" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="869">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2031">
<caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
<folding>
<element signature="e#4108#4373#0#PHP" expanded="false" />
<element signature="e#4378#4728#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1094">
<caret line="297" column="23" lean-forward="true" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
<folding>
<element signature="e#8034#10467#0#PHP" expanded="false" />
<element signature="e#10473#10901#0#PHP" expanded="false" />
<element signature="e#10906#11717#0#PHP" expanded="false" />
<element signature="e#11737#12601#0#PHP" expanded="false" />
<element signature="e#12628#13028#0#PHP" expanded="false" />
<element signature="e#13052#13625#0#PHP" expanded="false" />
<element signature="e#13648#14458#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
<state relative-caret-position="419">
<caret line="366" column="4" lean-forward="false" selection-start-line="366" selection-start-column="4" selection-end-line="473" selection-end-column="5" />
<folding>
<element signature="e#2995#3546#0#PHP" expanded="false" />
<element signature="e#3924#4475#0#PHP" expanded="false" />
<element signature="e#4853#5404#0#PHP" expanded="false" />
<element signature="e#11385#11564#0#PHP" expanded="false" />
<element signature="e#11591#11843#0#PHP" expanded="false" />
<element signature="e#11856#12107#0#PHP" expanded="false" />
<element signature="e#12120#12371#0#PHP" expanded="false" />
<element signature="e#12384#12636#0#PHP" expanded="false" />
<element signature="e#14194#28404#0#PHP" expanded="false" />
<element signature="e#28421#30917#0#PHP" expanded="false" />
<element signature="e#12767#13167#0#PHP" expanded="false" />
<element signature="e#13190#13763#0#PHP" expanded="false" />
<element signature="e#13770#13865#0#PHP" expanded="false" />
<element signature="e#13870#15269#0#PHP" expanded="false" />
<element signature="e#15274#15394#0#PHP" expanded="false" />
<element signature="e#15399#15694#0#PHP" expanded="false" />
<element signature="e#15713#16533#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -258,5 +258,5 @@ return [
//小程序配置
'app_id' => 'wxa6fdb286b1a5ad67',
'app_secret' => '029cb6043b9cc94a2afeaa49da1f9e71',
'app_secret' => 'e314c2d957773eacff0442fc30b53cd6',//'029cb6043b9cc94a2afeaa49da1f9e71',
];
... ...
... ... @@ -187,6 +187,12 @@ class ActiveController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->where('id',$param['id'])
->update($param);
... ... @@ -631,5 +637,87 @@ class ActiveController extends RestBaseController
return $result;
}
/**
* 小程序内容安全审核
* @param $content 审核内容
* @param $type 类型（1，文本；2，图片；3，音频）
*/
public function secCheck($content,$type = 1) {
// if(!$type) {
// return true;
// }
$access_token = $this->get_access_token();
$basic_url = 'https://api.weixin.qq.com/wxa';
if($type == 1) {
$url = $basic_url.'/msg_sec_check?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['content'=>$v]);
}
} else {
$this->setUrl($url,['content'=>$content]);
}
}
if($type == 2) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片');
}
}
if($type == 3) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音');
}
}
}
/**
* 调用接口审核
* @param $url 跳转地址
* @param $post 审核内容
* @param $type_name
* @param $image
*/
private function setUrl($url,$post,$type_name = '文本') {
$result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE));
$return_data = json_decode($result,true);
if($return_data['errcode'] != 0) {
$this->error($type_name.'内容含有违法违规内容');
}
}
// curl方法
function curls($url, $post = null, $header = null) {
// 初始化
$curl = curl_init();
// 设置抓取的url
curl_setopt($curl, CURLOPT_URL, $url);
if($header) {
// 请求头
curl_setopt($curl,CURLOPT_HTTPHEADER,$header);
}
// 设置头文件的信息作为数据流输出
curl_setopt($curl, CURLOPT_TIMEOUT, 500);
curl_setopt($curl, CURLINFO_HEADER_OUT, true);
// 设置获取的信息以文件流的形式返回，而不是直接输出。
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
if($post) {
curl_setopt($curl, CURLOPT_POST, 1);
//把POST的变量加上
curl_setopt($curl, CURLOPT_POSTFIELDS, $post);
}
// 执行命令
$data = curl_exec($curl);
if (curl_errno($curl)) {
$data = curl_error($curl);
}
return $data;
}
}
\ No newline at end of file
... ...
... ... @@ -243,6 +243,12 @@ class ReleaseController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->where('id',$id)
->update($param);
... ... @@ -375,6 +381,14 @@ class ReleaseController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['workplace'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['empoying'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->where('id',$id)
->update($param);
... ... @@ -477,6 +491,13 @@ class ReleaseController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['adress'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->where('id',$id)
->update($param);
... ... @@ -660,4 +681,113 @@ class ReleaseController extends RestBaseController
}
$this->success('SUCCESS',$list);
}
public function get_access_token()
{
$app_id = config('app_id');
$app_secret = config('app_secret');
$url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='.$app_id.'&secret='.$app_secret;
$res = $this->http_get($url);
$json_arr = json_decode($res,true);
$token = $json_arr['access_token'];
return $token;
}
//curl get请求
public function http_get($url){
$curl = curl_init();//启动一个CURL会话
curl_setopt($curl, CURLOPT_URL,$url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在
curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环
curl_setopt($curl, CURLOPT_HEADER, false);//不开启header
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); // 获取的信息以文件流的形式返回
$result = curl_exec($curl); //执行操作
curl_close($curl);
return $result;
}
/**
* 小程序内容安全审核
* @param $content 审核内容
* @param $type 类型（1，文本；2，图片；3，音频）
*/
public function secCheck($content,$type = 1) {
// if(!$type) {
// return true;
// }
$access_token = $this->get_access_token();
$basic_url = 'https://api.weixin.qq.com/wxa';
if($type == 1) {
$url = $basic_url.'/msg_sec_check?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['content'=>$v]);
}
} else {
$this->setUrl($url,['content'=>$content]);
}
}
if($type == 2) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片');
}
}
if($type == 3) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音');
}
}
}
/**
* 调用接口审核
* @param $url 跳转地址
* @param $post 审核内容
* @param $type_name
* @param $image
*/
private function setUrl($url,$post,$type_name = '文本') {
$result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE));
$return_data = json_decode($result,true);
if($return_data['errcode'] != 0) {
$this->error($type_name.'内容含有违法违规内容');
}
}
// curl方法
function curls($url, $post = null, $header = null) {
// 初始化
$curl = curl_init();
// 设置抓取的url
curl_setopt($curl, CURLOPT_URL, $url);
if($header) {
// 请求头
curl_setopt($curl,CURLOPT_HTTPHEADER,$header);
}
// 设置头文件的信息作为数据流输出
curl_setopt($curl, CURLOPT_TIMEOUT, 500);
curl_setopt($curl, CURLINFO_HEADER_OUT, true);
// 设置获取的信息以文件流的形式返回，而不是直接输出。
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
if($post) {
curl_setopt($curl, CURLOPT_POST, 1);
//把POST的变量加上
curl_setopt($curl, CURLOPT_POSTFIELDS, $post);
}
// 执行命令
$data = curl_exec($curl);
if (curl_errno($curl)) {
$data = curl_error($curl);
}
return $data;
}
}
\ No newline at end of file
... ...
... ... @@ -76,6 +76,12 @@ class SendController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->insert($param);
if(empty($data)){
... ... @@ -188,6 +194,14 @@ class SendController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['workplace'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['empoying'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->insert($param);
if(empty($data)){
... ... @@ -259,6 +273,12 @@ class SendController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->insert($param);
if(empty($data)){
... ... @@ -326,6 +346,13 @@ class SendController extends RestBaseController
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$this->secCheck($param['job_title'],1);
$this->secCheck($param['company_name'],1);
$this->secCheck($param['adress'],1);
$this->secCheck($param['content'],1);
if(!empty($param['image'])){
$this->secCheck($param['image'],2);
}
$data = Db::name('job')
->insert($param);
if(empty($data)){
... ... @@ -335,4 +362,115 @@ class SendController extends RestBaseController
}
}
public function get_access_token()
{
$app_id = config('app_id');
$app_secret = config('app_secret');
$url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='.$app_id.'&secret='.$app_secret;
$res = $this->http_get($url);
$json_arr = json_decode($res,true);
$token = $json_arr['access_token'];
return $token;
}
//curl get请求
public function http_get($url){
$curl = curl_init();//启动一个CURL会话
curl_setopt($curl, CURLOPT_URL,$url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在
curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环
curl_setopt($curl, CURLOPT_HEADER, false);//不开启header
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); // 获取的信息以文件流的形式返回
$result = curl_exec($curl); //执行操作
curl_close($curl);
return $result;
}
/**
* 小程序内容安全审核
* @param $content 审核内容
* @param $type 类型（1，文本；2，图片；3，音频）
*/
public function secCheck($content,$type = 1) {
// if(!$type) {
// return true;
// }
$access_token = $this->get_access_token();
$basic_url = 'https://api.weixin.qq.com/wxa';
if($type == 1) {
$url = $basic_url.'/msg_sec_check?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['content'=>$v]);
}
} else {
$this->setUrl($url,['content'=>$content]);
}
}
if($type == 2) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片');
}
}
if($type == 3) {
$url = $basic_url.'/media_check_async?access_token='.$access_token;
if(is_array($content)) {
foreach ($content as $v) {
$this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音');
}
} else {
$this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音');
}
}
}
/**
* 调用接口审核
* @param $url 跳转地址
* @param $post 审核内容
* @param $type_name
* @param $image
*/
private function setUrl($url,$post,$type_name = '文本') {
$result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE));
$return_data = json_decode($result,true);
if($return_data['errcode'] != 0) {
$this->error($type_name.'内容含有违法违规内容');
}
}
// curl方法
function curls($url, $post = null, $header = null) {
// 初始化
$curl = curl_init();
// 设置抓取的url
curl_setopt($curl, CURLOPT_URL, $url);
if($header) {
// 请求头
curl_setopt($curl,CURLOPT_HTTPHEADER,$header);
}
// 设置头文件的信息作为数据流输出
curl_setopt($curl, CURLOPT_TIMEOUT, 500);
curl_setopt($curl, CURLINFO_HEADER_OUT, true);
// 设置获取的信息以文件流的形式返回，而不是直接输出。
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
if($post) {
curl_setopt($curl, CURLOPT_POST, 1);
//把POST的变量加上
curl_setopt($curl, CURLOPT_POSTFIELDS, $post);
}
// 执行命令
$data = curl_exec($curl);
if (curl_errno($curl)) {
$data = curl_error($curl);
}
return $data;
}
}
\ No newline at end of file
... ...
... ... @@ -24,29 +24,16 @@ class Prpcrypt
public function decrypt($aesCipher, $aesIV)
{
if (function_exists('mcrypt_module_open')) {
try {
$module = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
mcrypt_generic_init($module, $this->key, $aesIV);
//解密
$decrypted = mdecrypt_generic($module, $aesCipher);
mcrypt_generic_deinit($module);
mcrypt_module_close($module);
} catch (\Exception $e) {
return [ErrorCode::$IllegalBuffer, null];
}
} else if (function_exists('openssl_decrypt')) {
try {
$decrypted = openssl_decrypt($aesCipher, 'AES-128-CBC', $this->key, OPENSSL_RAW_DATA, $aesIV);
$decrypted = openssl_decrypt($aesCipher, "aes-128-cbc", $this->key, OPENSSL_RAW_DATA ,$aesIV);
if ($decrypted === false) return [ErrorCode::$IllegalBuffer, null];
} catch (Exception $e) {
return array(ErrorCode::$IllegalBuffer, null);
}
try {
try {
//去除补位字符
$pkc_encoder = new PKCS7Encoder;
$result = $pkc_encoder->decode($decrypted);
... ...