正在显示
6 个修改的文件
包含
563 行增加
和
228 行删除
@@ -3,7 +3,11 @@ | @@ -3,7 +3,11 @@ | ||
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> | 4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> |
5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
6 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/AreaController.php" afterPath="$PROJECT_DIR$/app/admin/controller/AreaController.php" /> | 6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/config.php" afterPath="$PROJECT_DIR$/api/config.php" /> |
7 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ActiveController.php" afterPath="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> | ||
8 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" afterPath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | ||
9 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
10 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" afterPath="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" /> | ||
7 | </list> | 11 | </list> |
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
9 | <option name="TRACKING_ENABLED" value="true" /> | 13 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -14,37 +18,24 @@ | @@ -14,37 +18,24 @@ | ||
14 | </component> | 18 | </component> |
15 | <component name="FileEditorManager"> | 19 | <component name="FileEditorManager"> |
16 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 20 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
17 | - <file leaf-file-name="AreaController.php" pinned="false" current-in-tab="true"> | ||
18 | - <entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php"> | 21 | + <file leaf-file-name="SendController.php" pinned="false" current-in-tab="true"> |
22 | + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | ||
19 | <provider selected="true" editor-type-id="text-editor"> | 23 | <provider selected="true" editor-type-id="text-editor"> |
20 | - <state relative-caret-position="1250"> | ||
21 | - <caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" /> | 24 | + <state relative-caret-position="419"> |
25 | + <caret line="366" column="4" lean-forward="false" selection-start-line="366" selection-start-column="4" selection-end-line="473" selection-end-column="5" /> | ||
22 | <folding> | 26 | <folding> |
23 | - <element signature="e#2995#3546#0#PHP" expanded="false" /> | ||
24 | - <element signature="e#3924#4475#0#PHP" expanded="false" /> | ||
25 | - <element signature="e#4853#5404#0#PHP" expanded="false" /> | ||
26 | - <element signature="e#11385#11564#0#PHP" expanded="false" /> | ||
27 | - <element signature="e#11591#11843#0#PHP" expanded="false" /> | ||
28 | - <element signature="e#11856#12107#0#PHP" expanded="false" /> | ||
29 | - <element signature="e#12120#12371#0#PHP" expanded="false" /> | ||
30 | - <element signature="e#12384#12636#0#PHP" expanded="false" /> | ||
31 | - <element signature="e#14194#28404#0#PHP" expanded="false" /> | ||
32 | - <element signature="e#28421#30917#0#PHP" expanded="false" /> | 27 | + <element signature="e#12767#13167#0#PHP" expanded="false" /> |
28 | + <element signature="e#13190#13763#0#PHP" expanded="false" /> | ||
29 | + <element signature="e#13770#13865#0#PHP" expanded="false" /> | ||
30 | + <element signature="e#13870#15269#0#PHP" expanded="false" /> | ||
31 | + <element signature="e#15274#15394#0#PHP" expanded="false" /> | ||
32 | + <element signature="e#15399#15694#0#PHP" expanded="false" /> | ||
33 | + <element signature="e#15713#16533#0#PHP" expanded="false" /> | ||
33 | </folding> | 34 | </folding> |
34 | </state> | 35 | </state> |
35 | </provider> | 36 | </provider> |
36 | </entry> | 37 | </entry> |
37 | </file> | 38 | </file> |
38 | - <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> | ||
39 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html"> | ||
40 | - <provider selected="true" editor-type-id="text-editor"> | ||
41 | - <state relative-caret-position="5000"> | ||
42 | - <caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" /> | ||
43 | - <folding /> | ||
44 | - </state> | ||
45 | - </provider> | ||
46 | - </entry> | ||
47 | - </file> | ||
48 | </leaf> | 39 | </leaf> |
49 | </component> | 40 | </component> |
50 | <component name="FileTemplateManagerImpl"> | 41 | <component name="FileTemplateManagerImpl"> |
@@ -68,9 +59,6 @@ | @@ -68,9 +59,6 @@ | ||
68 | <component name="IdeDocumentHistory"> | 59 | <component name="IdeDocumentHistory"> |
69 | <option name="CHANGED_PATHS"> | 60 | <option name="CHANGED_PATHS"> |
70 | <list> | 61 | <list> |
71 | - <option value="$PROJECT_DIR$/data/conf/database.php" /> | ||
72 | - <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> | ||
73 | - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> | ||
74 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> | 62 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> |
75 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> | 63 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> |
76 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" /> | 64 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" /> |
@@ -90,7 +78,6 @@ | @@ -90,7 +78,6 @@ | ||
90 | <option value="$PROJECT_DIR$/app/admin/controller/PictureController.php" /> | 78 | <option value="$PROJECT_DIR$/app/admin/controller/PictureController.php" /> |
91 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" /> | 79 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" /> |
92 | <option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" /> | 80 | <option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" /> |
93 | - <option value="$PROJECT_DIR$/api/config.php" /> | ||
94 | <option value="$PROJECT_DIR$/app/admin/controller/FinanceController.php" /> | 81 | <option value="$PROJECT_DIR$/app/admin/controller/FinanceController.php" /> |
95 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html" /> | 82 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html" /> |
96 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" /> | 83 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" /> |
@@ -99,17 +86,30 @@ | @@ -99,17 +86,30 @@ | ||
99 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" /> | 86 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" /> |
100 | <option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" /> | 87 | <option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" /> |
101 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" /> | 88 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" /> |
102 | - <option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> | ||
103 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" /> | 89 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" /> |
104 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> | 90 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> |
105 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> | 91 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> |
106 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | 92 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> |
107 | - <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
108 | <option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" /> | 93 | <option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" /> |
109 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 94 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> |
110 | - <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
111 | - <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | ||
112 | <option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" /> | 95 | <option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" /> |
96 | + <option value="$PROJECT_DIR$/api/config.php" /> | ||
97 | + <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> | ||
98 | + <option value="<c9443056-b22d-4117-b33a-1fa8bdfc3f9d>/var/www/dev/back/resource/api/config.php" /> | ||
99 | + <option value="$PROJECT_DIR$/public/p.php" /> | ||
100 | + <option value="$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php" /> | ||
101 | + <option value="<c9443056-b22d-4117-b33a-1fa8bdfc3f9d>/var/www/dev/back/resource/api/wxapp/controller/PublicController.php" /> | ||
102 | + <option value="$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php" /> | ||
103 | + <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
104 | + <option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" /> | ||
105 | + <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | ||
106 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/MyinfoController.php" /> | ||
107 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/ReleaseController.php" /> | ||
108 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/ActiveController.php" /> | ||
109 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/SendController.php" /> | ||
110 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/OtherController.php" /> | ||
111 | + <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
112 | + <option value="<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/ResourceController.php" /> | ||
113 | </list> | 113 | </list> |
114 | </option> | 114 | </option> |
115 | </component> | 115 | </component> |
@@ -127,11 +127,11 @@ | @@ -127,11 +127,11 @@ | ||
127 | <sorting>DEFINITION_ORDER</sorting> | 127 | <sorting>DEFINITION_ORDER</sorting> |
128 | </component> | 128 | </component> |
129 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 129 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
130 | - <component name="ProjectFrameBounds" extendedState="1"> | ||
131 | - <option name="x" value="185" /> | ||
132 | - <option name="y" value="67" /> | ||
133 | - <option name="width" value="1704" /> | ||
134 | - <option name="height" value="1065" /> | 130 | + <component name="ProjectFrameBounds" extendedState="6"> |
131 | + <option name="x" value="241" /> | ||
132 | + <option name="y" value="75" /> | ||
133 | + <option name="width" value="1394" /> | ||
134 | + <option name="height" value="937" /> | ||
135 | </component> | 135 | </component> |
136 | <component name="ProjectView"> | 136 | <component name="ProjectView"> |
137 | <navigator currentView="ProjectPane" proportions="" version="1"> | 137 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -149,7 +149,6 @@ | @@ -149,7 +149,6 @@ | ||
149 | </navigator> | 149 | </navigator> |
150 | <panes> | 150 | <panes> |
151 | <pane id="Scratches" /> | 151 | <pane id="Scratches" /> |
152 | - <pane id="Scope" /> | ||
153 | <pane id="ProjectPane"> | 152 | <pane id="ProjectPane"> |
154 | <subPane> | 153 | <subPane> |
155 | <expand> | 154 | <expand> |
@@ -160,66 +159,37 @@ | @@ -160,66 +159,37 @@ | ||
160 | <path> | 159 | <path> |
161 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | 160 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> |
162 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | 161 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> |
163 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | 162 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> |
164 | </path> | 163 | </path> |
165 | <path> | 164 | <path> |
166 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | 165 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> |
167 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | 166 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> |
168 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
169 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | 167 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> |
168 | + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
170 | </path> | 169 | </path> |
171 | <path> | 170 | <path> |
172 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | 171 | <item name="resource" type="b2602c69:ProjectViewProjectNode" /> |
173 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | 172 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> |
174 | - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
175 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | 173 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> |
174 | + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
176 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 175 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> |
177 | </path> | 176 | </path> |
178 | - <path> | ||
179 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
180 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
181 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
182 | - </path> | ||
183 | - <path> | ||
184 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
185 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
186 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
187 | - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
188 | - </path> | ||
189 | - <path> | ||
190 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
191 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
192 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
193 | - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
194 | - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
195 | - </path> | ||
196 | - <path> | ||
197 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
198 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
199 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
200 | - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
201 | - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
202 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
203 | - </path> | ||
204 | - <path> | ||
205 | - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
206 | - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
207 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
208 | - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
209 | - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
210 | - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
211 | - <item name="area" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
212 | - </path> | ||
213 | </expand> | 177 | </expand> |
214 | <select /> | 178 | <select /> |
215 | </subPane> | 179 | </subPane> |
216 | </pane> | 180 | </pane> |
181 | + <pane id="Scope" /> | ||
217 | </panes> | 182 | </panes> |
218 | </component> | 183 | </component> |
219 | <component name="PropertiesComponent"> | 184 | <component name="PropertiesComponent"> |
220 | - <property name="WebServerToolWindowFactoryState" value="false" /> | 185 | + <property name="WebServerToolWindowFactoryState" value="true" /> |
221 | <property name="last_opened_file_path" value="$PROJECT_DIR$" /> | 186 | <property name="last_opened_file_path" value="$PROJECT_DIR$" /> |
222 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 187 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
188 | + <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" /> | ||
189 | + <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" /> | ||
190 | + <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" /> | ||
191 | + <property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" /> | ||
192 | + <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" /> | ||
223 | </component> | 193 | </component> |
224 | <component name="RecentsManager"> | 194 | <component name="RecentsManager"> |
225 | <key name="CopyFile.RECENT_KEYS"> | 195 | <key name="CopyFile.RECENT_KEYS"> |
@@ -306,22 +276,42 @@ | @@ -306,22 +276,42 @@ | ||
306 | <workItem from="1571120047201" duration="74000" /> | 276 | <workItem from="1571120047201" duration="74000" /> |
307 | <workItem from="1571126130237" duration="622000" /> | 277 | <workItem from="1571126130237" duration="622000" /> |
308 | <workItem from="1571128588622" duration="2923000" /> | 278 | <workItem from="1571128588622" duration="2923000" /> |
309 | - <workItem from="1571131859095" duration="65000" /> | 279 | + <workItem from="1571131859095" duration="740000" /> |
280 | + <workItem from="1571134937752" duration="1484000" /> | ||
281 | + <workItem from="1571186914794" duration="7013000" /> | ||
282 | + <workItem from="1571204218084" duration="657000" /> | ||
283 | + <workItem from="1571722195817" duration="8026000" /> | ||
284 | + <workItem from="1571795791431" duration="646000" /> | ||
285 | + <workItem from="1571796495113" duration="386000" /> | ||
286 | + <workItem from="1571963929136" duration="138000" /> | ||
287 | + <workItem from="1571964690911" duration="3293000" /> | ||
288 | + <workItem from="1571969489494" duration="243000" /> | ||
310 | </task> | 289 | </task> |
311 | <servers /> | 290 | <servers /> |
312 | </component> | 291 | </component> |
313 | <component name="TimeTrackingManager"> | 292 | <component name="TimeTrackingManager"> |
314 | - <option name="totallyTimeSpent" value="477159000" /> | 293 | + <option name="totallyTimeSpent" value="499720000" /> |
294 | + </component> | ||
295 | + <component name="TodoView"> | ||
296 | + <todo-panel id="selected-file"> | ||
297 | + <is-autoscroll-to-source value="true" /> | ||
298 | + </todo-panel> | ||
299 | + <todo-panel id="all"> | ||
300 | + <are-packages-shown value="true" /> | ||
301 | + <is-autoscroll-to-source value="true" /> | ||
302 | + </todo-panel> | ||
315 | </component> | 303 | </component> |
316 | <component name="ToolWindowManager"> | 304 | <component name="ToolWindowManager"> |
317 | - <frame x="185" y="67" width="1704" height="1065" extended-state="1" /> | 305 | + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
306 | + <editor active="true" /> | ||
318 | <layout> | 307 | <layout> |
319 | - <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" /> | ||
320 | - <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" /> | 308 | + <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" /> |
309 | + <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" /> | ||
310 | + <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" /> | ||
321 | <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" /> | 311 | <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" /> |
322 | <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" /> | 312 | <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" /> |
323 | <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" /> | 313 | <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" /> |
324 | - <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" /> | 314 | + <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" /> |
325 | <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" /> | 315 | <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" /> |
326 | <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" /> | 316 | <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" /> |
327 | <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" /> | 317 | <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 @@ | @@ -330,6 +320,7 @@ | ||
330 | <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" /> | 320 | <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" /> |
331 | <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" /> | 321 | <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" /> |
332 | <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" /> | 322 | <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" /> |
323 | + <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" /> | ||
333 | <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" /> | 324 | <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" /> |
334 | <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" /> | 325 | <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" /> |
335 | <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" /> | 326 | <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 @@ | @@ -343,56 +334,23 @@ | ||
343 | </component> | 334 | </component> |
344 | <component name="XDebuggerManager"> | 335 | <component name="XDebuggerManager"> |
345 | <breakpoint-manager> | 336 | <breakpoint-manager> |
346 | - <option name="time" value="9" /> | 337 | + <breakpoints> |
338 | + <line-breakpoint enabled="true" type="php"> | ||
339 | + <url>remoteDeploymentFS://<e8f0e519-7296-4827-aff7-3bdf7e4951c0>/api/index/controller/SendController.php</url> | ||
340 | + <line>222</line> | ||
341 | + <option name="timeStamp" value="11" /> | ||
342 | + </line-breakpoint> | ||
343 | + </breakpoints> | ||
344 | + <option name="time" value="12" /> | ||
347 | </breakpoint-manager> | 345 | </breakpoint-manager> |
348 | <watches-manager /> | 346 | <watches-manager /> |
349 | </component> | 347 | </component> |
350 | <component name="editorHistoryManager"> | 348 | <component name="editorHistoryManager"> |
351 | - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Validate.php"> | ||
352 | - <provider selected="true" editor-type-id="text-editor"> | ||
353 | - <state relative-caret-position="175"> | ||
354 | - <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" /> | ||
355 | - </state> | ||
356 | - </provider> | ||
357 | - </entry> | ||
358 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html"> | ||
359 | - <provider selected="true" editor-type-id="text-editor"> | ||
360 | - <state relative-caret-position="200"> | ||
361 | - <caret line="23" column="28" lean-forward="true" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" /> | ||
362 | - </state> | ||
363 | - </provider> | ||
364 | - </entry> | ||
365 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html"> | ||
366 | - <provider selected="true" editor-type-id="text-editor"> | ||
367 | - <state relative-caret-position="525"> | ||
368 | - <caret line="70" column="84" lean-forward="false" selection-start-line="70" selection-start-column="84" selection-end-line="70" selection-end-column="84" /> | ||
369 | - </state> | ||
370 | - </provider> | ||
371 | - </entry> | ||
372 | - <entry file="file://$PROJECT_DIR$/api/index/model/JobModel.php"> | ||
373 | - <provider selected="true" editor-type-id="text-editor"> | ||
374 | - <state relative-caret-position="0"> | ||
375 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
376 | - </state> | ||
377 | - </provider> | ||
378 | - </entry> | ||
379 | - <entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/d8585d9b898179f2871f8bd4c760c0ec.png"> | ||
380 | - <provider selected="true" editor-type-id="images"> | ||
381 | - <state /> | ||
382 | - </provider> | ||
383 | - </entry> | ||
384 | <entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/09a03adff86b1ef6d96ab3496f48a45a.png"> | 349 | <entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/09a03adff86b1ef6d96ab3496f48a45a.png"> |
385 | <provider selected="true" editor-type-id="images"> | 350 | <provider selected="true" editor-type-id="images"> |
386 | <state /> | 351 | <state /> |
387 | </provider> | 352 | </provider> |
388 | </entry> | 353 | </entry> |
389 | - <entry file="file://$PROJECT_DIR$/api/config.php"> | ||
390 | - <provider selected="true" editor-type-id="text-editor"> | ||
391 | - <state relative-caret-position="274"> | ||
392 | - <caret line="248" column="6" lean-forward="true" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" /> | ||
393 | - </state> | ||
394 | - </provider> | ||
395 | - </entry> | ||
396 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> | 354 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> |
397 | <provider selected="true" editor-type-id="text-editor"> | 355 | <provider selected="true" editor-type-id="text-editor"> |
398 | <state relative-caret-position="25"> | 356 | <state relative-caret-position="25"> |
@@ -444,20 +402,6 @@ | @@ -444,20 +402,6 @@ | ||
444 | </state> | 402 | </state> |
445 | </provider> | 403 | </provider> |
446 | </entry> | 404 | </entry> |
447 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | ||
448 | - <provider selected="true" editor-type-id="text-editor"> | ||
449 | - <state relative-caret-position="-2406"> | ||
450 | - <caret line="59" column="33" lean-forward="false" selection-start-line="59" selection-start-column="33" selection-end-line="59" selection-end-column="33" /> | ||
451 | - </state> | ||
452 | - </provider> | ||
453 | - </entry> | ||
454 | - <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | ||
455 | - <provider selected="true" editor-type-id="text-editor"> | ||
456 | - <state relative-caret-position="-181"> | ||
457 | - <caret line="222" column="28" lean-forward="true" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" /> | ||
458 | - </state> | ||
459 | - </provider> | ||
460 | - </entry> | ||
461 | <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> | 405 | <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> |
462 | <provider selected="true" editor-type-id="text-editor"> | 406 | <provider selected="true" editor-type-id="text-editor"> |
463 | <state relative-caret-position="250"> | 407 | <state relative-caret-position="250"> |
@@ -515,34 +459,6 @@ | @@ -515,34 +459,6 @@ | ||
515 | </provider> | 459 | </provider> |
516 | </entry> | 460 | </entry> |
517 | <entry file="file://$PROJECT_DIR$/public/yuan1.png" /> | 461 | <entry file="file://$PROJECT_DIR$/public/yuan1.png" /> |
518 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php"> | ||
519 | - <provider selected="true" editor-type-id="text-editor"> | ||
520 | - <state relative-caret-position="5073"> | ||
521 | - <caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" /> | ||
522 | - </state> | ||
523 | - </provider> | ||
524 | - </entry> | ||
525 | - <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> | ||
526 | - <provider selected="true" editor-type-id="text-editor"> | ||
527 | - <state relative-caret-position="375"> | ||
528 | - <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> | ||
529 | - </state> | ||
530 | - </provider> | ||
531 | - </entry> | ||
532 | - <entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"> | ||
533 | - <provider selected="true" editor-type-id="text-editor"> | ||
534 | - <state relative-caret-position="375"> | ||
535 | - <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> | ||
536 | - </state> | ||
537 | - </provider> | ||
538 | - </entry> | ||
539 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> | ||
540 | - <provider selected="true" editor-type-id="text-editor"> | ||
541 | - <state relative-caret-position="-55"> | ||
542 | - <caret line="538" column="35" lean-forward="false" selection-start-line="538" selection-start-column="35" selection-end-line="538" selection-end-column="35" /> | ||
543 | - </state> | ||
544 | - </provider> | ||
545 | - </entry> | ||
546 | <entry file="file://$PROJECT_DIR$/data/conf/route.php"> | 462 | <entry file="file://$PROJECT_DIR$/data/conf/route.php"> |
547 | <provider selected="true" editor-type-id="text-editor"> | 463 | <provider selected="true" editor-type-id="text-editor"> |
548 | <state relative-caret-position="0"> | 464 | <state relative-caret-position="0"> |
@@ -550,13 +466,6 @@ | @@ -550,13 +466,6 @@ | ||
550 | </state> | 466 | </state> |
551 | </provider> | 467 | </provider> |
552 | </entry> | 468 | </entry> |
553 | - <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
554 | - <provider selected="true" editor-type-id="text-editor"> | ||
555 | - <state relative-caret-position="599"> | ||
556 | - <caret line="300" column="32" lean-forward="false" selection-start-line="300" selection-start-column="32" selection-end-line="300" selection-end-column="32" /> | ||
557 | - </state> | ||
558 | - </provider> | ||
559 | - </entry> | ||
560 | <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/convention.php"> | 469 | <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/convention.php"> |
561 | <provider selected="true" editor-type-id="text-editor"> | 470 | <provider selected="true" editor-type-id="text-editor"> |
562 | <state relative-caret-position="0"> | 471 | <state relative-caret-position="0"> |
@@ -578,13 +487,6 @@ | @@ -578,13 +487,6 @@ | ||
578 | </state> | 487 | </state> |
579 | </provider> | 488 | </provider> |
580 | </entry> | 489 | </entry> |
581 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html"> | ||
582 | - <provider selected="true" editor-type-id="text-editor"> | ||
583 | - <state relative-caret-position="190"> | ||
584 | - <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" /> | ||
585 | - </state> | ||
586 | - </provider> | ||
587 | - </entry> | ||
588 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"> | 490 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"> |
589 | <provider selected="true" editor-type-id="text-editor"> | 491 | <provider selected="true" editor-type-id="text-editor"> |
590 | <state relative-caret-position="200"> | 492 | <state relative-caret-position="200"> |
@@ -603,15 +505,6 @@ | @@ -603,15 +505,6 @@ | ||
603 | <provider selected="true" editor-type-id="text-editor"> | 505 | <provider selected="true" editor-type-id="text-editor"> |
604 | <state relative-caret-position="835"> | 506 | <state relative-caret-position="835"> |
605 | <caret line="104" column="14" lean-forward="false" selection-start-line="104" selection-start-column="14" selection-end-line="104" selection-end-column="14" /> | 507 | <caret line="104" column="14" lean-forward="false" selection-start-line="104" selection-start-column="14" selection-end-line="104" selection-end-column="14" /> |
606 | - <folding> | ||
607 | - <element signature="e#4078#4931#0#PHP" expanded="false" /> | ||
608 | - <element signature="e#4946#5282#0#PHP" expanded="false" /> | ||
609 | - <element signature="e#5297#5738#0#PHP" expanded="false" /> | ||
610 | - <element signature="e#5753#6664#0#PHP" expanded="false" /> | ||
611 | - <element signature="e#6669#6969#0#PHP" expanded="false" /> | ||
612 | - <element signature="e#6986#8411#0#PHP" expanded="false" /> | ||
613 | - <element signature="e#8428#9159#0#PHP" expanded="false" /> | ||
614 | - </folding> | ||
615 | </state> | 508 | </state> |
616 | </provider> | 509 | </provider> |
617 | </entry> | 510 | </entry> |
@@ -626,9 +519,6 @@ | @@ -626,9 +519,6 @@ | ||
626 | <provider selected="true" editor-type-id="text-editor"> | 519 | <provider selected="true" editor-type-id="text-editor"> |
627 | <state relative-caret-position="835"> | 520 | <state relative-caret-position="835"> |
628 | <caret line="53" column="84" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="84" /> | 521 | <caret line="53" column="84" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="84" /> |
629 | - <folding> | ||
630 | - <element signature="e#1934#4707#0#PHP" expanded="false" /> | ||
631 | - </folding> | ||
632 | </state> | 522 | </state> |
633 | </provider> | 523 | </provider> |
634 | </entry> | 524 | </entry> |
@@ -636,7 +526,6 @@ | @@ -636,7 +526,6 @@ | ||
636 | <provider selected="true" editor-type-id="text-editor"> | 526 | <provider selected="true" editor-type-id="text-editor"> |
637 | <state relative-caret-position="0"> | 527 | <state relative-caret-position="0"> |
638 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 528 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
639 | - <folding /> | ||
640 | </state> | 529 | </state> |
641 | </provider> | 530 | </provider> |
642 | </entry> | 531 | </entry> |
@@ -654,29 +543,132 @@ | @@ -654,29 +543,132 @@ | ||
654 | </state> | 543 | </state> |
655 | </provider> | 544 | </provider> |
656 | </entry> | 545 | </entry> |
546 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php"> | ||
547 | + <provider selected="true" editor-type-id="text-editor"> | ||
548 | + <state relative-caret-position="150"> | ||
549 | + <caret line="15" column="39" lean-forward="false" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" /> | ||
550 | + </state> | ||
551 | + </provider> | ||
552 | + </entry> | ||
657 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html"> | 553 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html"> |
658 | <provider selected="true" editor-type-id="text-editor"> | 554 | <provider selected="true" editor-type-id="text-editor"> |
659 | - <state relative-caret-position="5000"> | 555 | + <state relative-caret-position="1953"> |
660 | <caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" /> | 556 | <caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" /> |
557 | + </state> | ||
558 | + </provider> | ||
559 | + </entry> | ||
560 | + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php"> | ||
561 | + <provider selected="true" editor-type-id="text-editor"> | ||
562 | + <state relative-caret-position="0"> | ||
563 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
564 | + </state> | ||
565 | + </provider> | ||
566 | + </entry> | ||
567 | + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/Prpcrypt.php"> | ||
568 | + <provider selected="true" editor-type-id="text-editor"> | ||
569 | + <state relative-caret-position="125"> | ||
570 | + <caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" /> | ||
571 | + </state> | ||
572 | + </provider> | ||
573 | + </entry> | ||
574 | + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php"> | ||
575 | + <provider selected="true" editor-type-id="text-editor"> | ||
576 | + <state relative-caret-position="372"> | ||
577 | + <caret line="49" column="25" lean-forward="false" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" /> | ||
578 | + </state> | ||
579 | + </provider> | ||
580 | + </entry> | ||
581 | + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"> | ||
582 | + <provider selected="true" editor-type-id="text-editor"> | ||
583 | + <state relative-caret-position="755"> | ||
584 | + <caret line="100" column="85" lean-forward="false" selection-start-line="100" selection-start-column="74" selection-end-line="100" selection-end-column="85" /> | ||
585 | + </state> | ||
586 | + </provider> | ||
587 | + </entry> | ||
588 | + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html"> | ||
589 | + <provider selected="true" editor-type-id="text-editor"> | ||
590 | + <state relative-caret-position="990"> | ||
591 | + <caret line="155" column="80" lean-forward="true" selection-start-line="155" selection-start-column="80" selection-end-line="155" selection-end-column="80" /> | ||
592 | + </state> | ||
593 | + </provider> | ||
594 | + </entry> | ||
595 | + <entry file="file://$PROJECT_DIR$/public/p.php" /> | ||
596 | + <entry file="file://$PROJECT_DIR$/api/config.php"> | ||
597 | + <provider selected="true" editor-type-id="text-editor"> | ||
598 | + <state relative-caret-position="945"> | ||
599 | + <caret line="246" column="20" lean-forward="true" selection-start-line="246" selection-start-column="20" selection-end-line="246" selection-end-column="20" /> | ||
600 | + </state> | ||
601 | + </provider> | ||
602 | + </entry> | ||
603 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> | ||
604 | + <provider selected="true" editor-type-id="text-editor"> | ||
605 | + <state relative-caret-position="271"> | ||
606 | + <caret line="445" column="5" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="792" selection-end-column="1" /> | ||
607 | + </state> | ||
608 | + </provider> | ||
609 | + </entry> | ||
610 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | ||
611 | + <provider selected="true" editor-type-id="text-editor"> | ||
612 | + <state relative-caret-position="-29"> | ||
613 | + <caret line="58" column="7" lean-forward="true" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" /> | ||
614 | + </state> | ||
615 | + </provider> | ||
616 | + </entry> | ||
617 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php"> | ||
618 | + <provider selected="true" editor-type-id="text-editor"> | ||
619 | + <state relative-caret-position="-12845"> | ||
620 | + <caret line="180" column="40" lean-forward="true" selection-start-line="180" selection-start-column="40" selection-end-line="180" selection-end-column="40" /> | ||
661 | <folding /> | 621 | <folding /> |
662 | </state> | 622 | </state> |
663 | </provider> | 623 | </provider> |
664 | </entry> | 624 | </entry> |
665 | - <entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php"> | 625 | + <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> |
626 | + <provider selected="true" editor-type-id="text-editor"> | ||
627 | + <state relative-caret-position="869"> | ||
628 | + <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> | ||
629 | + <folding /> | ||
630 | + </state> | ||
631 | + </provider> | ||
632 | + </entry> | ||
633 | + <entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"> | ||
634 | + <provider selected="true" editor-type-id="text-editor"> | ||
635 | + <state relative-caret-position="-2031"> | ||
636 | + <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> | ||
637 | + <folding> | ||
638 | + <element signature="e#4108#4373#0#PHP" expanded="false" /> | ||
639 | + <element signature="e#4378#4728#0#PHP" expanded="false" /> | ||
640 | + </folding> | ||
641 | + </state> | ||
642 | + </provider> | ||
643 | + </entry> | ||
644 | + <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
645 | + <provider selected="true" editor-type-id="text-editor"> | ||
646 | + <state relative-caret-position="1094"> | ||
647 | + <caret line="297" column="23" lean-forward="true" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" /> | ||
648 | + <folding> | ||
649 | + <element signature="e#8034#10467#0#PHP" expanded="false" /> | ||
650 | + <element signature="e#10473#10901#0#PHP" expanded="false" /> | ||
651 | + <element signature="e#10906#11717#0#PHP" expanded="false" /> | ||
652 | + <element signature="e#11737#12601#0#PHP" expanded="false" /> | ||
653 | + <element signature="e#12628#13028#0#PHP" expanded="false" /> | ||
654 | + <element signature="e#13052#13625#0#PHP" expanded="false" /> | ||
655 | + <element signature="e#13648#14458#0#PHP" expanded="false" /> | ||
656 | + </folding> | ||
657 | + </state> | ||
658 | + </provider> | ||
659 | + </entry> | ||
660 | + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | ||
666 | <provider selected="true" editor-type-id="text-editor"> | 661 | <provider selected="true" editor-type-id="text-editor"> |
667 | - <state relative-caret-position="1250"> | ||
668 | - <caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" /> | 662 | + <state relative-caret-position="419"> |
663 | + <caret line="366" column="4" lean-forward="false" selection-start-line="366" selection-start-column="4" selection-end-line="473" selection-end-column="5" /> | ||
669 | <folding> | 664 | <folding> |
670 | - <element signature="e#2995#3546#0#PHP" expanded="false" /> | ||
671 | - <element signature="e#3924#4475#0#PHP" expanded="false" /> | ||
672 | - <element signature="e#4853#5404#0#PHP" expanded="false" /> | ||
673 | - <element signature="e#11385#11564#0#PHP" expanded="false" /> | ||
674 | - <element signature="e#11591#11843#0#PHP" expanded="false" /> | ||
675 | - <element signature="e#11856#12107#0#PHP" expanded="false" /> | ||
676 | - <element signature="e#12120#12371#0#PHP" expanded="false" /> | ||
677 | - <element signature="e#12384#12636#0#PHP" expanded="false" /> | ||
678 | - <element signature="e#14194#28404#0#PHP" expanded="false" /> | ||
679 | - <element signature="e#28421#30917#0#PHP" expanded="false" /> | 665 | + <element signature="e#12767#13167#0#PHP" expanded="false" /> |
666 | + <element signature="e#13190#13763#0#PHP" expanded="false" /> | ||
667 | + <element signature="e#13770#13865#0#PHP" expanded="false" /> | ||
668 | + <element signature="e#13870#15269#0#PHP" expanded="false" /> | ||
669 | + <element signature="e#15274#15394#0#PHP" expanded="false" /> | ||
670 | + <element signature="e#15399#15694#0#PHP" expanded="false" /> | ||
671 | + <element signature="e#15713#16533#0#PHP" expanded="false" /> | ||
680 | </folding> | 672 | </folding> |
681 | </state> | 673 | </state> |
682 | </provider> | 674 | </provider> |
@@ -258,5 +258,5 @@ return [ | @@ -258,5 +258,5 @@ return [ | ||
258 | 258 | ||
259 | //小程序配置 | 259 | //小程序配置 |
260 | 'app_id' => 'wxa6fdb286b1a5ad67', | 260 | 'app_id' => 'wxa6fdb286b1a5ad67', |
261 | - 'app_secret' => '029cb6043b9cc94a2afeaa49da1f9e71', | 261 | + 'app_secret' => 'e314c2d957773eacff0442fc30b53cd6',//'029cb6043b9cc94a2afeaa49da1f9e71', |
262 | ]; | 262 | ]; |
@@ -187,6 +187,12 @@ class ActiveController extends RestBaseController | @@ -187,6 +187,12 @@ class ActiveController extends RestBaseController | ||
187 | if (!$validate->check($param)) { | 187 | if (!$validate->check($param)) { |
188 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 188 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
189 | } | 189 | } |
190 | + $this->secCheck($param['job_title'],1); | ||
191 | + $this->secCheck($param['company_name'],1); | ||
192 | + $this->secCheck($param['content'],1); | ||
193 | + if(!empty($param['image'])){ | ||
194 | + $this->secCheck($param['image'],2); | ||
195 | + } | ||
190 | $data = Db::name('job') | 196 | $data = Db::name('job') |
191 | ->where('id',$param['id']) | 197 | ->where('id',$param['id']) |
192 | ->update($param); | 198 | ->update($param); |
@@ -631,5 +637,87 @@ class ActiveController extends RestBaseController | @@ -631,5 +637,87 @@ class ActiveController extends RestBaseController | ||
631 | return $result; | 637 | return $result; |
632 | } | 638 | } |
633 | 639 | ||
634 | - | 640 | + /** |
641 | + * 小程序内容安全审核 | ||
642 | + * @param $content 审核内容 | ||
643 | + * @param $type 类型(1,文本;2,图片;3,音频) | ||
644 | + */ | ||
645 | + public function secCheck($content,$type = 1) { | ||
646 | +// if(!$type) { | ||
647 | +// return true; | ||
648 | +// } | ||
649 | + $access_token = $this->get_access_token(); | ||
650 | + $basic_url = 'https://api.weixin.qq.com/wxa'; | ||
651 | + if($type == 1) { | ||
652 | + $url = $basic_url.'/msg_sec_check?access_token='.$access_token; | ||
653 | + if(is_array($content)) { | ||
654 | + foreach ($content as $v) { | ||
655 | + $this->setUrl($url,['content'=>$v]); | ||
656 | + } | ||
657 | + } else { | ||
658 | + $this->setUrl($url,['content'=>$content]); | ||
659 | + } | ||
660 | + } | ||
661 | + if($type == 2) { | ||
662 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
663 | + if(is_array($content)) { | ||
664 | + foreach ($content as $v) { | ||
665 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片'); | ||
666 | + } | ||
667 | + } else { | ||
668 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片'); | ||
669 | + } | ||
670 | + } | ||
671 | + if($type == 3) { | ||
672 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
673 | + if(is_array($content)) { | ||
674 | + foreach ($content as $v) { | ||
675 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音'); | ||
676 | + } | ||
677 | + } else { | ||
678 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音'); | ||
679 | + } | ||
680 | + } | ||
681 | + } | ||
682 | + /** | ||
683 | + * 调用接口审核 | ||
684 | + * @param $url 跳转地址 | ||
685 | + * @param $post 审核内容 | ||
686 | + * @param $type_name | ||
687 | + * @param $image | ||
688 | + */ | ||
689 | + private function setUrl($url,$post,$type_name = '文本') { | ||
690 | + $result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE)); | ||
691 | + $return_data = json_decode($result,true); | ||
692 | + if($return_data['errcode'] != 0) { | ||
693 | + $this->error($type_name.'内容含有违法违规内容'); | ||
694 | + } | ||
695 | + } | ||
696 | + // curl方法 | ||
697 | + function curls($url, $post = null, $header = null) { | ||
698 | + // 初始化 | ||
699 | + $curl = curl_init(); | ||
700 | + // 设置抓取的url | ||
701 | + curl_setopt($curl, CURLOPT_URL, $url); | ||
702 | + if($header) { | ||
703 | + // 请求头 | ||
704 | + curl_setopt($curl,CURLOPT_HTTPHEADER,$header); | ||
705 | + } | ||
706 | + // 设置头文件的信息作为数据流输出 | ||
707 | + curl_setopt($curl, CURLOPT_TIMEOUT, 500); | ||
708 | + curl_setopt($curl, CURLINFO_HEADER_OUT, true); | ||
709 | + // 设置获取的信息以文件流的形式返回,而不是直接输出。 | ||
710 | + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); | ||
711 | + if($post) { | ||
712 | + curl_setopt($curl, CURLOPT_POST, 1); | ||
713 | + //把POST的变量加上 | ||
714 | + curl_setopt($curl, CURLOPT_POSTFIELDS, $post); | ||
715 | + } | ||
716 | + // 执行命令 | ||
717 | + $data = curl_exec($curl); | ||
718 | + if (curl_errno($curl)) { | ||
719 | + $data = curl_error($curl); | ||
720 | + } | ||
721 | + return $data; | ||
722 | + } | ||
635 | } | 723 | } |
@@ -243,6 +243,12 @@ class ReleaseController extends RestBaseController | @@ -243,6 +243,12 @@ class ReleaseController extends RestBaseController | ||
243 | if (!$validate->check($param)) { | 243 | if (!$validate->check($param)) { |
244 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 244 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
245 | } | 245 | } |
246 | + $this->secCheck($param['job_title'],1); | ||
247 | + $this->secCheck($param['company_name'],1); | ||
248 | + $this->secCheck($param['content'],1); | ||
249 | + if(!empty($param['image'])){ | ||
250 | + $this->secCheck($param['image'],2); | ||
251 | + } | ||
246 | $data = Db::name('job') | 252 | $data = Db::name('job') |
247 | ->where('id',$id) | 253 | ->where('id',$id) |
248 | ->update($param); | 254 | ->update($param); |
@@ -375,6 +381,14 @@ class ReleaseController extends RestBaseController | @@ -375,6 +381,14 @@ class ReleaseController extends RestBaseController | ||
375 | if (!$validate->check($param)) { | 381 | if (!$validate->check($param)) { |
376 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 382 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
377 | } | 383 | } |
384 | + $this->secCheck($param['job_title'],1); | ||
385 | + $this->secCheck($param['workplace'],1); | ||
386 | + $this->secCheck($param['company_name'],1); | ||
387 | + $this->secCheck($param['empoying'],1); | ||
388 | + $this->secCheck($param['content'],1); | ||
389 | + if(!empty($param['image'])){ | ||
390 | + $this->secCheck($param['image'],2); | ||
391 | + } | ||
378 | $data = Db::name('job') | 392 | $data = Db::name('job') |
379 | ->where('id',$id) | 393 | ->where('id',$id) |
380 | ->update($param); | 394 | ->update($param); |
@@ -477,6 +491,13 @@ class ReleaseController extends RestBaseController | @@ -477,6 +491,13 @@ class ReleaseController extends RestBaseController | ||
477 | if (!$validate->check($param)) { | 491 | if (!$validate->check($param)) { |
478 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 492 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
479 | } | 493 | } |
494 | + $this->secCheck($param['job_title'],1); | ||
495 | + $this->secCheck($param['company_name'],1); | ||
496 | + $this->secCheck($param['adress'],1); | ||
497 | + $this->secCheck($param['content'],1); | ||
498 | + if(!empty($param['image'])){ | ||
499 | + $this->secCheck($param['image'],2); | ||
500 | + } | ||
480 | $data = Db::name('job') | 501 | $data = Db::name('job') |
481 | ->where('id',$id) | 502 | ->where('id',$id) |
482 | ->update($param); | 503 | ->update($param); |
@@ -660,4 +681,113 @@ class ReleaseController extends RestBaseController | @@ -660,4 +681,113 @@ class ReleaseController extends RestBaseController | ||
660 | } | 681 | } |
661 | $this->success('SUCCESS',$list); | 682 | $this->success('SUCCESS',$list); |
662 | } | 683 | } |
684 | + | ||
685 | + | ||
686 | + public function get_access_token() | ||
687 | + { | ||
688 | + $app_id = config('app_id'); | ||
689 | + $app_secret = config('app_secret'); | ||
690 | + $url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='.$app_id.'&secret='.$app_secret; | ||
691 | + $res = $this->http_get($url); | ||
692 | + $json_arr = json_decode($res,true); | ||
693 | + $token = $json_arr['access_token']; | ||
694 | + return $token; | ||
695 | + } | ||
696 | + //curl get请求 | ||
697 | + public function http_get($url){ | ||
698 | + $curl = curl_init();//启动一个CURL会话 | ||
699 | + curl_setopt($curl, CURLOPT_URL,$url); | ||
700 | + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查 | ||
701 | + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在 | ||
702 | + curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环 | ||
703 | + curl_setopt($curl, CURLOPT_HEADER, false);//不开启header | ||
704 | + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); // 获取的信息以文件流的形式返回 | ||
705 | + $result = curl_exec($curl); //执行操作 | ||
706 | + curl_close($curl); | ||
707 | + return $result; | ||
708 | + } | ||
709 | + | ||
710 | + /** | ||
711 | + * 小程序内容安全审核 | ||
712 | + * @param $content 审核内容 | ||
713 | + * @param $type 类型(1,文本;2,图片;3,音频) | ||
714 | + */ | ||
715 | + public function secCheck($content,$type = 1) { | ||
716 | +// if(!$type) { | ||
717 | +// return true; | ||
718 | +// } | ||
719 | + $access_token = $this->get_access_token(); | ||
720 | + $basic_url = 'https://api.weixin.qq.com/wxa'; | ||
721 | + if($type == 1) { | ||
722 | + $url = $basic_url.'/msg_sec_check?access_token='.$access_token; | ||
723 | + if(is_array($content)) { | ||
724 | + foreach ($content as $v) { | ||
725 | + $this->setUrl($url,['content'=>$v]); | ||
726 | + } | ||
727 | + } else { | ||
728 | + $this->setUrl($url,['content'=>$content]); | ||
729 | + } | ||
730 | + } | ||
731 | + if($type == 2) { | ||
732 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
733 | + if(is_array($content)) { | ||
734 | + foreach ($content as $v) { | ||
735 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片'); | ||
736 | + } | ||
737 | + } else { | ||
738 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片'); | ||
739 | + } | ||
740 | + } | ||
741 | + if($type == 3) { | ||
742 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
743 | + if(is_array($content)) { | ||
744 | + foreach ($content as $v) { | ||
745 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音'); | ||
746 | + } | ||
747 | + } else { | ||
748 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音'); | ||
749 | + } | ||
750 | + } | ||
751 | + } | ||
752 | + /** | ||
753 | + * 调用接口审核 | ||
754 | + * @param $url 跳转地址 | ||
755 | + * @param $post 审核内容 | ||
756 | + * @param $type_name | ||
757 | + * @param $image | ||
758 | + */ | ||
759 | + private function setUrl($url,$post,$type_name = '文本') { | ||
760 | + $result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE)); | ||
761 | + $return_data = json_decode($result,true); | ||
762 | + if($return_data['errcode'] != 0) { | ||
763 | + $this->error($type_name.'内容含有违法违规内容'); | ||
764 | + } | ||
765 | + } | ||
766 | + // curl方法 | ||
767 | + function curls($url, $post = null, $header = null) { | ||
768 | + // 初始化 | ||
769 | + $curl = curl_init(); | ||
770 | + // 设置抓取的url | ||
771 | + curl_setopt($curl, CURLOPT_URL, $url); | ||
772 | + if($header) { | ||
773 | + // 请求头 | ||
774 | + curl_setopt($curl,CURLOPT_HTTPHEADER,$header); | ||
775 | + } | ||
776 | + // 设置头文件的信息作为数据流输出 | ||
777 | + curl_setopt($curl, CURLOPT_TIMEOUT, 500); | ||
778 | + curl_setopt($curl, CURLINFO_HEADER_OUT, true); | ||
779 | + // 设置获取的信息以文件流的形式返回,而不是直接输出。 | ||
780 | + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); | ||
781 | + if($post) { | ||
782 | + curl_setopt($curl, CURLOPT_POST, 1); | ||
783 | + //把POST的变量加上 | ||
784 | + curl_setopt($curl, CURLOPT_POSTFIELDS, $post); | ||
785 | + } | ||
786 | + // 执行命令 | ||
787 | + $data = curl_exec($curl); | ||
788 | + if (curl_errno($curl)) { | ||
789 | + $data = curl_error($curl); | ||
790 | + } | ||
791 | + return $data; | ||
792 | + } | ||
663 | } | 793 | } |
@@ -76,6 +76,12 @@ class SendController extends RestBaseController | @@ -76,6 +76,12 @@ class SendController extends RestBaseController | ||
76 | if (!$validate->check($param)) { | 76 | if (!$validate->check($param)) { |
77 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 77 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
78 | } | 78 | } |
79 | + $this->secCheck($param['job_title'],1); | ||
80 | + $this->secCheck($param['company_name'],1); | ||
81 | + $this->secCheck($param['content'],1); | ||
82 | + if(!empty($param['image'])){ | ||
83 | + $this->secCheck($param['image'],2); | ||
84 | + } | ||
79 | $data = Db::name('job') | 85 | $data = Db::name('job') |
80 | ->insert($param); | 86 | ->insert($param); |
81 | if(empty($data)){ | 87 | if(empty($data)){ |
@@ -188,6 +194,14 @@ class SendController extends RestBaseController | @@ -188,6 +194,14 @@ class SendController extends RestBaseController | ||
188 | if (!$validate->check($param)) { | 194 | if (!$validate->check($param)) { |
189 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 195 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
190 | } | 196 | } |
197 | + $this->secCheck($param['job_title'],1); | ||
198 | + $this->secCheck($param['workplace'],1); | ||
199 | + $this->secCheck($param['company_name'],1); | ||
200 | + $this->secCheck($param['empoying'],1); | ||
201 | + $this->secCheck($param['content'],1); | ||
202 | + if(!empty($param['image'])){ | ||
203 | + $this->secCheck($param['image'],2); | ||
204 | + } | ||
191 | $data = Db::name('job') | 205 | $data = Db::name('job') |
192 | ->insert($param); | 206 | ->insert($param); |
193 | if(empty($data)){ | 207 | if(empty($data)){ |
@@ -259,6 +273,12 @@ class SendController extends RestBaseController | @@ -259,6 +273,12 @@ class SendController extends RestBaseController | ||
259 | if (!$validate->check($param)) { | 273 | if (!$validate->check($param)) { |
260 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 274 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
261 | } | 275 | } |
276 | + $this->secCheck($param['job_title'],1); | ||
277 | + $this->secCheck($param['company_name'],1); | ||
278 | + $this->secCheck($param['content'],1); | ||
279 | + if(!empty($param['image'])){ | ||
280 | + $this->secCheck($param['image'],2); | ||
281 | + } | ||
262 | $data = Db::name('job') | 282 | $data = Db::name('job') |
263 | ->insert($param); | 283 | ->insert($param); |
264 | if(empty($data)){ | 284 | if(empty($data)){ |
@@ -326,6 +346,13 @@ class SendController extends RestBaseController | @@ -326,6 +346,13 @@ class SendController extends RestBaseController | ||
326 | if (!$validate->check($param)) { | 346 | if (!$validate->check($param)) { |
327 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); | 347 | $this->error(['code'=>40005,'msg'=>$validate->getError()]); |
328 | } | 348 | } |
349 | + $this->secCheck($param['job_title'],1); | ||
350 | + $this->secCheck($param['company_name'],1); | ||
351 | + $this->secCheck($param['adress'],1); | ||
352 | + $this->secCheck($param['content'],1); | ||
353 | + if(!empty($param['image'])){ | ||
354 | + $this->secCheck($param['image'],2); | ||
355 | + } | ||
329 | $data = Db::name('job') | 356 | $data = Db::name('job') |
330 | ->insert($param); | 357 | ->insert($param); |
331 | if(empty($data)){ | 358 | if(empty($data)){ |
@@ -335,4 +362,115 @@ class SendController extends RestBaseController | @@ -335,4 +362,115 @@ class SendController extends RestBaseController | ||
335 | } | 362 | } |
336 | } | 363 | } |
337 | 364 | ||
365 | + | ||
366 | + | ||
367 | + public function get_access_token() | ||
368 | + { | ||
369 | + $app_id = config('app_id'); | ||
370 | + $app_secret = config('app_secret'); | ||
371 | + $url = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid='.$app_id.'&secret='.$app_secret; | ||
372 | + $res = $this->http_get($url); | ||
373 | + $json_arr = json_decode($res,true); | ||
374 | + $token = $json_arr['access_token']; | ||
375 | + return $token; | ||
376 | + } | ||
377 | + //curl get请求 | ||
378 | + public function http_get($url){ | ||
379 | + $curl = curl_init();//启动一个CURL会话 | ||
380 | + curl_setopt($curl, CURLOPT_URL,$url); | ||
381 | + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查 | ||
382 | + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在 | ||
383 | + curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环 | ||
384 | + curl_setopt($curl, CURLOPT_HEADER, false);//不开启header | ||
385 | + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); // 获取的信息以文件流的形式返回 | ||
386 | + $result = curl_exec($curl); //执行操作 | ||
387 | + curl_close($curl); | ||
388 | + return $result; | ||
389 | + } | ||
390 | + | ||
391 | + | ||
392 | + /** | ||
393 | + * 小程序内容安全审核 | ||
394 | + * @param $content 审核内容 | ||
395 | + * @param $type 类型(1,文本;2,图片;3,音频) | ||
396 | + */ | ||
397 | + public function secCheck($content,$type = 1) { | ||
398 | +// if(!$type) { | ||
399 | +// return true; | ||
400 | +// } | ||
401 | + $access_token = $this->get_access_token(); | ||
402 | + $basic_url = 'https://api.weixin.qq.com/wxa'; | ||
403 | + if($type == 1) { | ||
404 | + $url = $basic_url.'/msg_sec_check?access_token='.$access_token; | ||
405 | + if(is_array($content)) { | ||
406 | + foreach ($content as $v) { | ||
407 | + $this->setUrl($url,['content'=>$v]); | ||
408 | + } | ||
409 | + } else { | ||
410 | + $this->setUrl($url,['content'=>$content]); | ||
411 | + } | ||
412 | + } | ||
413 | + if($type == 2) { | ||
414 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
415 | + if(is_array($content)) { | ||
416 | + foreach ($content as $v) { | ||
417 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>2],'图片'); | ||
418 | + } | ||
419 | + } else { | ||
420 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>2],'图片'); | ||
421 | + } | ||
422 | + } | ||
423 | + if($type == 3) { | ||
424 | + $url = $basic_url.'/media_check_async?access_token='.$access_token; | ||
425 | + if(is_array($content)) { | ||
426 | + foreach ($content as $v) { | ||
427 | + $this->setUrl($url,['media_url'=>$v,'media_type'=>1],'语音'); | ||
428 | + } | ||
429 | + } else { | ||
430 | + $this->setUrl($url,['media_url'=>$content,'media_type'=>1],'语音'); | ||
431 | + } | ||
432 | + } | ||
433 | + } | ||
434 | + /** | ||
435 | + * 调用接口审核 | ||
436 | + * @param $url 跳转地址 | ||
437 | + * @param $post 审核内容 | ||
438 | + * @param $type_name | ||
439 | + * @param $image | ||
440 | + */ | ||
441 | + private function setUrl($url,$post,$type_name = '文本') { | ||
442 | + $result = $this->curls($url,json_encode($post,JSON_UNESCAPED_UNICODE)); | ||
443 | + $return_data = json_decode($result,true); | ||
444 | + if($return_data['errcode'] != 0) { | ||
445 | + $this->error($type_name.'内容含有违法违规内容'); | ||
446 | + } | ||
447 | + } | ||
448 | + // curl方法 | ||
449 | + function curls($url, $post = null, $header = null) { | ||
450 | + // 初始化 | ||
451 | + $curl = curl_init(); | ||
452 | + // 设置抓取的url | ||
453 | + curl_setopt($curl, CURLOPT_URL, $url); | ||
454 | + if($header) { | ||
455 | + // 请求头 | ||
456 | + curl_setopt($curl,CURLOPT_HTTPHEADER,$header); | ||
457 | + } | ||
458 | + // 设置头文件的信息作为数据流输出 | ||
459 | + curl_setopt($curl, CURLOPT_TIMEOUT, 500); | ||
460 | + curl_setopt($curl, CURLINFO_HEADER_OUT, true); | ||
461 | + // 设置获取的信息以文件流的形式返回,而不是直接输出。 | ||
462 | + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); | ||
463 | + if($post) { | ||
464 | + curl_setopt($curl, CURLOPT_POST, 1); | ||
465 | + //把POST的变量加上 | ||
466 | + curl_setopt($curl, CURLOPT_POSTFIELDS, $post); | ||
467 | + } | ||
468 | + // 执行命令 | ||
469 | + $data = curl_exec($curl); | ||
470 | + if (curl_errno($curl)) { | ||
471 | + $data = curl_error($curl); | ||
472 | + } | ||
473 | + return $data; | ||
474 | + } | ||
475 | + | ||
338 | } | 476 | } |
@@ -24,25 +24,12 @@ class Prpcrypt | @@ -24,25 +24,12 @@ class Prpcrypt | ||
24 | public function decrypt($aesCipher, $aesIV) | 24 | public function decrypt($aesCipher, $aesIV) |
25 | { | 25 | { |
26 | 26 | ||
27 | - if (function_exists('mcrypt_module_open')) { | ||
28 | try { | 27 | try { |
29 | 28 | ||
30 | - $module = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, ''); | 29 | + $decrypted = openssl_decrypt($aesCipher, "aes-128-cbc", $this->key, OPENSSL_RAW_DATA ,$aesIV); |
31 | 30 | ||
32 | - mcrypt_generic_init($module, $this->key, $aesIV); | ||
33 | - | ||
34 | - //解密 | ||
35 | - $decrypted = mdecrypt_generic($module, $aesCipher); | ||
36 | - mcrypt_generic_deinit($module); | ||
37 | - mcrypt_module_close($module); | ||
38 | - } catch (\Exception $e) { | ||
39 | - return [ErrorCode::$IllegalBuffer, null]; | ||
40 | - } | ||
41 | - } else if (function_exists('openssl_decrypt')) { | ||
42 | - | ||
43 | - $decrypted = openssl_decrypt($aesCipher, 'AES-128-CBC', $this->key, OPENSSL_RAW_DATA, $aesIV); | ||
44 | - | ||
45 | - if ($decrypted === false) return [ErrorCode::$IllegalBuffer, null]; | 31 | + } catch (Exception $e) { |
32 | + return array(ErrorCode::$IllegalBuffer, null); | ||
46 | } | 33 | } |
47 | 34 | ||
48 | 35 |
-
请 注册 或 登录 后发表评论