浏览代码

完成,增加跨域端口

xingye 4 年之前
父节点
当前提交
49c972a8d6
共有 3 个文件被更改,包括 120 次插入52 次删除
  1. 97 52
      .idea/workspace.xml
  2. 21 0
      logs/hwj.log
  3. 2 0
      obj/settings/dev.py

+ 97 - 52
.idea/workspace.xml

@@ -4,12 +4,7 @@
     <list default="true" id="0cf439b8-3fe7-43a2-bde5-030043e967df" name="Default" comment="">
     <list default="true" id="0cf439b8-3fe7-43a2-bde5-030043e967df" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/logs/hwj.log" afterPath="$PROJECT_DIR$/logs/hwj.log" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/logs/hwj.log" afterPath="$PROJECT_DIR$/logs/hwj.log" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/apps/bg/bgutils.py" afterPath="$PROJECT_DIR$/obj/apps/bg/bgutils.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/apps/bg/views.py" afterPath="$PROJECT_DIR$/obj/apps/bg/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/apps/bsdata/lianxi.py" afterPath="$PROJECT_DIR$/obj/apps/bsdata/lianxi.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/apps/bsdata/views.py" afterPath="$PROJECT_DIR$/obj/apps/bsdata/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/utils/ClssSql.py" afterPath="$PROJECT_DIR$/obj/utils/ClssSql.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/utils/executeQuery.py" afterPath="$PROJECT_DIR$/obj/utils/executeQuery.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/settings/dev.py" afterPath="$PROJECT_DIR$/obj/settings/dev.py" />
     </list>
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -32,8 +27,8 @@
       <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
       <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/obj/apps/bg/views.py">
         <entry file="file://$PROJECT_DIR$/obj/apps/bg/views.py">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="526">
-              <caret line="846" column="14" lean-forward="true" selection-start-line="846" selection-start-column="14" selection-end-line="846" selection-end-column="14" />
+            <state relative-caret-position="288">
+              <caret line="1101" column="21" lean-forward="true" selection-start-line="1101" selection-start-column="21" selection-end-line="1101" selection-end-column="21" />
               <folding>
               <folding>
                 <element signature="e#0#48#0" expanded="true" />
                 <element signature="e#0#48#0" expanded="true" />
                 <element signature="e#859#930#0" expanded="false" />
                 <element signature="e#859#930#0" expanded="false" />
@@ -53,7 +48,6 @@
                 <element signature="e#34314#36732#0" expanded="false" />
                 <element signature="e#34314#36732#0" expanded="false" />
                 <element signature="e#36793#40022#0" expanded="false" />
                 <element signature="e#36793#40022#0" expanded="false" />
                 <element signature="e#40082#42067#0" expanded="false" />
                 <element signature="e#40082#42067#0" expanded="false" />
-                <element signature="e#42131#45828#0" expanded="false" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
@@ -69,11 +63,21 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="ClssSql.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="dev.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/obj/settings/dev.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="346">
+              <caret line="282" column="28" lean-forward="true" selection-start-line="282" selection-start-column="28" selection-end-line="282" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ClssSql.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/obj/utils/ClssSql.py">
         <entry file="file://$PROJECT_DIR$/obj/utils/ClssSql.py">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="64" column="143" lean-forward="true" selection-start-line="64" selection-start-column="143" selection-end-line="64" selection-end-column="143" />
+            <state relative-caret-position="207">
+              <caret line="121" column="10" lean-forward="false" selection-start-line="121" selection-start-column="10" selection-end-line="121" selection-end-column="10" />
               <folding>
               <folding>
                 <element signature="e#48#658#0" expanded="false" />
                 <element signature="e#48#658#0" expanded="false" />
                 <element signature="e#3204#3214#0" expanded="false" />
                 <element signature="e#3204#3214#0" expanded="false" />
@@ -235,7 +239,6 @@
         <option value="$PROJECT_DIR$/obj/apps/bsdata/urls.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/urls.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/models.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/models.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/utils.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/utils.py" />
-        <option value="$PROJECT_DIR$/obj/settings/dev.py" />
         <option value="$PROJECT_DIR$/obj/apps/bg/utils.py" />
         <option value="$PROJECT_DIR$/obj/apps/bg/utils.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/lianxi.py" />
         <option value="$PROJECT_DIR$/obj/apps/bsdata/lianxi.py" />
         <option value="$PROJECT_DIR$/obj/utils/executeQuery.py" />
         <option value="$PROJECT_DIR$/obj/utils/executeQuery.py" />
@@ -243,6 +246,7 @@
         <option value="$PROJECT_DIR$/obj/apps/bg/bgutils.py" />
         <option value="$PROJECT_DIR$/obj/apps/bg/bgutils.py" />
         <option value="$PROJECT_DIR$/obj/apps/bg/views.py" />
         <option value="$PROJECT_DIR$/obj/apps/bg/views.py" />
         <option value="$PROJECT_DIR$/obj/utils/ClssSql.py" />
         <option value="$PROJECT_DIR$/obj/utils/ClssSql.py" />
+        <option value="$PROJECT_DIR$/obj/settings/dev.py" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -286,6 +290,38 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             </PATH_ELEMENT>
           </PATH>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lixin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lixin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="obj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lixin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lixin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="obj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="settings" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
         </subPane>
       </pane>
       </pane>
       <pane id="Scratches" />
       <pane id="Scratches" />
@@ -562,7 +598,14 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1593595271706</updated>
       <updated>1593595271706</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="完成,待BUG测试">
+      <created>1594013447410</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1594013447410</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
@@ -598,7 +641,8 @@
   <component name="VcsManagerConfiguration">
   <component name="VcsManagerConfiguration">
     <MESSAGE value="转移不选择过滤完成" />
     <MESSAGE value="转移不选择过滤完成" />
     <MESSAGE value="派工扫码完成" />
     <MESSAGE value="派工扫码完成" />
-    <option name="LAST_COMMIT_MESSAGE" value="派工扫码完成" />
+    <MESSAGE value="完成,待BUG测试" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成,待BUG测试" />
   </component>
   </component>
   <component name="XDebuggerManager">
   <component name="XDebuggerManager">
     <breakpoint-manager>
     <breakpoint-manager>
@@ -883,13 +927,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/obj/settings/dev.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3618">
-          <caret line="134" column="8" lean-forward="false" selection-start-line="134" selection-start-column="8" selection-end-line="134" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/obj/apps/bg/utils.py">
     <entry file="file://$PROJECT_DIR$/obj/apps/bg/utils.py">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
         <state relative-caret-position="0">
@@ -909,6 +946,7 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1053">
         <state relative-caret-position="1053">
           <caret line="39" column="12" lean-forward="false" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="12" />
           <caret line="39" column="12" lean-forward="false" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="12" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -948,38 +986,10 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/obj/apps/bg/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="526">
-          <caret line="846" column="14" lean-forward="true" selection-start-line="846" selection-start-column="14" selection-end-line="846" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#48#0" expanded="true" />
-            <element signature="e#859#930#0" expanded="false" />
-            <element signature="e#1076#3650#0" expanded="false" />
-            <element signature="e#3943#6656#0" expanded="false" />
-            <element signature="e#6717#9556#0" expanded="false" />
-            <element signature="e#9616#10906#0" expanded="false" />
-            <element signature="e#10970#14077#0" expanded="false" />
-            <element signature="e#14371#16949#0" expanded="false" />
-            <element signature="e#17010#20146#0" expanded="false" />
-            <element signature="e#20206#21356#0" expanded="false" />
-            <element signature="e#21420#24115#0" expanded="false" />
-            <element signature="e#24409#26856#0" expanded="false" />
-            <element signature="e#26917#30076#0" expanded="false" />
-            <element signature="e#30136#31288#0" expanded="false" />
-            <element signature="e#31352#34021#0" expanded="false" />
-            <element signature="e#34314#36732#0" expanded="false" />
-            <element signature="e#36793#40022#0" expanded="false" />
-            <element signature="e#40082#42067#0" expanded="false" />
-            <element signature="e#42131#45828#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/obj/utils/ClssSql.py">
     <entry file="file://$PROJECT_DIR$/obj/utils/ClssSql.py">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="64" column="143" lean-forward="true" selection-start-line="64" selection-start-column="143" selection-end-line="64" selection-end-column="143" />
+        <state relative-caret-position="207">
+          <caret line="121" column="10" lean-forward="false" selection-start-line="121" selection-start-column="10" selection-end-line="121" selection-end-column="10" />
           <folding>
           <folding>
             <element signature="e#48#658#0" expanded="false" />
             <element signature="e#48#658#0" expanded="false" />
             <element signature="e#3204#3214#0" expanded="false" />
             <element signature="e#3204#3214#0" expanded="false" />
@@ -1054,5 +1064,40 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/obj/apps/bg/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="1101" column="21" lean-forward="true" selection-start-line="1101" selection-start-column="21" selection-end-line="1101" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#48#0" expanded="true" />
+            <element signature="e#859#930#0" expanded="false" />
+            <element signature="e#1076#3650#0" expanded="false" />
+            <element signature="e#3943#6656#0" expanded="false" />
+            <element signature="e#6717#9556#0" expanded="false" />
+            <element signature="e#9616#10906#0" expanded="false" />
+            <element signature="e#10970#14077#0" expanded="false" />
+            <element signature="e#14371#16949#0" expanded="false" />
+            <element signature="e#17010#20146#0" expanded="false" />
+            <element signature="e#20206#21356#0" expanded="false" />
+            <element signature="e#21420#24115#0" expanded="false" />
+            <element signature="e#24409#26856#0" expanded="false" />
+            <element signature="e#26917#30076#0" expanded="false" />
+            <element signature="e#30136#31288#0" expanded="false" />
+            <element signature="e#31352#34021#0" expanded="false" />
+            <element signature="e#34314#36732#0" expanded="false" />
+            <element signature="e#36793#40022#0" expanded="false" />
+            <element signature="e#40082#42067#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/obj/settings/dev.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="346">
+          <caret line="282" column="28" lean-forward="true" selection-start-line="282" selection-start-column="28" selection-end-line="282" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
 </project>
 </project>

+ 21 - 0
logs/hwj.log

@@ -52054,3 +52054,24 @@ INFO 2020-07-06 12:00:24,523 autoreload 217 E:\12446\PycharmProjects\lixin\obj\a
 INFO 2020-07-06 12:00:25,335 autoreload 597 Watching for file changes with StatReloader
 INFO 2020-07-06 12:00:25,335 autoreload 597 Watching for file changes with StatReloader
 INFO 2020-07-06 12:04:04,158 autoreload 217 E:\12446\PycharmProjects\lixin\obj\utils\ClssSql.py changed, reloading.
 INFO 2020-07-06 12:04:04,158 autoreload 217 E:\12446\PycharmProjects\lixin\obj\utils\ClssSql.py changed, reloading.
 INFO 2020-07-06 12:04:04,964 autoreload 597 Watching for file changes with StatReloader
 INFO 2020-07-06 12:04:04,964 autoreload 597 Watching for file changes with StatReloader
+INFO 2020-07-06 14:17:09,280 basehttp 154 "OPTIONS /authorizations/ HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:09,653 basehttp 154 "POST /authorizations/ HTTP/1.1" 200 273
+INFO 2020-07-06 14:17:09,681 basehttp 154 "OPTIONS /bar/ HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:10,432 basehttp 154 "GET /bar/ HTTP/1.1" 200 1282
+INFO 2020-07-06 14:17:12,538 basehttp 154 "OPTIONS /salm/ HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:12,539 basehttp 154 "OPTIONS /zcno/ HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:12,768 basehttp 154 "GET /zcno/ HTTP/1.1" 200 12978
+INFO 2020-07-06 14:17:12,830 basehttp 154 "GET /salm/ HTTP/1.1" 200 12992
+INFO 2020-07-06 14:17:13,309 basehttp 154 "GET /bar/ HTTP/1.1" 200 1282
+INFO 2020-07-06 14:17:14,504 basehttp 154 "OPTIONS /bg/?to_date=2020-07-06&end_date=2020-07-06&bg_id=JS&select_zc_no= HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:14,694 basehttp 154 "GET /bg/?to_date=2020-07-06&end_date=2020-07-06&bg_id=JS&select_zc_no= HTTP/1.1" 200 925
+INFO 2020-07-06 14:17:18,099 basehttp 154 "OPTIONS /bg/?filter_no=JS20200706004 HTTP/1.1" 200 0
+INFO 2020-07-06 14:17:18,321 basehttp 154 "GET /bg/?filter_no=JS20200706004 HTTP/1.1" 200 688
+INFO 2020-07-06 14:38:24,250 basehttp 154 "GET /salm/ HTTP/1.1" 200 12992
+INFO 2020-07-06 14:38:24,277 basehttp 154 "GET /zcno/ HTTP/1.1" 200 12978
+INFO 2020-07-06 14:38:24,715 basehttp 154 "GET /bar/ HTTP/1.1" 200 1282
+INFO 2020-07-06 14:38:25,453 basehttp 154 "GET /bar/ HTTP/1.1" 200 1282
+INFO 2020-07-06 15:23:43,594 autoreload 217 E:\12446\PycharmProjects\lixin\obj\settings\dev.py changed, reloading.
+INFO 2020-07-06 15:23:44,470 autoreload 597 Watching for file changes with StatReloader
+INFO 2020-07-06 15:23:57,430 autoreload 217 E:\12446\PycharmProjects\lixin\obj\settings\dev.py changed, reloading.
+INFO 2020-07-06 15:23:58,349 autoreload 597 Watching for file changes with StatReloader

+ 2 - 0
obj/settings/dev.py

@@ -281,6 +281,8 @@ CORS_ORIGIN_WHITELIST = (
     'http://127.0.0.1:8080',
     'http://127.0.0.1:8080',
     'http://127.0.0.1:8080',
     'http://127.0.0.1:8080',
     'http://127.0.0.1:8811',
     'http://127.0.0.1:8811',
+    'http://127.0.0.1:8002',
+    'http://120.24.164.219:8002',
     'http://172.16.20.5:8811',
     'http://172.16.20.5:8811',
     'http://localhost:8080'
     'http://localhost:8080'
 )
 )