Skip to content

Commit 3846668

Browse files
author
tiger
committed
update
1 parent 6ea4596 commit 3846668

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

chiki/api/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def __init__(self):
103103
super(Resource, self).__init__()
104104
self.not_strips = tuple()
105105
self.req = reqparse.RequestParser()
106+
self._args = None
106107
self.add_args()
107108

108109
def add_args(self):
@@ -111,6 +112,12 @@ def add_args(self):
111112
def get_args(self):
112113
return strip(self.req.parse_args(), *self.not_strips)
113114

115+
@property
116+
def args(self):
117+
if not self._args:
118+
self._args = self.get_args()
119+
return self._args
120+
114121

115122
api = Api()
116123
wapi = WApi()

chiki/app.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
__all__ = [
3737
"init_app", 'init_web', 'init_api', "init_admin", "start_error",
3838
'register_app', 'register_web', 'register_api', 'register_admin',
39-
'apps',
39+
'apps', 'register_init', 'inits',
4040
]
4141

4242
DEBUG_TB_PANELS = (
@@ -56,6 +56,7 @@
5656

5757
media = MediaManager()
5858
apps = dict()
59+
inits = list()
5960

6061

6162
def init_db(db):
@@ -239,6 +240,10 @@ def before_request():
239240
cm.init_app(app)
240241
Choices.init()
241242

243+
global inits
244+
for i in inits:
245+
i(app)
246+
242247
if callable(init):
243248
init(app)
244249

@@ -472,6 +477,12 @@ def run():
472477
return wrapper
473478

474479

480+
def register_init(init):
481+
global inits
482+
inits.append(init)
483+
return init
484+
485+
475486
def register_admin(name='admin', config=None, manager=True):
476487
return register_app(name, config, init_admin, manager=manager)
477488

chiki/contrib/common/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ class ShareLog(db.Document):
312312

313313
# 小程序解密专用
314314
def decrypt(self):
315-
if not self.user or not self.user.wechat_user:
316-
return
315+
# if not self.user or not self.user.wechat_user:
316+
# return
317317

318318
datas = json.loads(self.infos)
319319
for data in datas:

chiki/mongoengine/storages.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ def get_path(self, name):
4646
return name
4747

4848
def get_link(self, name, **kwargs):
49-
return self.conf['link'] % name
49+
link = self.conf['link'] % name
50+
if self.conf.get('prefix'):
51+
return self.conf.get('prefix') + link
52+
return link
5053

5154

5255
class LocalFile(BaseFile):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ def get_data_files(*dirs):
5656
'Flask-BabelEx==0.9.2',
5757
'Flask-Login==0.2.11',
5858
'mongoengine==0.10.1',
59-
'flask-mongoengine==0.7.1',
60-
'Flask-WTF==0.11',
59+
'flask-mongoengine>=0.7.1',
60+
'Flask-WTF>=0.11',
6161
'Flask-Mail==0.9.1',
6262
'Flask-RESTful==0.3.3',
6363
'Jinja2==2.7.3',

0 commit comments

Comments
 (0)