admin/order
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python学习

Browse Source
This commit is contained in:
jianbo
2019-08-22 12:10:03 +08:00
parent f4ab355770
commit a49eac5bd2
3 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
.idea/workspace.xml generated
View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <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$/config/base_setting.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/base_setting.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mina/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mina/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/project.config.json" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -10,38 +14,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="39" column="36" selection-start-line="39" selection-start-column="27" selection-end-line="39" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="47" column="13" selection-start-line="47" selection-start-column="13" selection-end-line="49" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/pages/food/info.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<caret line="36" column="187" selection-start-line="36" selection-start-column="187" selection-end-line="36" selection-end-column="187" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/images/wx.png">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/images/vr.png"> <entry file="file://$PROJECT_DIR$/mina/images/vr.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
@@ -52,11 +24,47 @@
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/uwsgi.ini"> <entry file="file://$PROJECT_DIR$/uwsgi.ini">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62"> <state relative-caret-position="341">
<caret line="2" column="8" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" /> <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" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="11" column="41" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="41" />
</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="253">
<caret line="44" column="7" lean-forward="true" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
</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="248">
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -128,7 +136,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/数据库文件/data" />
<option value="$PROJECT_DIR$/数据库文件/food.sql" /> <option value="$PROJECT_DIR$/数据库文件/food.sql" />
<option value="$PROJECT_DIR$/common/models/Dongtai_list.py" /> <option value="$PROJECT_DIR$/common/models/Dongtai_list.py" />
<option value="$PROJECT_DIR$/web/controllers/api/Jieshap.py" /> <option value="$PROJECT_DIR$/web/controllers/api/Jieshap.py" />
@@ -162,10 +169,8 @@
<option value="$PROJECT_DIR$/mina/pages/posts/post.json" /> <option value="$PROJECT_DIR$/mina/pages/posts/post.json" />
<option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" /> <option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" />
<option value="$PROJECT_DIR$/mina/pages/sdindex/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/sdindex/index.wxml" />
<option value="$PROJECT_DIR$/mina/app.js" />
<option value="$PROJECT_DIR$/mina/pages/shangpin/index.js" /> <option value="$PROJECT_DIR$/mina/pages/shangpin/index.js" />
<option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" />
<option value="$PROJECT_DIR$/config/base_setting.py" />
<option value="$PROJECT_DIR$/config/production_setting.py" /> <option value="$PROJECT_DIR$/config/production_setting.py" />
<option value="$PROJECT_DIR$/web/controllers/api/Food.py" /> <option value="$PROJECT_DIR$/web/controllers/api/Food.py" />
<option value="$PROJECT_DIR$/mina/pages/food/index.js" /> <option value="$PROJECT_DIR$/mina/pages/food/index.js" />
@@ -178,7 +183,10 @@
<option value="$PROJECT_DIR$/mina/pages/sdindextwo/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/sdindextwo/index.wxml" />
<option value="$PROJECT_DIR$/mina/app.json" /> <option value="$PROJECT_DIR$/mina/app.json" />
<option value="$PROJECT_DIR$/mina/pages/food/info.wxml" /> <option value="$PROJECT_DIR$/mina/pages/food/info.wxml" />
<option value="$PROJECT_DIR$/uwsgitwo.ini" />
<option value="$PROJECT_DIR$/uwsgi.ini" /> <option value="$PROJECT_DIR$/uwsgi.ini" />
<option value="$PROJECT_DIR$/mina/app.js" />
<option value="$PROJECT_DIR$/config/base_setting.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -192,9 +200,9 @@
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="866" /> <option name="x" value="27" />
<option name="y" value="35" /> <option name="y" value="16" />
<option name="width" value="947" /> <option name="width" value="1082" />
<option name="height" value="1028" /> <option name="height" value="1028" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -210,6 +218,16 @@
<item name="order" type="b2602c69:ProjectViewProjectNode" /> <item name="order" type="b2602c69:ProjectViewProjectNode" />
<item name="order" type="462c0819:PsiDirectoryNode" /> <item name="order" type="462c0819:PsiDirectoryNode" />
</path> </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" />
<item name="mina" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@@ -268,13 +286,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1528044544203</updated> <updated>1528044544203</updated>
</task> </task>
<task id="LOCAL-00003" summary="python学习">
<created>1563411566956</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1563411566956</updated>
</task>
<task id="LOCAL-00004" summary="python学习"> <task id="LOCAL-00004" summary="python学习">
<created>1563704687324</created> <created>1563704687324</created>
<option name="number" value="00004" /> <option name="number" value="00004" />
@@ -611,7 +622,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1566381928447</updated> <updated>1566381928447</updated>
</task> </task>
<option name="localTasksCounter" value="52" /> <task id="LOCAL-00052" summary="python学习">
<created>1566382556215</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1566382556215</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@@ -624,9 +642,10 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="866" y="35" width="947" height="1028" extended-state="0" /> <frame x="27" y="16" width="1082" height="1028" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.43234324" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37643677" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="Project Explorer" order="3" /> <window_info id="Project Explorer" order="3" />
@@ -665,9 +684,6 @@
<option name="LAST_COMMIT_MESSAGE" value="python学习" /> <option name="LAST_COMMIT_MESSAGE" value="python学习" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/mina/pages/posts/post-detail/post-detail.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/mina/pages/posts/post.json"> <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31"> <state relative-caret-position="31">
@@ -702,13 +718,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/mina/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="11" column="6" lean-forward="true" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py"> <entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-186" /> <state relative-caret-position="-186" />
@@ -771,13 +780,6 @@
<entry file="file://$PROJECT_DIR$/config/local_setting.py"> <entry file="file://$PROJECT_DIR$/config/local_setting.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/production_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="8" column="7" lean-forward="true" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py"> <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248"> <state relative-caret-position="248">
@@ -892,13 +894,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/base_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="501">
<caret line="31" column="31" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mina/app.json"> <entry file="file://$PROJECT_DIR$/mina/app.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558"> <state relative-caret-position="558">
@@ -943,8 +938,36 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/uwsgi.ini"> <entry file="file://$PROJECT_DIR$/uwsgi.ini">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62"> <state relative-caret-position="341">
<caret line="2" column="8" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" /> <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>
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mina/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="11" column="41" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/base_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="44" column="7" lean-forward="true" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/production_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>

3
config/production_setting.py
View File

@@ -7,6 +7,7 @@ SQLALCHEMY_ENCODING = "utf8mb4"
APP = { APP = {
'domain': 'http://106.52.204.179:8999' # 'domain': 'http://106.52.204.179:8999'
'domain':'https://python815.cn'
} }
RELEASE_VERSION="20180729001" RELEASE_VERSION="20180729001"

2
mina

Submodule mina updated: 445096f5c4...eb95198360