From 4cb5fb85c9458df6c49f1ac6bac9c50784f6d99a Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Fri, 27 Sep 2019 15:50:47 +0800
Subject: [PATCH] 二级市

---
 .idea/workspace.xml                      | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------
 api/index/controller/OtherController.php |  61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 api/index/controller/SendController.php  |  15 ++++++++++++---
 3 files changed, 225 insertions(+), 114 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e25fca7..40f32cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,65 +15,49 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
+      <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="138" column="5" lean-forward="true" selection-start-line="138" selection-start-column="5" selection-end-line="138" selection-end-column="5" />
+            <state relative-caret-position="661">
+              <caret line="325" column="5" lean-forward="true" selection-start-line="325" selection-start-column="5" selection-end-line="325" selection-end-column="5" />
               <folding>
-                <element signature="e#346#543#0#PHP" expanded="false" />
-                <element signature="e#548#956#0#PHP" expanded="false" />
-                <element signature="e#962#1253#0#PHP" expanded="false" />
-                <element signature="e#1258#2915#0#PHP" expanded="false" />
-                <element signature="e#2921#3205#0#PHP" expanded="false" />
-                <element signature="e#3210#3449#0#PHP" expanded="false" />
-                <element signature="e#3455#3779#0#PHP" expanded="false" />
-                <element signature="e#4321#4795#0#PHP" expanded="false" />
-                <element signature="e#4802#5801#0#PHP" expanded="false" />
-                <element signature="e#5807#6460#0#PHP" expanded="false" />
-                <element signature="e#6465#7622#0#PHP" expanded="false" />
-                <element signature="e#7628#8331#0#PHP" expanded="false" />
-                <element signature="e#8336#9973#0#PHP" expanded="false" />
-                <element signature="e#9979#10837#0#PHP" expanded="false" />
-                <element signature="e#10842#12780#0#PHP" expanded="false" />
-                <element signature="e#12786#13626#0#PHP" expanded="false" />
-                <element signature="e#13631#15736#0#PHP" expanded="false" />
-                <element signature="e#15742#16389#0#PHP" expanded="false" />
-                <element signature="e#16394#18009#0#PHP" expanded="false" />
-                <element signature="e#18015#18431#0#PHP" expanded="false" />
-                <element signature="e#18436#19255#0#PHP" expanded="false" />
-                <element signature="e#19260#19938#0#PHP" expanded="false" />
-                <element signature="e#19944#20398#0#PHP" expanded="false" />
-                <element signature="e#20403#21261#0#PHP" expanded="false" />
-                <element signature="e#21267#21773#0#PHP" expanded="false" />
-                <element signature="e#21778#23209#0#PHP" expanded="false" />
-                <element signature="e#23215#23494#0#PHP" expanded="false" />
-                <element signature="e#23499#23941#0#PHP" expanded="false" />
-                <element signature="e#23947#24181#0#PHP" expanded="false" />
-                <element signature="e#24186#24579#0#PHP" expanded="false" />
-                <element signature="e#24585#24816#0#PHP" expanded="false" />
-                <element signature="e#24821#25179#0#PHP" expanded="false" />
+                <element signature="e#129#158#0#PHP" expanded="true" />
+                <element signature="e#325#493#0#PHP" expanded="false" />
+                <element signature="e#498#807#0#PHP" expanded="false" />
+                <element signature="e#813#979#0#PHP" expanded="false" />
+                <element signature="e#984#1287#0#PHP" expanded="false" />
+                <element signature="e#1293#1934#0#PHP" expanded="false" />
+                <element signature="e#1939#3023#0#PHP" expanded="false" />
+                <element signature="e#3029#3393#0#PHP" expanded="false" />
+                <element signature="e#3398#3872#0#PHP" expanded="false" />
+                <element signature="e#3878#4149#0#PHP" expanded="false" />
+                <element signature="e#4154#5087#0#PHP" expanded="false" />
+                <element signature="e#5093#5402#0#PHP" expanded="false" />
+                <element signature="e#5407#5707#0#PHP" expanded="false" />
+                <element signature="e#5717#5996#0#PHP" expanded="false" />
+                <element signature="e#6001#6927#0#PHP" expanded="false" />
+                <element signature="e#6933#7237#0#PHP" expanded="false" />
+                <element signature="e#7242#7631#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SendController.php" pinned="false" current-in-tab="false">
+      <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="125">
-              <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+              <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
               <folding>
                 <element signature="e#296#1102#0#PHP" expanded="false" />
                 <element signature="e#1108#2740#0#PHP" expanded="false" />
                 <element signature="e#2746#2930#0#PHP" expanded="false" />
-                <element signature="e#2935#3129#0#PHP" expanded="false" />
-                <element signature="e#3135#4309#0#PHP" expanded="false" />
-                <element signature="e#4314#6247#0#PHP" expanded="false" />
-                <element signature="e#6253#7185#0#PHP" expanded="false" />
-                <element signature="e#7190#8833#0#PHP" expanded="false" />
-                <element signature="e#8839#9648#0#PHP" expanded="false" />
-                <element signature="e#9653#11247#0#PHP" expanded="false" />
+                <element signature="e#3433#4607#0#PHP" expanded="false" />
+                <element signature="e#4612#6545#0#PHP" expanded="false" />
+                <element signature="e#6551#7483#0#PHP" expanded="false" />
+                <element signature="e#7488#9131#0#PHP" expanded="false" />
+                <element signature="e#9137#9946#0#PHP" expanded="false" />
+                <element signature="e#9951#11545#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -100,7 +86,6 @@
       <list>
         <option value="$PROJECT_DIR$/data/conf/database.php" />
         <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
-        <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
         <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" />
@@ -122,7 +107,6 @@
         <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$/api/index/controller/OtherController.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" />
@@ -137,8 +121,10 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
         <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
-        <option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
         <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
+        <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
+        <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
+        <option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
       </list>
     </option>
   </component>
@@ -156,11 +142,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="363" />
-    <option name="y" value="46" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="317" />
+    <option name="y" value="91" />
     <option name="width" value="1661" />
-    <option name="height" value="940" />
+    <option name="height" value="937" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -203,6 +189,24 @@
               <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="upload" 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="upload" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="portal" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -212,7 +216,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/zhaozhao" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
   <component name="RecentsManager">
@@ -278,15 +282,15 @@
       <workItem from="1569484124771" duration="560000" />
       <workItem from="1569486627319" duration="2740000" />
       <workItem from="1569494185536" duration="1054000" />
-      <workItem from="1569544728303" duration="9610000" />
+      <workItem from="1569544728303" duration="16455000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="383497000" />
+    <option name="totallyTimeSpent" value="390342000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="363" y="46" width="1661" height="940" extended-state="0" />
+    <frame x="317" y="91" width="1661" height="937" extended-state="1" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20424734" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -321,8 +325,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/public/uploads/20190917/039879fe0b83499ad11ea5bdbe89e755.png" />
-    <entry file="file://$PROJECT_DIR$/public/uploads/20190917/be1562958a2c53342707fdab5df02092.png" />
     <entry file="file://$PROJECT_DIR$/app/database.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -491,13 +493,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="394">
-          <caret line="59" column="5" lean-forward="true" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1320">
@@ -561,13 +556,6 @@
         </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="421">
-          <caret line="197" column="0" lean-forward="true" selection-start-line="197" selection-start-column="0" selection-end-line="197" selection-end-column="0" />
-        </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">
@@ -582,27 +570,6 @@
         </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="-2335">
-          <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="665">
-          <caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" />
-        </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$/app/admin/controller/ActiveController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
@@ -638,29 +605,50 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
+    <entry file="file://$PROJECT_DIR$/api/index/model/JobModel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
-          <folding>
-            <element signature="e#296#1102#0#PHP" expanded="false" />
-            <element signature="e#1108#2740#0#PHP" expanded="false" />
-            <element signature="e#2746#2930#0#PHP" expanded="false" />
-            <element signature="e#2935#3129#0#PHP" expanded="false" />
-            <element signature="e#3135#4309#0#PHP" expanded="false" />
-            <element signature="e#4314#6247#0#PHP" expanded="false" />
-            <element signature="e#6253#7185#0#PHP" expanded="false" />
-            <element signature="e#7190#8833#0#PHP" expanded="false" />
-            <element signature="e#8839#9648#0#PHP" expanded="false" />
-            <element signature="e#9653#11247#0#PHP" expanded="false" />
-          </folding>
+        <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>
+    <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1321">
+          <caret line="197" column="0" lean-forward="true" selection-start-line="197" selection-start-column="0" selection-end-line="197" selection-end-column="0" />
+          <folding />
+        </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="900">
+          <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="-2806">
+          <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 />
+        </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="8281">
+          <caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" />
+          <folding />
         </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="207">
-          <caret line="138" column="5" lean-forward="true" selection-start-line="138" selection-start-column="5" selection-end-line="138" selection-end-column="5" />
+        <state relative-caret-position="1150">
+          <caret line="757" column="5" lean-forward="true" selection-start-line="757" selection-start-column="5" selection-end-line="757" selection-end-column="5" />
           <folding>
             <element signature="e#346#543#0#PHP" expanded="false" />
             <element signature="e#548#956#0#PHP" expanded="false" />
@@ -669,6 +657,7 @@
             <element signature="e#2921#3205#0#PHP" expanded="false" />
             <element signature="e#3210#3449#0#PHP" expanded="false" />
             <element signature="e#3455#3779#0#PHP" expanded="false" />
+            <element signature="e#3784#4315#0#PHP" expanded="false" />
             <element signature="e#4321#4795#0#PHP" expanded="false" />
             <element signature="e#4802#5801#0#PHP" expanded="false" />
             <element signature="e#5807#6460#0#PHP" expanded="false" />
@@ -698,5 +687,57 @@
         </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="625">
+          <caret line="292" column="0" lean-forward="true" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" />
+          <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="661">
+          <caret line="325" column="5" lean-forward="true" selection-start-line="325" selection-start-column="5" selection-end-line="325" selection-end-column="5" />
+          <folding>
+            <element signature="e#129#158#0#PHP" expanded="true" />
+            <element signature="e#325#493#0#PHP" expanded="false" />
+            <element signature="e#498#807#0#PHP" expanded="false" />
+            <element signature="e#813#979#0#PHP" expanded="false" />
+            <element signature="e#984#1287#0#PHP" expanded="false" />
+            <element signature="e#1293#1934#0#PHP" expanded="false" />
+            <element signature="e#1939#3023#0#PHP" expanded="false" />
+            <element signature="e#3029#3393#0#PHP" expanded="false" />
+            <element signature="e#3398#3872#0#PHP" expanded="false" />
+            <element signature="e#3878#4149#0#PHP" expanded="false" />
+            <element signature="e#4154#5087#0#PHP" expanded="false" />
+            <element signature="e#5093#5402#0#PHP" expanded="false" />
+            <element signature="e#5407#5707#0#PHP" expanded="false" />
+            <element signature="e#5717#5996#0#PHP" expanded="false" />
+            <element signature="e#6001#6927#0#PHP" expanded="false" />
+            <element signature="e#6933#7237#0#PHP" expanded="false" />
+            <element signature="e#7242#7631#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="125">
+          <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />
+          <folding>
+            <element signature="e#296#1102#0#PHP" expanded="false" />
+            <element signature="e#1108#2740#0#PHP" expanded="false" />
+            <element signature="e#2746#2930#0#PHP" expanded="false" />
+            <element signature="e#3433#4607#0#PHP" expanded="false" />
+            <element signature="e#4612#6545#0#PHP" expanded="false" />
+            <element signature="e#6551#7483#0#PHP" expanded="false" />
+            <element signature="e#7488#9131#0#PHP" expanded="false" />
+            <element signature="e#9137#9946#0#PHP" expanded="false" />
+            <element signature="e#9951#11545#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/api/index/controller/OtherController.php b/api/index/controller/OtherController.php
index 3b076fe..47a5477 100644
--- a/api/index/controller/OtherController.php
+++ b/api/index/controller/OtherController.php
@@ -9,6 +9,7 @@
 namespace api\index\controller;
 
 
+use api\index\model\JobModel;
 use cmf\controller\RestBaseController;
 use think\Db;
 use think\Validate;
@@ -280,4 +281,64 @@ class OtherController extends RestBaseController
             ->update($data);
         $this->success('SUCCESS',$data);
     }
+
+    /**
+     * @title 生成海报
+     * @description
+     * @author GuoSheng
+     * @url /index/Other/getPoster
+     * @method GET
+     *
+     * @header name:XX-Token require:1 default: desc:token
+     *
+     * @param name:job_id require:1 default: desc:招聘信息id
+     * @param name:url require:1 default: desc:页面路径与参数
+     *
+     * @return url:海报地址
+     */
+    public function getPoster(){
+        $job_id = $this->request->param('job_id',0,'intval');
+        $url = $this->request->param('url');
+        $user_id = $this->getUserId();
+        if(empty($user_id) || empty($job_id) || empty($url)){
+            $this->error(['code'=>40005,'msg'=>'缺少必要参数']);
+        }
+        $savePath = './../upload/poster/';
+        if (!file_exists($savePath)){
+            mkdir($savePath, 0777,true);
+        }
+        if(!file_exists("./upload/qrcode/code_$user_id.jpg")){
+            $code = $this->getCode($user_id,$job_id,$url);
+        }else{
+            $code = "qrcode/code_$user_id.jpg";
+        }
+        $jobModel = new JobModel();
+        $where['id'] = ['eq',$job_id];
+        $job = $jobModel->getOne($where);
+        $image = \think\Image::open(ROOT_PATH."public/bg.png");
+        $result = $image->water(ROOT_PATH."public/upload/$code",[360,1420],100)
+            ->text($job['job_name'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',45,'#070C1D',[100,1100])
+            ->text($job['job_city']."-".$job['job_county'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',30,'#070C1D',[700,1200])
+            ->text($job['wage'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',30,'#FF5D2E',[100,1200])
+            ->text($job['occupation_name'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',32,'#070C1D',[100,1300]);
+        $result->save($savePath."poster_".$user_id."_$job_id.png");
+        $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]);
+    }
+//    public function getCode($user_id,$job_id,$url){
+//        $savePath = './../upload/get_code/';
+//        $filename = "code_$user_id.jpg";
+//        if(!file_exists($savePath.$filename)){
+//            $data = [
+//                'app_id' => 'wx5d55a70fea6f8f97',
+//                'secret'  => '8e4ceb09d76596b6f74fc79fdb3331c4',
+//            ];
+//            $app = new Application($data);
+//            $accessToken = $app->access_token;
+//            $access_token = $accessToken->getToken();
+//            $qrcode = $this->imgShare($user_id,$job_id,$access_token,$url);
+//        }elsE{
+//            $qrcode = "qrcode/code_".$user_id."_$job_id.jpg";
+//        }
+//        return $qrcode;
+//    }
 }
\ No newline at end of file
diff --git a/api/index/controller/SendController.php b/api/index/controller/SendController.php
index f151fe8..6a4bff1 100644
--- a/api/index/controller/SendController.php
+++ b/api/index/controller/SendController.php
@@ -99,9 +99,18 @@ class SendController extends RestBaseController
     public function city()
     {
         $data = Db::name('area')
-            ->where('level',2)
-            ->field('id,name')
-            ->select();
+            ->where('level',1)
+            ->field('id,name,sign_id')
+            ->select()
+            ->toArray();
+        foreach ($data as $k=>$v){
+            $data[$k]['child'] = Db::name('area')
+                ->where('pid',$v['sign_id'])
+                ->where('level',2)
+                ->field('id,name')
+                ->select()
+                ->toArray();
+        }
         $this->success('SUCCESS',$data);
     }
 
--
libgit2 0.24.0