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 1/6] =?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 @@ - + + + - - - - - - - - - - - - - - - + @@ -42,11 +30,49 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60,26 +86,11 @@ - + - - - - - - - - - - - - - - - @@ -196,9 +207,9 @@ - @@ -224,6 +235,24 @@ + + + + + + + + + + + + + + + + + + - @@ -311,13 +475,6 @@ @@ -667,10 +831,9 @@ - - + - + @@ -685,7 +848,7 @@ - + @@ -703,35 +866,13 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -740,39 +881,17 @@ - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + + + @@ -782,13 +901,7 @@ - - - - - - - + @@ -819,13 +932,7 @@ - - - - - - - + @@ -839,20 +946,7 @@ - - - - - - - - - - - - - - + @@ -860,45 +954,52 @@ - - - - - - - - - + + + - - - + - + - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + @@ -911,10 +1012,20 @@ - + + + + - - + + + + + + + + + @@ -925,36 +1036,39 @@ - + - - + + - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/base_setting.py b/config/base_setting.py index c87d94d..6cf92d6 100644 --- a/config/base_setting.py +++ b/config/base_setting.py @@ -43,9 +43,11 @@ UPLOAD = { } APP = { - 'domain':'http://106.52.204.179:8999' + # 'domain':'http://106.52.204.179:8999' # 'domain':'https://python815.cn' + + } PAY_STATUS_MAPPING = { diff --git a/config/production_setting.py b/config/production_setting.py index 78e1af3..a67c49e 100644 --- a/config/production_setting.py +++ b/config/production_setting.py @@ -7,7 +7,9 @@ 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 81671e8..bbc5e73 160000 --- a/mina +++ b/mina @@ -1 +1 @@ -Subproject commit 81671e8531c4f26c347fce4d46c362ad2a89b28f +Subproject commit bbc5e7348303accb5657b54848ff2641422ec027 From 780443e7d1227b341ed36b4955d23b4a80957b9d Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Tue, 3 Mar 2020 15:49:56 +0800 Subject: [PATCH 3/6] =?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 | 740 ++++++++++-------------- common/models/member/Mendianuserinfo.py | 18 + config/production_setting.py | 2 +- web/controllers/api/Member.py | 22 + 4 files changed, 362 insertions(+), 420 deletions(-) create mode 100644 common/models/member/Mendianuserinfo.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 16258e8..f0be36e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,246 +2,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -271,20 +77,6 @@ - catC - 小鸡 - getCurrentPageUrlWithArgs - data - onSha - buyNo - getFor - login_name - user.login_name - IGNORE_URLS - currentTarget - concat - 美食 - search index contact avatar @@ -301,6 +93,20 @@ tobuy page-body-form-key page-body-button + form-control + ibox-content + do-login + btn-primary + m-b + login_wrap + login_name + buildUrl + pull-right + checkReg + foodIndex + Member + model_member + app ops_render @@ -312,11 +118,6 @@ @@ -375,10 +181,10 @@ - -