From b3389f8db39ae0d369df3c2a0d8c55a910c0fe81 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Mon, 26 Aug 2019 08:50:08 +0800
Subject: [PATCH] =?UTF-8?q?python=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml          | 278 +++++++++++++++++------------------
 config/base_setting.py       |   4 +-
 config/production_setting.py |   4 +-
 mina                         |   2 +-
 uwsgi.ini                    |   4 +-
 uwsgitwo.ini                 |  17 ---
 6 files changed, 141 insertions(+), 168 deletions(-)
 delete mode 100644 uwsgitwo.ini

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75e223b..ca38d6a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习" />
+    <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -10,25 +12,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/images/search-pic.png">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/uwsgi.ini">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="341">
-              <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/uwsgitwo.ini">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="341">
-              <caret line="11" column="17" lean-forward="true" selection-end-line="16" selection-end-column="38" />
+              <caret line="11" column="17" selection-end-line="16" selection-end-column="38" />
             </state>
           </provider>
         </entry>
@@ -42,11 +30,49 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/base_setting.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="194">
-              <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+            <state relative-caret-position="31">
+              <caret line="1" column="11" selection-start-line="1" selection-end-line="1" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/hello.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#31#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/manager.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="124">
+              <caret line="7" column="85" selection-start-line="7" selection-start-column="74" selection-end-line="7" selection-end-column="85" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="899">
+              <caret line="39" column="32" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="62">
+              <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -60,26 +86,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/config/local_setting.py">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/images/no-order.png">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/images/keting_02.jpg">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/images/location.png">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -196,9 +207,9 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="136" />
-    <option name="y" value="16" />
-    <option name="width" value="1082" />
+    <option name="x" value="154" />
+    <option name="y" value="10" />
+    <option name="width" value="1626" />
     <option name="height" value="1028" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -224,6 +235,24 @@
               <item name="order" type="462c0819:PsiDirectoryNode" />
               <item name="mina" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="order" type="b2602c69:ProjectViewProjectNode" />
+              <item name="order" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="order" type="b2602c69:ProjectViewProjectNode" />
+              <item name="order" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="order" type="b2602c69:ProjectViewProjectNode" />
+              <item name="order" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -282,13 +311,6 @@
       <option name="presentableId" value="Default" />
       <updated>1528044544203</updated>
     </task>
-    <task id="LOCAL-00007" summary="python学习">
-      <created>1563788503014</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1563788503014</updated>
-    </task>
     <task id="LOCAL-00008" summary="python学习">
       <created>1563789519074</created>
       <option name="number" value="00008" />
@@ -625,7 +647,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566448832557</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="python学习">
+      <created>1566449181557</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1566449181557</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="TodoView">
@@ -638,9 +667,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="136" y="16" width="1082" height="1028" extended-state="1" />
+    <frame x="235" y="34" width="1400" height="1028" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37643677" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28854626" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info id="Project Explorer" order="3" />
@@ -679,23 +709,7 @@
     <option name="LAST_COMMIT_MESSAGE" value="python学习" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="2" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.json" />
     <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -725,9 +739,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxss" />
     <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.wxml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -738,47 +750,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="32" column="35" lean-forward="true" selection-start-line="32" selection-start-column="35" selection-end-line="32" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/food/info.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="299" column="27" selection-start-line="299" selection-start-column="20" selection-end-line="299" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.js" />
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/food/info.js" />
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js" />
     <entry file="file://$PROJECT_DIR$/mina/pages/food/index.wxml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/venv/Lib/site-packages/flask/app.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="437" column="13" selection-start-line="437" selection-start-column="13" selection-end-line="437" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="20" column="24" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="39" column="16" lean-forward="true" selection-start-line="39" selection-start-column="16" selection-end-line="39" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/posts/post-detail/post-detail.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="31">
@@ -803,20 +780,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-481">
-          <caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.json" />
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxml" />
     <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="62">
@@ -824,20 +789,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="587">
-          <caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="722">
-          <caret line="211" column="19" lean-forward="true" selection-end-line="344" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxml" />
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxss" />
     <entry file="file://$PROJECT_DIR$/mina/pages/food/info.wxss">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2662">
@@ -931,14 +884,14 @@
     <entry file="file://$PROJECT_DIR$/uwsgi.ini">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="341">
-          <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/uwsgitwo.ini">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="341">
-          <caret line="11" column="17" lean-forward="true" selection-end-line="16" selection-end-column="38" />
+          <caret line="11" column="17" selection-end-line="16" selection-end-column="38" />
         </state>
       </provider>
     </entry>
@@ -949,8 +902,49 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/local_setting.py">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/hello.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="899">
+          <caret line="39" column="32" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/venv/Lib/site-packages/flask/app.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="437" column="13" selection-start-line="437" selection-start-column="13" selection-end-line="437" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/manager.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="7" column="85" selection-start-line="7" selection-start-column="74" selection-end-line="7" selection-end-column="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="1" column="11" selection-start-line="1" selection-end-line="1" selection-end-column="11" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/config/production_setting.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -959,12 +953,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/config/local_setting.py">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/config/base_setting.py b/config/base_setting.py
index 630830a..c87d94d 100644
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -43,8 +43,8 @@ UPLOAD = {
 }
 
 APP = {
-    # 'domain':'http://106.52.204.179:8999'
-      'domain':'https://python815.cn'
+     'domain':'http://106.52.204.179:8999'
+    #   'domain':'https://python815.cn'
 
 }
 
diff --git a/config/production_setting.py b/config/production_setting.py
index f14e317..78e1af3 100644
--- a/config/production_setting.py
+++ b/config/production_setting.py
@@ -7,7 +7,7 @@ SQLALCHEMY_ENCODING = "utf8mb4"
 
 
 APP = {
-     # 'domain': 'http://106.52.204.179:8999'
-     'domain':'https://python815.cn'
+     'domain': 'http://106.52.204.179:8999'
+     # 'domain':'https://python815.cn'
 }
 RELEASE_VERSION="2019822001"
\ No newline at end of file
diff --git a/mina b/mina
index eb95198..81671e8 160000
--- a/mina
+++ b/mina
@@ -1 +1 @@
-Subproject commit eb95198360675ded65bcff52df0f26c2e54d3204
+Subproject commit 81671e8531c4f26c347fce4d46c362ad2a89b28f
diff --git a/uwsgi.ini b/uwsgi.ini
index 34e4f89..683b0dd 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -1,6 +1,6 @@
 [uwsgi]
 #源码目录
-chdir=/data/www/Order
+chdir=/data/www/order
 #python 虚拟环境
 home=/data/www/python3_vir
 module=manager
@@ -14,4 +14,4 @@ pidfile=/data/www/logs/order.pid
 chmod-socket=777
 logfile-chmod=644
 daemonize=/data/www/logs/order.log
-static-map = /static=/data/www/Order/web/static
\ No newline at end of file
+static-map = /static=/data/www/order/web/static
\ No newline at end of file
diff --git a/uwsgitwo.ini b/uwsgitwo.ini
deleted file mode 100644
index 47c6bef..0000000
--- a/uwsgitwo.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[uwsgi]
-#源码目录
-chdir=/order
-#python 虚拟环境
-home=/imooc_env
-module=manager
-callable=app
-master=true
-processes=4
-http=0.0.0.0:8889
-socket=/logs/order.sock
-buffer-size=65535
-pidfile=/logs/order.pid
-chmod-socket=777
-logfile-chmod=644
-daemonize=/logs/order.log
-static-map = /static=/order/web/static
\ No newline at end of file