From 277113e75c76b4cfdb7d7331e479cc98b26eaf21 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Tue, 13 Aug 2019 11:05:09 +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          | 180 +++++++++++++++--------------------
 config/production_setting.py |  13 ++-
 2 files changed, 91 insertions(+), 102 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c29248..e1982ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,51 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/chufang_01.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/chufang_02.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/chufang_03.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/chufang_05.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_01.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_02.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_03.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_04.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_05.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/keting_06.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shangpin_01.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shangpin_02.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shangpin_03.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shufang_01.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shufang_02.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/shufang_03.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/wushi_01.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/wushi_02.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/wushi_03.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/shop/wushi_04.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.wxss" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/info.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/info.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/info.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/shangpin/info.wxss" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/controllers/furniture/Furniture.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/controllers/furniture/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/static/js/furniture/cat.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/static/js/furniture/cat_set.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/static/js/furniture/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/static/js/furniture/set.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/furniture/cat.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/furniture/cat_set.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/furniture/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/furniture/info.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/web/templates/furniture/set.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina" beforeDir="false" afterPath="$PROJECT_DIR$/mina" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/static/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/web/static/js/common.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/templates/common/layout_main.html" beforeDir="false" afterPath="$PROJECT_DIR$/web/templates/common/layout_main.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www.py" beforeDir="false" afterPath="$PROJECT_DIR$/www.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/production_setting.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/production_setting.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -57,22 +14,6 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templates/index/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="23" selection-start-column="23" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/templates/food/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1430" />
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/web/templates/common/layout_main.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="403">
@@ -81,6 +22,36 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/requirements.txt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="93">
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/config/production_setting.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="279">
+              <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="-372" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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$/web/controllers/furniture/Furniture.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -116,7 +87,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/web/templates/furniture/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="899">
+            <state relative-caret-position="1457">
               <caret line="47" column="16" lean-forward="true" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
             </state>
           </provider>
@@ -174,7 +145,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/web/templates/food/cat_set.html" />
         <option value="$PROJECT_DIR$/web/templates/food/cat.html" />
         <option value="$PROJECT_DIR$/common/libs/UrlManager.py" />
         <option value="$PROJECT_DIR$/web/static/js/food/set.js" />
@@ -225,6 +195,7 @@
         <option value="$PROJECT_DIR$/web/controllers/furniture/Furniture.py" />
         <option value="$PROJECT_DIR$/web/templates/common/layout_main.html" />
         <option value="$PROJECT_DIR$/web/templates/furniture/index.html" />
+        <option value="$PROJECT_DIR$/config/production_setting.py" />
       </list>
     </option>
   </component>
@@ -267,6 +238,11 @@
               <item name="common" type="462c0819:PsiDirectoryNode" />
               <item name="models" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="order" type="b2602c69:ProjectViewProjectNode" />
+              <item name="order" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
@@ -603,7 +579,14 @@
       <option name="project" value="LOCAL" />
       <updated>1565331533778</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="python学习">
+      <created>1565660852341</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1565660852341</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TodoView">
@@ -618,7 +601,7 @@
   <component name="ToolWindowManager">
     <frame x="648" y="8" width="1217" height="1036" extended-state="0" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21628499" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21628499" />
       <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" />
@@ -657,22 +640,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="python学习" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2622">
-          <caret line="19" column="16" lean-forward="true" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
-          <folding>
-            <element signature="e#24#65#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/images/avatar/3.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/images/avatar/5.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Jieshao.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="93">
@@ -731,9 +698,7 @@
     <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/images/shop/chufang_04.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/images/shop/chufang_04.jpg" />
     <entry file="file://$PROJECT_DIR$/mina/images/shop/shangpin_02.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -872,17 +837,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/furniture/index.html">
+    <entry file="file://$PROJECT_DIR$/common/models/food/Food.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
-        </state>
+        <state relative-caret-position="-93" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/food/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1430" />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/common/models/food/WxShareHistory.py">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/index/index.html">
       <provider selected="true" editor-type-id="text-editor">
@@ -891,6 +852,9 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/web/templates/food/index.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/furniture/Furniture.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
@@ -898,9 +862,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/models/food/FoodSaleChangeLog.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/common/models/food/FoodCat.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
@@ -908,12 +869,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/models/food/Food.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-93" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/models/food/WxShareHistory.py">
+    <entry file="file://$PROJECT_DIR$/common/models/food/FoodSaleChangeLog.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/common/models/food/FoodStockChangeLog.py">
@@ -925,7 +881,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/furniture/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="899">
+        <state relative-caret-position="1457">
           <caret line="47" column="16" lean-forward="true" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
         </state>
       </provider>
@@ -937,5 +893,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-372" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/local_setting.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/production_setting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/config/production_setting.py b/config/production_setting.py
index 7c68785..58e4856 100644
--- a/config/production_setting.py
+++ b/config/production_setting.py
@@ -1 +1,12 @@
-# -*- coding: utf-8 -*-
\ No newline at end of file
+# -*- coding: utf-8 -*-
+DEBUG = True
+SQLALCHEMY_ECHO = True
+SQLALCHEMY_DATABASE_URI = 'mysql://username:password@127.0.0.1/food_db?charset=utf8mb4'
+SQLALCHEMY_TRACK_MODIFICATIONS = False
+SQLALCHEMY_ENCODING = "utf8mb4"
+
+APP = {
+    'domain':'106.52.204.179'
+}
+
+RELEASE_VERSION="20180729001"
\ No newline at end of file