Brightcells
|
bf80400a5b |
CLERK_NOT_AUTH |
6 years ago |
Brightcells
|
c7a7386814 |
AdvancedActionsModelAdmin |
6 years ago |
Brightcells
|
6d1178e835 |
AdvancedExportExcelModelAdmin, |
6 years ago |
Brightcells
|
1e37048bfc |
Fix Bug: unsupported operand type(s) for +: 'int' and 'unicode' |
6 years ago |
Brightcells
|
76d59df977 |
Opt year data |
6 years ago |
Brightcells
|
3bf021fc9b |
decrypted |
6 years ago |
Brightcells
|
e18d764ef3 |
DJANGO_WE_COMPONENT_REDIRECT_URI |
6 years ago |
Brightcells
|
a078341431 |
Preauth page |
6 years ago |
Brightcells
|
4a03f4d735 |
DJANGO_WE_COMPONENT_REDIRECT_URI |
6 years ago |
Brightcells
|
2ae5f4eae0 |
Django-We Settings - PreAuth |
6 years ago |
Brightcells
|
b7caee0a32 |
Preauth |
6 years ago |
Brightcells
|
34c6774438 |
Opt |
6 years ago |
Brightcells
|
8fd8731267 |
Makemigrations |
6 years ago |
Brightcells
|
74f2a0cd6d |
testsn |
6 years ago |
Brightcells
|
1ae491b9f1 |
get_query_value |
6 years ago |
Brightcells
|
6cfdc01666 |
logit |
6 years ago |
Brightcells
|
a1d1421493 |
ScreenStatusCode.QRCODE_NOT_SCAN |
6 years ago |
Brightcells
|
7e9b7eb161 |
Opt |
6 years ago |
Brightcells
|
525ce072a0 |
SCREEN_ADMIN_LOGIN |
6 years ago |
Brightcells
|
11567095a0 |
tamron |
6 years ago |
Brightcells
|
f1ec926caa |
Redis getdelete |
6 years ago |
Brightcells
|
3afae91835 |
Return model info for api clerk_integral_list_api |
6 years ago |
Brightcells
|
b8784eee8a |
Makemigrations |
6 years ago |
Brightcells
|
548f4827df |
Opt |
6 years ago |
Brightcells
|
4e979066f6 |
Update requirements |
6 years ago |
Brightcells
|
a460f631d2 |
headimgurl |
6 years ago |
Brightcells
|
2c35869817 |
GET => POST |
6 years ago |
Brightcells
|
2b9c19f154 |
Fix Bug |
6 years ago |
Brightcells
|
88c914df41 |
Guideline Login Error |
6 years ago |
Brightcells
|
cf26cd7dcc |
Update gis |
6 years ago |
Brightcells
|
5bf1731f10 |
Update gis |
6 years ago |
Brightcells
|
cfd9fc85fa |
PHONE_2_ADMINISTRATIVE_DIVISION |
6 years ago |
Brightcells
|
09cd1abe7f |
model_uni_name |
6 years ago |
Brightcells
|
ec4986de73 |
Opt |
6 years ago |
Brightcells
|
e9f8a35b9d |
Makemigrations |
6 years ago |
Brightcells
|
a891306030 |
statistic |
6 years ago |
Brightcells
|
d43b59b5ea |
Opt |
6 years ago |
Brightcells
|
d9e17b83cd |
-1 |
6 years ago |
Brightcells
|
7804328d8e |
DeleteModelAdmin |
6 years ago |
Brightcells
|
266679251e |
distributor_short_name |
6 years ago |
Brightcells
|
deb84bfcb5 |
Makemigrations |
6 years ago |
Brightcells
|
f4e231d906 |
distributor_short_name |
6 years ago |
Brightcells
|
7e72bd8214 |
Order ConsumeProvinceSaleStatisticInfo |
6 years ago |
Brightcells
|
460fcf5e59 |
distributor_name |
6 years ago |
Brightcells
|
3765c81dde |
SaleclerkSaleStatisticInfoAdmin |
6 years ago |
Brightcells
|
de5ada9cd5 |
refreshm |
6 years ago |
Brightcells
|
be0a4b6335 |
model_id |
6 years ago |
Brightcells
|
d12cffef3f |
refreshm |
6 years ago |
Brightcells
|
5f92e2ec19 |
Fix Bug: 'ConsumeModelSaleStatisticInfo' object has no attribute 'get' |
6 years ago |
Brightcells
|
0131ed9665 |
Statistic |
6 years ago |
Brightcells
|
4a60ea51aa |
GIS |
6 years ago |
Brightcells
|
986fd850cf |
Update txt |
6 years ago |
Brightcells
|
3ced276959 |
user_status |
6 years ago |
Brightcells
|
520ccb4971 |
user_status |
6 years ago |
Brightcells
|
717ceff020 |
clerk.user_status = SaleclerkInfo.UNVERIFIED |
6 years ago |
Brightcells
|
96f21d44c3 |
clerk.user_status |
6 years ago |
Brightcells
|
52f1db9af8 |
Fix Bug: clerk_id |
6 years ago |
Brightcells
|
f1f7c30625 |
search_fields |
6 years ago |
Brightcells
|
ec3287610c |
re_membercard |
6 years ago |
Brightcells
|
0ebd5a54e7 |
o.num |
6 years ago |
Brightcells
|
c73aefba38 |
SaleclerkSaleStatisticInfo |
6 years ago |
Brightcells
|
59af781f09 |
Fix Bug: list slice |
6 years ago |
Brightcells
|
422f3e413e |
Remove select_for_update |
6 years ago |
Brightcells
|
285acfc352 |
Opt |
6 years ago |
Brightcells
|
490439c44a |
Update reslist limitation |
6 years ago |
Brightcells
|
acf403b925 |
Fix Bug: can't multiply sequence by non-int of type 'float' |
6 years ago |
Brightcells
|
61ba06b9aa |
V2 TJ |
6 years ago |
Brightcells
|
b95db9c5c3 |
Basic gis command |
6 years ago |
Brightcells
|
c2434b4d01 |
cardList |
6 years ago |
Brightcells
|
de639f39e8 |
Makemigrations |
6 years ago |
Brightcells
|
4404c68cc9 |
Update PROVINCE_LIST province_name |
6 years ago |
Brightcells
|
6fa1fcfe34 |
Update DJANGO_WE_MESSAGE_CALLBACK_FUNC |
6 years ago |
Brightcells
|
6dcba6d432 |
sessionKey |
6 years ago |
Brightcells
|
44044c9cd8 |
Fix Bug: could not convert string to float: undefined |
6 years ago |
Brightcells
|
69f5e16982 |
Makemigrations |
6 years ago |
Brightcells
|
bedfb41327 |
memberusercardcode |
6 years ago |
Brightcells
|
428a189ebb |
Bootcdn Crash, Change CDN Domain & TODO: Support Fallback |
6 years ago |
Brightcells
|
d2356e571a |
session_key |
6 years ago |
Brightcells
|
66a598b30c |
Makemigrations |
6 years ago |
Brightcells
|
d45acb268d |
Remove unique of phone |
6 years ago |
Brightcells
|
ed22684a98 |
consumer_snlist_api |
6 years ago |
Brightcells
|
3020ecd3a7 |
Response saleclerk info for mini login |
6 years ago |
Brightcells
|
036b2e6570 |
logit res |
6 years ago |
Brightcells
|
120900c7f8 |
Monthly |
6 years ago |
Brightcells
|
9c585b197e |
Mch migrations |
6 years ago |
Brightcells
|
f27da2b85a |
verifyResult db_index |
6 years ago |
Brightcells
|
a3477a624f |
mini_login_api unionid |
6 years ago |
Brightcells
|
c3a51ad4c2 |
Fix Bug: DJANGO_WE_MESSAGE_CALLBACK_FUNC() takes exactly 2 arguments (3 given) |
6 years ago |
Brightcells
|
16638b00b5 |
Fix Bug: select_for_update cannot be used outside of a transaction. |
6 years ago |
Brightcells
|
d7558adcb1 |
get_userinfo_api2 code |
6 years ago |
Brightcells
|
55b9749bbe |
Admin Site Register |
6 years ago |
Brightcells
|
6e7c94e744 |
MchInfoDecryptLogInfo |
6 years ago |
Brightcells
|
cef6755ce5 |
Miniapp login & getUserInfo |
6 years ago |
Brightcells
|
d17e62ec95 |
Update list_filter |
6 years ago |
Brightcells
|
3de3d9e65b |
session_key |
6 years ago |
Brightcells
|
b1f3b3bcbb |
Fix Bug: error |
6 years ago |
Brightcells
|
2070e07cdf |
Upgrade src |
6 years ago |
Brightcells
|
900c3fd386 |
Makemigrations |
6 years ago |
Brightcells
|
0783db1a97 |
LatestAppScreenInfo |
6 years ago |
Brightcells
|
1aa50d49d2 |
Update log key |
6 years ago |
Brightcells
|
1e70cfa377 |
Update sessionKey |
6 years ago |
Brightcells
|
e7306d6105 |
Change to use clerk's distributor_id |
6 years ago |
Brightcells
|
38bf89a5a7 |
Update site_header |
6 years ago |
Brightcells
|
38ef14de91 |
jancode |
6 years ago |
Brightcells
|
1d4dc7ca9e |
DistributorInfo |
6 years ago |
Brightcells
|
3f9969cafc |
Support scan jancode |
6 years ago |
Brightcells
|
659be0c05b |
Update requirements.txt |
6 years ago |
Brightcells
|
d54f8ef024 |
User.data => User.bandata |
7 years ago |
Brightcells
|
e31a588800 |
Update requirements_dj.txt |
7 years ago |
Brightcells
|
2de7fe4114 |
Fix Bug: Sale clerk or not |
7 years ago |
Brightcells
|
669701737b |
Update requirements_xxx.txt |
7 years ago |
Brightcells
|
926f0ef06a |
Update requirements_xxx.txt |
7 years ago |
Brightcells
|
e42171efb9 |
Update requirements.txt |
7 years ago |
Brightcells
|
15e0f2277f |
MchInfoEncryptLogInfo |
7 years ago |
Brightcells
|
74b28f3024 |
__tj_generate |
7 years ago |
Brightcells
|
3367bec35f |
Update TJ Generate |
7 years ago |
Brightcells
|
dd7e76322c |
brandID => brand.pk |
7 years ago |
Brightcells
|
688fe460d8 |
BrandID |
7 years ago |
Brightcells
|
a4433e8542 |
Update UserInfoAdmin & Requirements |
7 years ago |
Brightcells
|
5fdb5b42fd |
Logfile Upload |
7 years ago |
Brightcells
|
5bc96894d2 |
settings.KODO_DEFAULT_BRAND_PK |
7 years ago |
Brightcells
|
f0ea40faf6 |
Fix Bug: ProductBrandStatusCode.BRAND_NOT_FOUND |
7 years ago |
Brightcells
|
129384506f |
Fix Bug: ProductBrandStatusCode.BRAND_NOT_FOUND |
7 years ago |
Brightcells
|
c12254d9f4 |
DELETED |
7 years ago |
Brightcells
|
ed4cea0f13 |
SaleClerk Deleted |
7 years ago |
Brightcells
|
b90bf186bc |
brand_domain |
7 years ago |
Brightcells
|
f5b21b74fc |
YMD Statistic |
7 years ago |
Brightcells
|
cb496dadad |
KODO_CLERK_AUTH_URL |
7 years ago |
Brightcells
|
b994f09008 |
settings.KODO_DEFAULT_BRAND |
7 years ago |
Brightcells
|
619711142e |
Makemigrations |
7 years ago |
Brightcells
|
e7dcf47e22 |
SaleclerkInfo |
7 years ago |
Brightcells
|
a2da797cde |
Update pre & statistic by brand_id |
7 years ago |
Brightcells
|
2988703c52 |
Update |
7 years ago |
Brightcells
|
cbc12e6b47 |
'count': count, |
7 years ago |
Brightcells
|
175a318cb8 |
.order_by('-pk') |
7 years ago |
Brightcells
|
762555f352 |
Update comment |
7 years ago |
Brightcells
|
b2c23962a2 |
Add is_auth |
7 years ago |
Brightcells
|
bbb3ba2a4f |
.order_by('-pk') |
7 years ago |
Brightcells
|
154554f80c |
Update CORS_ORIGIN_WHITELIST |
7 years ago |
Brightcells
|
6907965f66 |
CORS |
7 years ago |
Brightcells
|
137ed6dee2 |
Clerk add/delete/update/list |
7 years ago |
Brightcells
|
8aad026559 |
Model add/delete/update/list |
7 years ago |
Brightcells
|
9a03338a6e |
Opt |
7 years ago |
Brightcells
|
da95b8c8d6 |
Distributor add/delete/update/list |
7 years ago |
Brightcells
|
1d274dd479 |
Opt |
7 years ago |
Brightcells
|
62948fb5c3 |
Operator add/delete/update/list |
7 years ago |
Brightcells
|
761822ee36 |
DEBUG_DATA_FLAG => DEBUG_STATISTIC_DATA_FLAG |
7 years ago |
Brightcells
|
c9fea6b1a7 |
ROIs |
7 years ago |
Brightcells
|
49352c2ff1 |
tj_consumer |
7 years ago |
Brightcells
|
537c495621 |
Statistic |
7 years ago |
Brightcells
|
1de11ca414 |
Fix Bug: xxx.pk => xxx_id |
7 years ago |
Brightcells
|
8fe6dfd442 |
Update verbose_name |
7 years ago |
Brightcells
|
d10bd672ea |
AdministratorInfo/BrandModelDistributorPriceInfo |
7 years ago |
Brightcells
|
6d9dc5dbcf |
Update admin for DistributorInfoAdmin |
7 years ago |
Brightcells
|
d1e9b5857b |
Update admin for DistributorInfoAdmin |
7 years ago |
Brightcells
|
c7b55979c0 |
Add province code/name for DistributorInfo |
7 years ago |
Brightcells
|
39d9ce0880 |
Remove filter limit |
7 years ago |
Brightcells
|
0609d2aa96 |
Fix Bug: DistributorID ValueError |
7 years ago |
Brightcells
|
02cc0fe5b0 |
Add tj_generate |
7 years ago |
Brightcells
|
7c4311f505 |
Change ymd as IntegerField |
7 years ago |
Brightcells
|
08557546f6 |
Add position for ProvinceSaleStatisticInfo |
7 years ago |
Brightcells
|
4efb7f6f87 |
Statistic |
7 years ago |
Brightcells
|
44a6cdf337 |
Statistic |
7 years ago |
Brightcells
|
b29e954f89 |
Remove unused codes |
7 years ago |
Brightcells
|
815da0da9f |
Filter pk=ModelID |
7 years ago |
Brightcells
|
cb207c5fcf |
Add field dupload for SaleclerkSubmitLogInfo |
7 years ago |
Brightcells
|
9fd61d47f3 |
ModelID => model_id |
7 years ago |
Brightcells
|
421eebf2fc |
could not convert string to float |
7 years ago |
Brightcells
|
b66abb9369 |
Return franchiser_name/clerk_name when duplicate upload |
7 years ago |
Brightcells
|
e2ff1d264d |
test_user |
7 years ago |
Brightcells
|
549e497a0a |
test_user |
7 years ago |
Brightcells
|
e47aa7f8c4 |
Add field test_user |
7 years ago |
Brightcells
|
e2ce6ade15 |
Return total_integral |
7 years ago |
Brightcells
|
b2c1f2b217 |
Return created_at |
7 years ago |
Brightcells
|
df63cfed08 |
Add clerk integral list api |
7 years ago |
Brightcells
|
6568e5576a |
Add verifyResult for ConsumeInfoSubmitLogInfoAdmin's list_filter |
7 years ago |
Brightcells
|
f1260953bf |
Move image/url from ModelImageInfo to ModelInfo |
7 years ago |
Brightcells
|
597ee33ba6 |
Pai2 => Kodo |
7 years ago |
Brightcells
|
d6f9edb0d2 |
model.model_full_name or model.model_name |
7 years ago |
Brightcells
|
d827f54be4 |
Add model_full_name for ModelInfoAdmin's list_display |
7 years ago |
Brightcells
|
145973f8f0 |
Add brand_full_name for BrandInfo |
7 years ago |
Brightcells
|
5f4ef22292 |
ModelInfoAdmin list_display integral |
7 years ago |
Brightcells
|
71993af1e4 |
Add integral for ModelInfo |
7 years ago |
Brightcells
|
703c9d8042 |
SaleclerkStatusCode.CLERK_NOT_FOUND |
7 years ago |
Brightcells
|
f2fc73685d |
Update package django_xxx |
7 years ago |
Brightcells
|
018d52f61d |
Update package django_xxx |
7 years ago |
Brightcells
|
1b146b055a |
Update supervisor stopsignal |
7 years ago |
Brightcells
|
8f6764e70d |
Return user's phone for mini/userinfo |
7 years ago |
Brightcells
|
4bfdba3718 |
MemberCardID |
7 years ago |
Brightcells
|
852e8b89b5 |
Has Member Card Flag |
7 years ago |
Brightcells
|
6fa9d3b890 |
Message Callback |
7 years ago |
Brightcells
|
0176ccffcc |
Add new api membercard_extradata |
7 years ago |
Brightcells
|
6cc1a44274 |
Change curtail_uuid to django_curtail_uuid |
7 years ago |
Brightcells
|
ba02836018 |
clerk_id |
7 years ago |
Brightcells
|
f26f4018e0 |
purePhoneNumber |
7 years ago |
Brightcells
|
d27af3f9c4 |
storage=RedisStorage(r) |
7 years ago |
Brightcells
|
5c223e0f9e |
(res=True) |
7 years ago |
Brightcells
|
31f4f3426d |
consumer_phone_api |
7 years ago |
Brightcells
|
df3a346686 |
consumer_phone |
7 years ago |
Brightcells
|
a1d9b70db6 |
get_phone_number |
7 years ago |
Brightcells
|
2bac598d19 |
Clerk Sale Submit |
7 years ago |
Brightcells
|
a16672505c |
Make URL namespace unique |
7 years ago |
Brightcells
|
1796c9c28c |
Add cipherlen for ciphertext |
7 years ago |
Brightcells
|
a272ee8787 |
AttributeError: 'ModelInfo' object has no attribute 'model_imgs' |
7 years ago |
Brightcells
|
2c88ab8d3e |
AttributeError: 'list' object has no attribute 'model_imgs' |
7 years ago |
Brightcells
|
936cee4d66 |
Return encrypt goods info |
7 years ago |
Brightcells
|
7f9088cde4 |
ID => PK |
7 years ago |
Brightcells
|
cfbab9ae47 |
Remove B64 |
7 years ago |
Brightcells
|
f38d3bf980 |
Caesar Alg |
7 years ago |
Brightcells
|
14faa83d54 |
Change plaintext format |
7 years ago |
Brightcells
|
ce44255865 |
urlpatterns += |
7 years ago |
Brightcells
|
0edbc92c74 |
Add Clerk Api |
7 years ago |
Brightcells
|
7f0e4aac3b |
unionId |
7 years ago |
Brightcells
|
56e5ca1bc5 |
exists |
7 years ago |
Brightcells
|
15f0bfd7d9 |
UserInfo Saleclerk |
7 years ago |
Brightcells
|
e96281094e |
Remove api |
7 years ago |
Brightcells
|
f4d30433d4 |
+= |
7 years ago |
Brightcells
|
627187a7d7 |
Update Kodo |
7 years ago |
Brightcells
|
2a288e9241 |
Create Database |
7 years ago |
Brightcells
|
13816e8774 |
Fix Bug: REQUEST |
7 years ago |
Brightcells
|
1ddb115c57 |
list_display |
7 years ago |
Brightcells
|
e04f95dc5e |
long => lon |
7 years ago |
Brightcells
|
a77c4993f8 |
FloatField |
7 years ago |
Brightcells
|
340b18cdf2 |
FloatField |
7 years ago |
Brightcells
|
eacab44ee6 |
consumer_info |
7 years ago |
Brightcells
|
1b1f0192f8 |
ConsumeInfoSubmitLogInfo |
7 years ago |
Brightcells
|
1df0e3b9a1 |
optor_id => operator_id |
7 years ago |
Brightcells
|
a221274ff0 |
Update login/info |
7 years ago |
Brightcells
|
bb022c8722 |
Add api/infos |
7 years ago |
Brightcells
|
5ab6542f69 |
Make account relative ReadOnly or ChangeOnly |
7 years ago |
Brightcells
|
7d17a82ab8 |
Make group relative ReadOnly |
7 years ago |
Brightcells
|
c73d195d23 |
Make some message ReadOnly |
7 years ago |
Brightcells
|
d8dc3bb714 |
Make FeedbackInfo ReadOnly |
7 years ago |
Brightcells
|
3a0f7169bb |
Make LatestAppInfo Only Exists One for Mch |
7 years ago |
Brightcells
|
3d30d80acf |
Make LatestAppInfo Only Exists One by src |
7 years ago |
Brightcells
|
e1103a388e |
# DISABLE_ACTION = False |
7 years ago |
Brightcells
|
bc27d41f09 |
Change OrderInfo ReadOnly |
7 years ago |
Brightcells
|
b1de39086a |
Update Operator encryption only when password exists |
7 years ago |
Brightcells
|
89108cc8cd |
Update list_filter |
7 years ago |
Brightcells
|
49634dc097 |
Add api operator login |
7 years ago |
Brightcells
|
917f2df489 |
Add api api/upgrade |
7 years ago |
Brightcells
|
d105aa6305 |
Update Django==1.11.9 |
7 years ago |
Brightcells
|
7919ab761d |
Change to use djagno-redis-connector |
7 years ago |
Brightcells
|
208fc20a24 |
Change to use django-response |
7 years ago |
Brightcells
|
9ec76d526a |
TextField => CharField |
7 years ago |
Brightcells
|
f3a6f01d94 |
Kodo update admin |
7 years ago |
Brightcells
|
2181a06f23 |
Kodo update |
7 years ago |
Brightcells
|
92e36486fe |
site_header |
7 years ago |
Brightcells
|
a7cbbf15a7 |
Update max_length for CharField |
7 years ago |
Brightcells
|
7bb638568e |
Add sysctl.sh script |
7 years ago |
Brightcells
|
9bb56c50cc |
Makemigrations |
7 years ago |
Brightcells
|
135c21b40c |
from models_ext import BaseModelMixin, upload_file_url, upload_path |
7 years ago |
Brightcells
|
d28dca92ff |
CreateUpdateMixin => BaseModelMixin |
7 years ago |
Brightcells
|
bd794a93f4 |
logit for encrypt/decrypt |
7 years ago |
Brightcells
|
78a87fa9b9 |
api/ |
7 years ago |
Brightcells
|
0f648cced6 |
rsa==3.4.2 |
7 years ago |
Brightcells
|
be7a80534a |
B64 only |
7 years ago |
Brightcells
|
c6a14e1496 |
django-models-ext==1.0.5 |
7 years ago |
Brightcells
|
aa31a5f59a |
Add kodo |
7 years ago |
Brightcells
|
95b4fd3782 |
Quote/UnQuote |
7 years ago |
Brightcells
|
096e3811f4 |
New django-we with oauth_settings.py |
7 years ago |
Brightcells
|
1d7cc7e786 |
V.wxChooseImageSuccess |
7 years ago |
Brightcells
|
01d880bd8b |
V.wxChooseImageSuccess |
7 years ago |
Brightcells
|
d88a601cf7 |
LensmanInfoAdmin save_model not save |
7 years ago |
Brightcells
|
8665f2ebd4 |
Fix Bug: ValueError: invalid literal for int() with base 10: '' |
7 years ago |
Brightcells
|
f3cf68f957 |
Add PAI2_HOME_WX_API for request.weixin |
7 years ago |
Brightcells
|
511533855d |
Change oauth to use http |
7 years ago |
Brightcells
|
3aba0380d6 |
OUTTAKE lensman not have watermark |
7 years ago |
Brightcells
|
8c02eb6452 |
Fix Bug: user's outtake_status error |
7 years ago |
Brightcells
|
60293b827f |
Fix Bug: AttributeError: 'UserInfo' object has no attribute 'lensman_type' |
7 years ago |
Brightcells
|
a6195fa70d |
Add outtake lensman |
7 years ago |
Brightcells
|
c98211626d |
Remove templates website |
7 years ago |
Brightcells
|
df0111917e |
Update jswe.js |
7 years ago |
Brightcells
|
9ba7189f71 |
Update to jweixin-1.2.0.js |
8 years ago |
Brightcells
|
90bc3b977c |
Update jswe.js |
8 years ago |
Brightcells
|
cc2bdc34ea |
Update jswe.js |
8 years ago |
Brightcells
|
e5ad69259f |
Add unique_together = (('group_id', 'session_id', 'user_id', 'photo_id', 'lensman_photo_id'),) for GroupPhotoOrderInfo |
8 years ago |
Brightcells
|
2a054aa566 |
Fix Bug: photo_url error |
8 years ago |
Brightcells
|
268aa4ebe3 |
Add unique_together = (('user_id', 'msg_id'),) for SystemMessageReadInfo/SystemMessageDeleteInfo |
8 years ago |
Brightcells
|
9f4c919c29 |
Add unique_together = (('photo_id', 'user_id'),) for PhotoThumbUpInfo |
8 years ago |
Brightcells
|
7060597dd6 |
Add unique_together = (('group_id', 'user_id', 'photo_md5'),) for GroupPhotoInfo |
8 years ago |
Brightcells
|
bf678fc740 |
Add unique_together = (('session_id', 'group_from'),) |
8 years ago |
Brightcells
|
5411626ebe |
Change watermark position |
8 years ago |
Brightcells
|
7a28857d24 |
Change to use has_watermark |
8 years ago |
Brightcells
|
3b92e37156 |
Add field has_watermark for GroupPhotoInfo |
8 years ago |
Brightcells
|
24e345a32f |
Add price func get_group_photo_price |
8 years ago |
Brightcells
|
c3970eff70 |
Add Src PAIAI_LENSMAN2 |
8 years ago |
Brightcells
|
9fb99c4a8c |
Add Src PAIAI_LENSMAN2 |
8 years ago |
Brightcells
|
65db8b1bc1 |
Add Src PAIAI_LENSMAN2 |
8 years ago |
Brightcells
|
bb58496f42 |
Add StatusCode TOKEN_HAS_EXPIRED |
8 years ago |
Brightcells
|
d247cf9e73 |
Fix Bug: Group photo url error |
8 years ago |
Brightcells
|
d71363b74f |
Update requirements.txt |
8 years ago |
Brightcells
|
212e3994d1 |
MP verify file |
8 years ago |
Brightcells
|
d4ee48d797 |
Complete change to use django-we's urls.py |
8 years ago |
Brightcells
|
ac3bdf2a22 |
Move position of vars relative DOMAIN |
8 years ago |
Brightcells
|
aaaa4a26db |
Fix Bug: OSError: cannot write mode RGBA as JPEG |
8 years ago |
Brightcells
|
953ffaab3c |
Change to use django-uniapi |
8 years ago |
Brightcells
|
f3ba854b18 |
Rename uwsgi.bak as deploy.bak & Add pai2_supervisor.conf |
8 years ago |
Brightcells
|
51e42ffc44 |
Add mail conf to report error |
8 years ago |
Brightcells
|
6a0a5c4964 |
Remove unused setting |
8 years ago |
Brightcells
|
37c5365a18 |
Change to use django-we support WeChat OAuth2/Share relative api |
8 years ago |
Brightcells
|
75dbf7fdc8 |
New migration |
8 years ago |
Brightcells
|
32a7d9ffa0 |
Update wx relative |
8 years ago |
Brightcells
|
76e666637d |
Fix Bug: photo_id dump for PhotosInfo |
8 years ago |
Brightcells
|
7eaff4171b |
Update transaction_id/notify_msg for wx_order_query_api |
8 years ago |
Brightcells
|
a44bae18ee |
Update to use pywe-pay-notify to check pay notify success or fail |
8 years ago |
Brightcells
|
32061504ff |
Add some fields for Order |
8 years ago |
Brightcells
|
cef9424772 |
Update requirements.txt |
8 years ago |
Brightcells
|
047697ce68 |
Fix Bug: This request has been blocked; the content must be served over HTTPS. |
8 years ago |
Brightcells
|
5e11d315d4 |
Change jsapi signature params use pywe-jssdk |
8 years ago |
Brightcells
|
b2aa0f8533 |
Add new field unifiedorder_result |
8 years ago |
Brightcells
|
06b6949c6c |
Change pay relative from wechatpy to pywe-pay |
8 years ago |
Brightcells
|
d38cc6ceb2 |
Add multi openid for UserInfo & Change create order support miniapp |
8 years ago |
Brightcells
|
fd1aacd74e |
Fix Bug: delete page/ |
8 years ago |
Brightcells
|
34aac5d903 |
Move page relative urls from pai2/urls.py to page/urls.py |
8 years ago |
Brightcells
|
ac03876ce1 |
qiniu_file_url |
8 years ago |
Brightcells
|
e38c2defaf |
Upload photo to qiniu |
8 years ago |
Brightcells
|
41c58ec3f7 |
Add box api loginqr |
8 years ago |
Brightcells
|
dc5e856b19 |
New watermark image |
8 years ago |
Brightcells
|
e062007e50 |
New watermark image |
8 years ago |
Brightcells
|
3216c6752e |
New watermark image |
8 years ago |
Brightcells
|
157367103c |
Add WATERMARK_OR_NOT to make watermark invocation or not |
8 years ago |
Brightcells
|
a7b664b868 |
Fix Bug: Pillow cannot identify image which format is 8BPS |
8 years ago |
Brightcells
|
57206d9cbd |
Fix Bug: change default ext from 'jpeg' to '.jpeg' |
8 years ago |
Brightcells
|
b00a947884 |
Fix Bug: expired stamps for msel |
8 years ago |
Brightcells
|
8716990de9 |
Replace watermark image |
8 years ago |
Brightcells
|
e37b46a428 |
Fix Bug: thumbnail2 have watermark just for lensman |
8 years ago |
Brightcells
|
25cce5e3b1 |
Add qrcodejump verify file |
8 years ago |
Brightcells
|
136b6a5a0c |
Set target _blank for href |
8 years ago |
Brightcells
|
37aaf3480b |
Update PAI2_USER_DOWNLOAD_WX_URL & Add download href for s/gp detail |
8 years ago |
Brightcells
|
a12b9fd714 |
Fix Bug: water mark use error |
8 years ago |
Brightcells
|
680f424408 |
Update water mark |
8 years ago |
Brightcells
|
8483f90163 |
Return group info for api tgu_group_user_is_joined_api |
8 years ago |
Brightcells
|
f8f4c525c9 |
Add api tgu_group_user_is_joined_api |
8 years ago |
Brightcells
|
356254dea5 |
Fix typo error |
8 years ago |
Brightcells
|
feebb32686 |
Add pc website |
8 years ago |
Brightcells
|
ac34b5f4bf |
Update origin_expired_stamps |
8 years ago |
Brightcells
|
220efd7cc7 |
Fix Bug: some session group admin_id not exists |
8 years ago |
Brightcells
|
b23d241213 |
Update box program version |
8 years ago |
Brightcells
|
be2ad97693 |
Update 1000 => 200 |
8 years ago |
Brightcells
|
2071f6b34b |
Add ended or not check for api tgu_group_user_join_api |
8 years ago |
Brightcells
|
b70975ea7a |
Fix Bug: get_lensman_order_record |
8 years ago |
Brightcells
|
1fa63925f2 |
Separate comment_list_api from comment_submit_api |
8 years ago |
Brightcells
|
fc46e64646 |
Send msg to self when thumbup and comment |
8 years ago |
Brightcells
|
98fbe7f17e |
Fix Bug: photo_id error for Message Record |
8 years ago |
Brightcells
|
24dcbc8f3a |
Add srv_sha1 & proc_sha1 |
8 years ago |
Brightcells
|
afd07e5389 |
Add api box_program_version_api |
8 years ago |
Brightcells
|
16d5ad8aa8 |
Group name set error |
8 years ago |
Brightcells
|
2dee545a5e |
Add some list_filter for GroupUserInfo |
8 years ago |
Brightcells
|
9e4ac4fd3b |
Add admin_status for GroupUserInfo |
8 years ago |
Brightcells
|
ad503a9078 |
User should not see photo of group which groupuser is false at home |
8 years ago |
Brightcells
|
c9777aeb64 |
Fix Bug: tuple index out of range |
8 years ago |
Brightcells
|
14d5d63e3b |
Add nomark/origin price for GroupPhotoInfo |
8 years ago |
Brightcells
|
22b9954f45 |
Update settings |
8 years ago |
Brightcells
|
fd92583a9a |
Remove usage of records |
8 years ago |
Brightcells
|
4419cbf2d9 |
Fix Bug: upload fail when photo.name the same within 60 seconds |
8 years ago |
Brightcells
|
38817ceb17 |
Separate flyimg_list_api from flyimg_upload_api |
8 years ago |
Brightcells
|
ba2c19f73e |
Change rawsql pk to photo_id |
8 years ago |
Brightcells
|
b6ab791315 |
Change relative pk to photo_id |
8 years ago |
Brightcells
|
840173dc6b |
Filter photo_id use photo_id field in group_photo_detail |
8 years ago |
Brightcells
|
6dfe58d449 |
Add photo_id for list_display in GroupPhotoInfoAdmin |
8 years ago |
Brightcells
|
3c6e34823b |
Add photo_id for GroupPhotoInfo replaced pk |
8 years ago |
Brightcells
|
4547c709bf |
Add api get_server_time_api |
8 years ago |
Brightcells
|
e8cd9652b7 |
Add gather_screenshot for api tg_group_gather_start_api |
8 years ago |
Brightcells
|
1ecd4f276f |
Remove status code NO_XX_PERMISSION |
8 years ago |
Brightcells
|
505b2802c5 |
Change to fixed price |
8 years ago |
Brightcells
|
d824fbd441 |
Add photo_md5 for GroupPhotoInfo |
8 years ago |
Brightcells
|
6611483294 |
Fix Bug: Group Photo Not Empty |
8 years ago |
Brightcells
|
fd73524af1 |
Add api group_delete_api |
8 years ago |
Brightcells
|
f6bdf82918 |
Set group info after photo upload & Add group photo num in group info |
8 years ago |
Brightcells
|
95be9f6b91 |
Set group.PhotoCommentInfo ==> comment utf8mb4 |
8 years ago |
Brightcells
|
136346961f |
Fix Bug: UnboundLocalError at /s/join -- local variable 'group_photo' referenced before assignment |
8 years ago |
Brightcells
|
2eba3ed7f9 |
Add guest login for tourguide |
8 years ago |
Brightcells
|
7bcf74b5da |
ACTIVE_GROUP_NOT_FOUND |
8 years ago |
Brightcells
|
a62888a984 |
Fix Bug: _in => __in |
8 years ago |
Brightcells
|
5ebf9b60ba |
have_active_group |
8 years ago |
Brightcells
|
b27a2f135c |
Fix Bug: check whether have tour goup or not error |
8 years ago |
Brightcells
|
882848b93f |
Disable actions by actions=None |
8 years ago |
Brightcells
|
a3ae7a664c |
Update requirements.txt |
8 years ago |
Brightcells
|
6279e898c4 |
Override delete_selected by using django-admin==1.0.1 |
8 years ago |
Brightcells
|
84163f001e |
Fix Bug: file_path.url |
8 years ago |
Brightcells
|
c98fa4a4ed |
upload_file_url |
8 years ago |
Brightcells
|
a7b59d4389 |
Redis' set/setex/get => RedisExtensions' setjson/setexjson/getjson |
8 years ago |
Brightcells
|
4f87058e1c |
Add patch_api |
8 years ago |
Brightcells
|
f63cce369a |
Update requirements.txt |
8 years ago |
Brightcells
|
0e7b5eb1af |
Update order_by of group session photos |
8 years ago |
Brightcells
|
ba179547b1 |
Change to use pysnippets |
8 years ago |
Brightcells
|
356bc17051 |
isort |
8 years ago |
Brightcells
|
e7f3abdf56 |
Add admin relative api |
8 years ago |
Brightcells
|
22cbf27523 |
Recall tg_group_transfer_api |
8 years ago |
Brightcells
|
ae0ac478f3 |
set_tour_guide_own_group in tg_group_transfer_api |
8 years ago |
Brightcells
|
3b745fc07a |
Change to get_tour_guide_own_group when group_id not exists |
8 years ago |
Brightcells
|
bcb6e8c9ca |
Filter status=True |
8 years ago |
Brightcells
|
5ec8568418 |
Remove unused import lib |
8 years ago |
Brightcells
|
385f4c5143 |
from StatusCode import StatusCodeField |
8 years ago |
Brightcells
|
d06c19c1d5 |
Fix Bug: photo_watermark_path |
8 years ago |
Brightcells
|
962dfeef0a |
WECHAT_OAUTH2_RETRY_REDIRECT_URI |
8 years ago |
Brightcells
|
d4c2c2a8d7 |
Change to use pywe-response |
8 years ago |
Brightcells
|
c3e3681541 |
Create user in api get_userinfo_api for weapp |
8 years ago |
Brightcells
|
f183c19ae8 |
Limit return quota num for flyimg |
8 years ago |
Brightcells
|
4c6dbc149d |
return comments/thumbup/thumbups for api flyimg_detail_api |
8 years ago |
Brightcells
|
44ff9cb865 |
Add api flyimg_detail_api |
8 years ago |
Brightcells
|
e9e810dc97 |
Fix Bug: unionid => unionId |
8 years ago |
Brightcells
|
7049ae7e19 |
mini/userinfo |
8 years ago |
Brightcells
|
b52202a821 |
appId/appsecret |
8 years ago |
Brightcells
|
ac895ae2cd |
Add new api get_userinfo_api |
8 years ago |
Brightcells
|
2d6faa5600 |
Add WECHAT_OAUTH2_RETRY_REDIRECT_URI |
8 years ago |
Brightcells
|
96f741a814 |
Update upload_path |
8 years ago |
Brightcells
|
435363c27a |
file md5 error |
8 years ago |
Brightcells
|
90fd7187d8 |
file md5 |
8 years ago |
Brightcells
|
8d20a44c71 |
Remove 'Only Once Function' |
8 years ago |
Brightcells
|
ae70dce3ef |
file md5 |
8 years ago |
Brightcells
|
6e308e93b4 |
file md5 |
8 years ago |
Brightcells
|
8b64974ab3 |
Update requirements.txt |
8 years ago |
Brightcells
|
cdc55504fa |
Update requirements.txt |
8 years ago |
Brightcells
|
23072337d7 |
Update acquire_lock: change 'ex' to 'time' |
8 years ago |
Brightcells
|
dd0d652498 |
Change to use 'from paginator import pagination' |
8 years ago |
Brightcells
|
ec611ba992 |
Add forbidden duplicate upload photo |
8 years ago |
Brightcells
|
ac953b8a4c |
Update requirements.txt |
8 years ago |
Brightcells
|
048bb01c3e |
Update requirements.txt |
8 years ago |
Brightcells
|
019a4588d3 |
Fix Bug: lost 'from django.conf import settings' |
8 years ago |
Brightcells
|
88014f32b7 |
Remove unused vars in settings.py |
8 years ago |
Brightcells
|
42f466c0a5 |
Change to use django-ip to get client ip |
8 years ago |
Brightcells
|
3d1118760c |
Change to 'r.REDIS_EXPIRED_xx_xx' |
8 years ago |
Brightcells
|
246a9ff4b8 |
Change to 'from utils.redis.connect import r' |
8 years ago |
Brightcells
|
0a58248c81 |
Realize tour guide upload photo when auth in FE |
8 years ago |
Brightcells
|
0d046d557e |
Return order detail for api wx_order_detail_api |
8 years ago |
Brightcells
|
d19a7d5efb |
Check tour guide group whether ended |
8 years ago |
Brightcells
|
58845b4fd7 |
Fix Bug: get_geo_submit_flag result error |
8 years ago |
Brightcells
|
5d13ae0917 |
Fix Bug: get_geo_submit_flag result error |
8 years ago |
Brightcells
|
634de2864a |
Update requirements.txt |
8 years ago |
Brightcells
|
d31ffaa118 |
Update TODO |
8 years ago |
Brightcells
|
4f1aa7665d |
Add geo submit flag for api tgu_group_user_locations_api |
8 years ago |
Brightcells
|
a9527e0247 |
Remove geo submit flag for api tg_group_detail_api |
8 years ago |
Brightcells
|
cd287d6483 |
Add docstring for def set_geo_submit_flag |
8 years ago |
Brightcells
|
a6660a7ab6 |
Realize set geo submit flag for api tg_group_detail_api |
8 years ago |
Brightcells
|
4d51c3e342 |
Basic realize set geo submit flag for api tg_group_detail_api |
8 years ago |
Brightcells
|
9b8d6f0f09 |
Update comment |
8 years ago |
Brightcells
|
2d33b37a4b |
DONE TODO: Sum(relative_persons) for api tg_group_detail_api |
8 years ago |
Brightcells
|
19fb5e3b2d |
DONE TODO: Remove tourguide for api tg_group_detail_api |
8 years ago |
Brightcells
|
8fb9461cba |
to |
8 years ago |
Brightcells
|
90d377ee6e |
Add gather location |
8 years ago |
Brightcells
|
b62ab5aac1 |
Fix Bug: attentions and schedules update error |
8 years ago |
Brightcells
|
612465eec2 |
Logit body and res for api tg_group_update_api |
8 years ago |
Brightcells
|
4b68389146 |
Remove gather_info when gather_at expired for api pai2_tginfo_api |
8 years ago |
Brightcells
|
87ea86d2b1 |
Fix Bug: return not 200 cause duplicate upload |
8 years ago |
Brightcells
|
59def8d479 |
Add forbidden duplicate upload photo |
8 years ago |
Brightcells
|
214bbec976 |
Update requirements.txt & Change param ex_time to time |
8 years ago |
Brightcells
|
5d3befcd2b |
Update return format |
8 years ago |
Brightcells
|
564ff620d7 |
Add unique_together = (('group_id', 'user_id'),) for GroupUserInfo |
8 years ago |
Brightcells
|
95ee5c7b7a |
Add logit res for tgu_group_user_join_api |
8 years ago |
Brightcells
|
facd48308b |
Add some TODO |
8 years ago |
Brightcells
|
cdedcf94fd |
int |
8 years ago |
Brightcells
|
768af5a2ae |
Add list_filter for UserInfo |
8 years ago |
Brightcells
|
5a6012dac0 |
Fix Bug: should not login when not lensman/tourguide |
8 years ago |
Brightcells
|
9295b82620 |
Fix Bug: 'dict' object is not callable |
8 years ago |
Brightcells
|
d4f34707b9 |
Return user_info of tgu_group_user_locations_api the same as tg_group_detail_api |
8 years ago |
Brightcells
|
0ab056c3fd |
Change ip_addr to get_client_ip |
8 years ago |
Brightcells
|
867e9f6d70 |
Fix Bug: tc.utc_string_to_utc_datetime return None |
8 years ago |
Brightcells
|
5c37fe6af6 |
Fix Bug: User Has Not Join Group |
8 years ago |
Brightcells
|
a0f3a4d547 |
Fix Bug: invalid literal for int() with base 10: '' |
8 years ago |
Brightcells
|
3e0483e4b9 |
Fix Bug: invalid literal for int() with base 10: '' |
8 years ago |
Brightcells
|
272f181c50 |
Makemigrations |
8 years ago |
Brightcells
|
25b296f848 |
Add attentions/schedules for GroupInfo |
8 years ago |
Brightcells
|
4bc60b545c |
Call georem in tgu_group_user_remove_api |
8 years ago |
Brightcells
|
1fac624f0e |
Add paage tgu_group_detail |
8 years ago |
Brightcells
|
ead8d009b7 |
Add src PAIAI_TOURGUIDE |
8 years ago |
Brightcells
|
633c2598ed |
Update TODO.md - Add Remove Unused Api |
8 years ago |
Brightcells
|
2b612334ac |
Add page tgu_group_user_detail |
8 years ago |
Brightcells
|
6e5652151a |
Add api tgu_group_user_remove_api |
8 years ago |
Brightcells
|
2b58707151 |
Remove unused imported rkeys |
8 years ago |
Brightcells
|
96e95b07af |
Change def name in groupuser_views |
8 years ago |
Brightcells
|
354c1d81a4 |
Remove unused group_pass_api/group_refuse_api |
8 years ago |
Brightcells
|
0ce7c01088 |
Move group user relative from group/views.py to group/groupuser_views.py |
8 years ago |
Brightcells
|
897377a01f |
Add default geo location (0, 0) when tgu join |
8 years ago |
Brightcells
|
c96e9e8a02 |
Remove unnecessary u |
8 years ago |
Brightcells
|
b065bf7b3a |
Remove unnecessary u |
8 years ago |
Brightcells
|
a229908ca3 |
Return user_info for api tgu_group_user_locations_api |
8 years ago |
Brightcells
|
88f0697a89 |
Add authority field for GroupUserInfo |
8 years ago |
Brightcells
|
7d92e79eb9 |
Remove param group_id from tg_group_token_api/tg_group_transfer_api |
8 years ago |
Brightcells
|
f818f4127f |
Docstring simplify |
8 years ago |
Brightcells
|
6611c5f373 |
Add pai2_tginfo_api |
8 years ago |
Brightcells
|
70f5faad11 |
Add tg_group_token_api/tg_group_transfer_api |
8 years ago |
Brightcells
|
034acddb68 |
Add total_persons for GroupInfo |
8 years ago |
Brightcells
|
dd05cee84f |
ms=False |
8 years ago |
Brightcells
|
ec742cc719 |
Add current_time for TOUR_GUIDE_GROUP_USER_GEO_LIST |
8 years ago |
Brightcells
|
3719743219 |
Add params name/phone/relative_person/remark |
8 years ago |
Brightcells
|
0df90d650b |
Add TOUR_GUIDE_GROUP_CUR_GATHER_INFO |
8 years ago |
Brightcells
|
3baf694bff |
Should only update when started_at and ended_at is'nt null |
8 years ago |
Brightcells
|
af76a40fe7 |
Fix Bug: TypeError: replace() takes no keyword arguments |
8 years ago |
Brightcells
|
ad69866b26 |
Add tour guide's name and phone in GroupInfo |
8 years ago |
Brightcells
|
f724e0f9c0 |
Add tour guide apis |
8 years ago |
Brightcells
|
8a213207ea |
Add tour guide oauth |
8 years ago |
Brightcells
|
2482ef26b8 |
Update requirements.txt - install redis from Github |
8 years ago |
Brightcells
|
aae733e82b |
Update requirements.txt |
8 years ago |
Brightcells
|
498de86432 |
Update requirements.txt |
8 years ago |
Brightcells
|
fc07c98146 |
Update requirements.txt |
8 years ago |
Brightcells
|
7cc3030f61 |
Update requirements.txt |
8 years ago |
Brightcells
|
5c03fde009 |
Update requirements.txt |
8 years ago |
Brightcells
|
6bd393cf87 |
Update requirements.txt |
8 years ago |
Brightcells
|
aac3532bd8 |
kkconst => StatusCode |
8 years ago |
Brightcells
|
fbf7b8bfcd |
Update requirements.txt |
8 years ago |
Brightcells
|
3672ed9c5f |
Update requirements.txt |
8 years ago |
Brightcells
|
0c17cbe911 |
Update requirements.txt |
8 years ago |
Brightcells
|
0b25b2d7b4 |
Update requirements.txt |
8 years ago |
Brightcells
|
6d22a1c0d3 |
UnicodeEncodeError: 'ascii' codec can't encode character u'\uff12' in position 6: ordinal not in range(128) |
8 years ago |
Brightcells
|
e440bc76ee |
Change to use pywe-oauth |
8 years ago |
Brightcells
|
ae3932e9e6 |
Update requirements.txt |
8 years ago |
Brightcells
|
f016f89541 |
Update kwargs for response in response_utils.py |
8 years ago |
Brightcells
|
443ec910e9 |
Update response in response_utils |
8 years ago |
Brightcells
|
7111961986 |
Return session_id in api pai2_home_api |
8 years ago |
Brightcells
|
347e920d39 |
Return session_id grouped photos in group_join_api & Return session_id in photo detail |
8 years ago |
Brightcells
|
7dd4575a8c |
Add select_for_update for UserInfo/OrderInfo/GroupPhotoOrderInfo |
8 years ago |
Brightcells
|
c329660c26 |
Fix: const variable require all letters capital |
8 years ago |
Brightcells
|
36e351b13d |
Update errno |
8 years ago |
Brightcells
|
e47798ebe0 |
Return group_photos group by session_id |
8 years ago |
Brightcells
|
8e7c94e2ef |
Add parameter group_id for lensman_photo_upload_api |
8 years ago |
Brightcells
|
9fd8002931 |
Update requirements.txt |
8 years ago |
khb
|
3e9d466d86 |
Update requirements.txt |
8 years ago |
Brightcells
|
f40ea0a414 |
Fix call session_join_api after group_quit_api |
8 years ago |
Brightcells
|
e06dc10006 |
Make join session group by scan group qrcode fetch group photos initio |
8 years ago |
Brightcells
|
c7abce172a |
Rename field name |
8 years ago |
Brightcells
|
da19301800 |
Update set_brief_info after origin photo upload |
8 years ago |
Brightcells
|
84e77dd54d |
Fix duplicate delete for api /l/origin_upload |
8 years ago |
Brightcells
|
e249360c0c |
Add freeze_balance for lensman/user |
8 years ago |
Brightcells
|
c2b994efc2 |
Update requirements.txt |
8 years ago |
Brightcells
|
d79857ed0e |
lensman balance decr when origin deleted & update redis |
8 years ago |
Brightcells
|
e4c95c78c7 |
tstrip |
8 years ago |
Brightcells
|
dd00e3b1a9 |
add api online_api |
8 years ago |
Brightcells
|
7f27864ab9 |
update requirements.txt |
8 years ago |
Brightcells
|
4a8f8ff2b8 |
update requirements.txt |
8 years ago |
Brightcells
|
b7b3dcffc3 |
restructure haggle_price |
8 years ago |
Brightcells
|
972ab1e3b8 |
add StreamHandler |
8 years ago |
Brightcells
|
5b678f8553 |
fix bug: price be negative |
8 years ago |
Brightcells
|
4ff159f583 |
update error code |
8 years ago |
Brightcells
|
ac85066b8b |
set status_code default 200 |
8 years ago |
Brightcells
|
c761b9cf4c |
add page price |
8 years ago |
Brightcells
|
ba8098eaae |
fix bug: get_group_users_info error when not in redis |
8 years ago |
Brightcells
|
9b5e3da7fb |
fix group user quit bug |
8 years ago |
Brightcells
|
994db88de2 |
return price_fixed in lensman_brief_api |
8 years ago |
Brightcells
|
23f00aedae |
fix bug: ValueError: invalid literal for int() with base 10: 'origin' |
8 years ago |
Brightcells
|
07da1c3383 |
add order_id for lensman_origin_photo_upload_api & check multi paid |
8 years ago |
Brightcells
|
7691894d4b |
filter pay_status=OrderInfo.PAID for api lensman_origin_wanted_api |
8 years ago |
Brightcells
|
684b876a38 |
price_fixed store in redis & update api lensman_photo_price |
8 years ago |
Brightcells
|
4fdd237863 |
add api price_fix |
8 years ago |
Brightcells
|
a45976ca99 |
update brief returns |
8 years ago |
Brightcells
|
1ee8b5e061 |
add group_photo_info for lensdata |
8 years ago |
Brightcells
|
4ff27acb27 |
@property |
8 years ago |
Brightcells
|
27d3ec8fb1 |
add src for LatestAppInfo/SplashInfo |
8 years ago |
Brightcells
|
c12df969e1 |
add origin_expired_stamps |
8 years ago |
Brightcells
|
b65f84e502 |
Duplicate entry |
8 years ago |
Brightcells
|
232b73e861 |
lensman upload photo in lensman_app should not see in user_app |
9 years ago |
Brightcells
|
6199c8f7ad |
add api lensman_origin_wanted_api/lensman_origin_photo_upload_api |
9 years ago |
Brightcells
|
ac69b15c9b |
update requirements.txt |
9 years ago |
Brightcells
|
963dca9588 |
update requirements.txt |
9 years ago |
Brightcells
|
b6b46b302b |
update requirements.txt |
9 years ago |
Brightcells
|
b68c637678 |
update redis-extensions |
9 years ago |
Brightcells
|
561491e543 |
fix bug: AttributeError: 'module' object has no attribute 'ConnectionPool' |
9 years ago |
Brightcells
|
ae502c940d |
fix bug: AttributeError: 'module' object has no attribute 'StrictRedis' |
9 years ago |
Brightcells
|
48995aae69 |
update redis_extensions —— class StrictRedisExtensions(StrictRedis) |
9 years ago |
Brightcells
|
05faf3c5db |
update lensman_brief_api |
9 years ago |
Brightcells
|
8c384ff52e |
remove to_lid |
9 years ago |
Brightcells
|
8468d9f9c5 |
remove to_lid |
9 years ago |
Brightcells
|
f7b627af9b |
update lensman_brief_api |
9 years ago |
Brightcells
|
21b4a5403a |
add api lensman_brief_api |
9 years ago |
Brightcells
|
ee7388cd15 |
add src for SystemMessageInfo |
9 years ago |
Brightcells
|
49f3749ebd |
remove param current_id and returns current_id/photos for lensman_photo_upload_api |
9 years ago |
Brightcells
|
2b26ecad19 |
update requirements.txt |
9 years ago |
Brightcells
|
f93199e23c |
update requirements.txt |
9 years ago |
Brightcells
|
9ab6aee69e |
update requirements.txt |
9 years ago |
Brightcells
|
08be7a1f9f |
change to use RedisListHandler |
9 years ago |
Brightcells
|
d73fdb7cd2 |
async/multi_pop uuids |
9 years ago |
Brightcells
|
744ff384c2 |
update wx share link |
9 years ago |
Brightcells
|
05e046c8ca |
fix bug: errcode=48001 when scope=snsapi_base |
9 years ago |
Brightcells
|
3b39460e59 |
update wechat relative |
9 years ago |
Brightcells
|
48c5514e05 |
update jswe.js |
9 years ago |
Brightcells
|
c81acc73e4 |
update DATABASES comment |
9 years ago |
Brightcells
|
32b6dfd487 |
add redis_conf |
9 years ago |
Brightcells
|
3fe58578d8 |
update requirements.txt |
9 years ago |
Brightcells
|
7dee2f9449 |
update requirements.txt |
9 years ago |
Brightcells
|
2eb44593ee |
fix bug: logs lost using ConcurrentRotatingFileHandler |
9 years ago |
Brightcells
|
c7071ae7f1 |
wx_uid to openid |
9 years ago |
Brightcells
|
9b0b9c0587 |
fix bug: int error |
9 years ago |
Brightcells
|
a71f3c569b |
add src for feedback |
9 years ago |
Brightcells
|
f07f4fc893 |
JsonResponse to response |
9 years ago |
Brightcells
|
72890dc75c |
user to user_id |
9 years ago |
Brightcells
|
7161824a44 |
session to session_id |
9 years ago |
Brightcells
|
57e79f38df |
fix bug: Duplicate entry 'xxx' for key 'user_id' |
9 years ago |
Brightcells
|
3af14d4a96 |
fix bug: Duplicate entry 'xxx' for key 'account_userinfo_unionid_3c1f5d4e4e1b84a9_uniq |
9 years ago |
Brightcells
|
6626af8a8d |
add api lensman_wx_authorize_api |
9 years ago |
Brightcells
|
30d24179d9 |
add refused relative |
9 years ago |
Brightcells
|
6fb6025912 |
hideOptionMenu in wx & display status & forbidden modify after Actived |
9 years ago |
Brightcells
|
08f87a7634 |
add wechat diy share for lensman_oauth |
9 years ago |
Brightcells
|
77023892d9 |
add wechat diy share for lensman_oauth |
9 years ago |
Brightcells
|
6faf4d4d8c |
fix bug: WECHAT_REDIRECT_URI not exists |
9 years ago |
Brightcells
|
d0affd4b01 |
add lensman_oauth page |
9 years ago |
Brightcells
|
7bd5e500b8 |
add hiredis package & upgrade some package |
9 years ago |
Brightcells
|
40165198cd |
change to use redis.ConnectionPool |
9 years ago |
Brightcells
|
6102143d8e |
reduce balance |
9 years ago |
Brightcells
|
92da943e9e |
check wx_uid for api wx_balance_withdraw_api |
9 years ago |
Brightcells
|
fa2729a4e1 |
add api wx_balance_withdraw_api |
9 years ago |
Brightcells
|
d3fd6adf70 |
add api lensman_login_api/lensman_upload_photo_api |
9 years ago |
Brightcells
|
6d6c8485ce |
bind LensmanInfo and UserInfo |
9 years ago |
Brightcells
|
b2cf473db5 |
optimize pagination |
9 years ago |
Brightcells
|
54dd8f095f |
update requirements |
9 years ago |
Brightcells
|
fa36c26ce4 |
extend param to_uid for comment_submit_api |
9 years ago |
Brightcells
|
abc5fdce05 |
fix bug multi message for photo owner |
9 years ago |
Brightcells
|
3c11ca7b16 |
fix bug multi message for photo owner |
9 years ago |
Brightcells
|
9618c6d3bd |
add var for jswe.js |
9 years ago |
Brightcells
|
09d7f479cb |
fix bug import GROUP_PHOTO_WATCHER_SET |
9 years ago |
Brightcells
|
2a7e6d170d |
sadd user_id into GROUP_PHOTO_WATCHER_SET |
9 years ago |
Brightcells
|
9ae03cd4df |
refresh GROUP_PHOTO_COMMENT_LIST/GROUP_PHOTO_THUMB_UP_LIST |
9 years ago |
Brightcells
|
86aa86bbba |
add GROUP_PHOTO_WATCHER_SET |
9 years ago |
Brightcells
|
47eb096687 |
fix bug add cls=DjangoJSONEncoder for json.dumps |
9 years ago |
Brightcells
|
e920b279d1 |
send message for all watched users |
9 years ago |
Brightcells
|
1a0427282e |
change to auto_response of django-json-response |
9 years ago |
Brightcells
|
29185bf2d4 |
reback to use raw sql instead of records |
9 years ago |
Brightcells
|
a02504cc21 |
Fix Bug: created_at format error |
9 years ago |
Brightcells
|
148da098dd |
add wexin diy share for session_detail |
9 years ago |
Brightcells
|
5a00022a72 |
close debug |
9 years ago |
Brightcells
|
4f1aa43391 |
nonceStr |
9 years ago |
Brightcells
|
f3edf9f11f |
add wexin diy share |
9 years ago |
Brightcells
|
8f43551640 |
add api wx_jsapi_signature_api |
9 years ago |
Brightcells
|
b5857bab0c |
dialect[+driver]://user:password@host/dbname[?key=value..] |
9 years ago |
Brightcells
|
d50a6c1bae |
update django-detect in requirements.txt |
9 years ago |
Brightcells
|
3253541b10 |
change to exec raw sql from django.db.connection to records |
9 years ago |
Brightcells
|
8263625d9c |
new website |
9 years ago |
Brightcells
|
8d6858fb00 |
adjust website content |
9 years ago |
Brightcells
|
80a3496489 |
fix user join group by session after remove |
9 years ago |
Brightcells
|
e4567ea2de |
fix call set_group_users_info after group user removed |
9 years ago |
Brightcells
|
1e620ebab6 |
*_download.html |
9 years ago |
Brightcells
|
2f29afecbd |
modify version in operation |
9 years ago |
Brightcells
|
65ab52f95a |
spell error |
9 years ago |
Brightcells
|
535ac34ee1 |
add api download_api |
9 years ago |
Brightcells
|
af2b3f483f |
change download.html to be generated from download.tmpl.html |
9 years ago |
Brightcells
|
696c8d2e2b |
adjust download section of photo_detail/session_detail |
9 years ago |
Brightcells
|
9671c0e989 |
wrongly written or mispronounced characters |
9 years ago |
Brightcells
|
5a0b6447ca |
change RotatingFileHandler to TimedRotatingFileHandler to support rotation of disk log files at certain timed intervals. |
9 years ago |
Brightcells
|
cce055cdf4 |
change FileHandler to RotatingFileHandler to to supports rotation of disk log files. |
9 years ago |
Brightcells
|
51959f199b |
remove overflow: hidden; |
9 years ago |
Brightcells
|
88294e7647 |
change title of photo detail |
9 years ago |
Brightcells
|
4b7cfa2426 |
adjust photo detail page |
9 years ago |
Brightcells
|
f679be700a |
adjust title of user_agreement |
9 years ago |
Brightcells
|
a80a911457 |
change time.time() to int(time.time()) in upload_path |
9 years ago |
Brightcells
|
771845b52e |
add param pfrom for statistic_thumbnail_size |
9 years ago |
Brightcells
|
5c9e21b29b |
add Only Once Function statistic_thumbnail_size to statistic thumbnail size |
9 years ago |
Brightcells
|
0339d3dce4 |
Fix Bug: set_group_photo_data should after group_photo.save() |
9 years ago |
Brightcells
|
bbc43c96ec |
add photo_share_url |
9 years ago |
Brightcells
|
398957153c |
add pk in user's nickname |
9 years ago |
Brightcells
|
85eb6c6f2d |
Fix Bug: nickname for GroupPhotoInfo error |
9 years ago |
Brightcells
|
afcdf74a49 |
add api group_data_api |
9 years ago |
Brightcells
|
e1b319d9a4 |
'charset': 'utf8mb4' |
9 years ago |
Brightcells
|
a8d890cb70 |
filter order by pay_status |
9 years ago |
Brightcells
|
03304ad48a |
add api guest_status_api & modify api guest_login_api |
9 years ago |
Brightcells
|
c209e83d29 |
add delete_guest_entrance_control |
9 years ago |
Brightcells
|
63eaee0951 |
modify guest_login_api |
9 years ago |
Brightcells
|
70689e758c |
add lensman and user's balance |
9 years ago |
Brightcells
|
269576f8b9 |
add guest user |
9 years ago |
Brightcells
|
818e5ae2cd |
adjust page |
9 years ago |
Brightcells
|
10fdf9ba1f |
adjust page |
9 years ago |
Brightcells
|
805b221885 |
add content for contact_us.html |
9 years ago |
Brightcells
|
60b2bc0c09 |
add content for user_agreement.html |
9 years ago |
Brightcells
|
95c1d32792 |
put isort and pep8 in check.sh |
9 years ago |
Brightcells
|
fabef63211 |
set line_length=200 for isort |
9 years ago |
Brightcells
|
084a5eece8 |
order ruler: date/self/7*thumbup_num+3*comment_num/id |
9 years ago |
Brightcells
|
81e5a71d7f |
GroupUserInfo order by id desc in group_list_api |
9 years ago |
Brightcells
|
f72ccb1875 |
isort import |
9 years ago |
Brightcells
|
de60d59c26 |
order ruler: date/self/thumbup_num/id |
9 years ago |
Brightcells
|
f684a1d89c |
order ruler: date/self/thumbup_num |
9 years ago |
Brightcells
|
5bf645c33d |
change order ruler for paiai home, user_id self upload first |
9 years ago |
Brightcells
|
414e2cb1b0 |
change some {number} to {} |
9 years ago |
Brightcells
|
d1ef8ec9e9 |
download page |
9 years ago |
Brightcells
|
ee258aeb8b |
GroupPhotoOrderInfo value set error |
9 years ago |
Brightcells
|
b7a21719c7 |
change message_list_api to return unread message num |
9 years ago |
Brightcells
|
bc49c77a94 |
adjust settings of redis |
9 years ago |
Brightcells
|
6f4b4a7f5c |
unify fee(return and params) to fen |
9 years ago |
Brightcells
|
102152ca4a |
add api lensman_photo_bought & modify api wx_order_create_api and adjust return field |
9 years ago |
Brightcells
|
cb9a21132f |
modify lesman_photo_price api |
9 years ago |
Brightcells
|
8aeca53563 |
record unionid for wx_authorize user |
9 years ago |
Brightcells
|
50ebe3bfcd |
add company name in website |
9 years ago |
Brightcells
|
efaa518b96 |
add Only Once Function refresh_thumbnail |
9 years ago |
Brightcells
|
d0f8b5ce5c |
larger image file 403 forbidden |
9 years ago |
Brightcells
|
d64b3c216b |
add and return photo_thumbnail2 relative |
9 years ago |
Brightcells
|
a0dfcb6f16 |
Alter field pay_status on orderinfo |
9 years ago |
Brightcells
|
98f968c53c |
add api lesman_photo_price/wx_order_list_api/wx_order_detail_api |
9 years ago |
Brightcells
|
0f425ae151 |
add api wx_order_query_api |
9 years ago |
Brightcells
|
097426009e |
Fix Bug: sign error when trade_type == 'APP' |
9 years ago |
Brightcells
|
0e1b1fb160 |
adjust WECHAT in settings.py & use django-logit |
9 years ago |
Brightcells
|
fab8ef6c5e |
add term of service page |
9 years ago |
Brightcells
|
03c3611ad0 |
improve image clarity |
9 years ago |
Brightcells
|
3114315824 |
add pc official website |
9 years ago |
Brightcells
|
5695243a9a |
Fix Bug: creator of group not in GROUP_USERS_PASSED_SET |
9 years ago |
Brightcells
|
ed5ee99a08 |
Fix Bug: get_group_info wrong use as get_group_users_info |
9 years ago |
Brightcells
|
5301e7237e |
unify join group logic |
9 years ago |
Brightcells
|
02373a6dff |
return complete group_photo_info for api message_list_api/message_type_list_api |
9 years ago |
Brightcells
|
aa78f33cca |
Fix Bug: group admin request group_join_api |
9 years ago |
Brightcells
|
349e60836f |
Fix Bug: set() takes at least 3 arguments (2 given) & change r.set to r.setex |
9 years ago |
Brightcells
|
15772543dd |
add return field thumbup for api flyimg_upload_api/flyimg_list_api/session_detail_api/pai2_home_api |
9 years ago |
Brightcells
|
f0113f2b5c |
Fix Bug: get group_info/group_users when not created |
9 years ago |
Brightcells
|
a53a8a8312 |
modify session_detail_api to deal with group/group_user/group_photo |
9 years ago |
Brightcells
|
ec142555be |
return group_from for pai2_home_api |
9 years ago |
Brightcells
|
25a5b5e8ae |
reconstruct retrieve_redis_data |
9 years ago |
Brightcells
|
dbea356558 |
add photo_from field for GroupPhotoInfo and return photo_from for some api |
9 years ago |
Brightcells
|
a1bd97d641 |
change all param to cmp to string true |
9 years ago |
Brightcells
|
165424743a |
modify message relative apis |
9 years ago |
Brightcells
|
3586c96fbb |
Fix Bug: duplicate thumbup should not increase thumbup_num |
9 years ago |
Brightcells
|
017d878faa |
Fix Bug: duplicate thumbup should not increase thumbup_num |
9 years ago |
Brightcells
|
b3b9639df8 |
add comment_num/thumbup_num in message_list_api/message_type_list_api |
9 years ago |
Brightcells
|
904fabf2d0 |
modify join policy in api group_join_api |
9 years ago |
Brightcells
|
ff0a63215f |
Fix Bug: redis .replace(microsecond=0) |
9 years ago |
Brightcells
|
8493e9949f |
add pagination for group_list_api |
9 years ago |
Brightcells
|
537bd9bd41 |
add api group_quit_api |
9 years ago |
Brightcells
|
61590ecb17 |
Fix Bug: admin remove itself from a group |
9 years ago |
Brightcells
|
ebaa78d5ad |
add api feedback_api |
9 years ago |
Brightcells
|
c8d93d6339 |
add api message_delete_api/message_type_delete_api |
9 years ago |
Brightcells
|
8b7c49ddb9 |
add app to add page user_agreement/contact_us |
9 years ago |
Brightcells
|
f5a460140f |
Fix Bug: get flag of whether user has thumbup or not error |
9 years ago |
Brightcells
|
454f8cd8ec |
change some info store in redis & remove some unnecessary params check & add some return for some api |
9 years ago |
Brightcells
|
78e4e238a7 |
GroupUserInfo.user_status == GroupUserInfo.DELETED & error status code |
9 years ago |
Brightcells
|
90515dc878 |
update comment_num and thumbup_num in api comment_submit_api/thumbup_submit_api/thumbup_cancel_api |
9 years ago |
Brightcells
|
1bc6cf2a73 |
add update group_avatar |
9 years ago |
Brightcells
|
f7d159714f |
Fix Bug: PAI2_HOME_API error |
9 years ago |
Brightcells
|
17a826bc1b |
add status filter for GroupPhotoInfo query |
9 years ago |
Brightcells
|
deeabd58a2 |
change 'nickname=nickname or user.final_nickname' in api flyimg_upload_api |
9 years ago |
Brightcells
|
5a05032918 |
modify order ruler to by DATE(created_at) desc |
9 years ago |
Brightcells
|
88049b12db |
store/return more field for photo |
9 years ago |
Brightcells
|
ca727b0362 |
store/return w/h for photo |
9 years ago |
Brightcells
|
f6a88c632b |
add group_default_avatar field for GroupInfo |
9 years ago |
Brightcells
|
e50a206d29 |
add pagination for pai2_home_api |
9 years ago |
Brightcells
|
da2a81fff1 |
add api pai2_home |
9 years ago |
Brightcells
|
7d85bed0b0 |
move errno_utils.py/response_utils.py into error file |
9 years ago |
Brightcells
|
11c6982627 |
return user_id for some api |
9 years ago |
Brightcells
|
0110c29272 |
rename api name |
9 years ago |
Brightcells
|
7a17d0fb90 |
add api wxpay & add redis relative |
9 years ago |
Brightcells
|
62aff0cb2f |
move status code into errno_utils.py to unified management |
9 years ago |
Brightcells
|
a121b75ff2 |
add db_index=True for status field |
9 years ago |
Brightcells
|
b5be31c6cd |
Fix Bug: Field name photo_path is not valid for model PhotosInfo |
9 years ago |
Brightcells
|
0786f22bad |
order_by('-pk') replace of order_by('-created_at') |
9 years ago |
Brightcells
|
62ef679981 |
add ret photo_url and photo_thumbnail_url |
9 years ago |
Brightcells
|
d3088e1fec |
add ret msg_type_desc |
9 years ago |
Brightcells
|
464c31b794 |
support POST method for message relative api |
9 years ago |
Brightcells
|
8f83bd22be |
add param user_id for msg relative api |
9 years ago |
Brightcells
|
928a51477c |
'UserMessageInfo' object has no attribute 'title' |
9 years ago |
Brightcells
|
8f14561134 |
UserMessageInfo in admin.py |
9 years ago |
Brightcells
|
89094aa77b |
if user exists, update user info, in api wx_authorize_api |
9 years ago |
Brightcells
|
ba7bc03f03 |
adjust sex value |
9 years ago |
Brightcells
|
30daca135b |
add api message_list_api/message_type_list_api/message_read_api |
9 years ago |
Brightcells
|
03561aaa5f |
modify api comment_submit_api/comment_list_api |
9 years ago |
Brightcells
|
c72d89f6e5 |
add api comment_submit_api/comment_list_api/thumbup_submit_api/thumbup_list_api/thumbup_cancel_api |
9 years ago |
Brightcells
|
df1df69fe3 |
add api upgrade/splash |
9 years ago |
Brightcells
|
3253626936 |
change DOMAIN and IMG_DOMAIN to pai.ai |
9 years ago |
Brightcells
|
e5721d434c |
add URL_CONFIG for domain pai.ai |
9 years ago |
Brightcells
|
2b831a139f |
CONN_MAX_AGE & cached.Loader |
9 years ago |
Brightcells
|
2fb52216da |
Fix Bug: wx authorize doesn't store wx_uid |
9 years ago |
Brightcells
|
48d2e93b70 |
return nickname for userinfo data |
9 years ago |
Brightcells
|
814ed79bfc |
add api group_unlock_api |
9 years ago |
Brightcells
|
1c25788dbf |
add group_name for group_create_api |
9 years ago |
Brightcells
|
8b5ea74192 |
add location /fly |
9 years ago |
Brightcells
|
4afdb94e20 |
add avatar for GroupUserInfo |
9 years ago |
Brightcells
|
5ef425fee7 |
add api wx_authorize_api |
9 years ago |
Brightcells
|
d3798a39f1 |
update session_detail_api |
9 years ago |
Brightcells
|
ce10db91f9 |
thumbnail_utils make_thumb |
9 years ago |
Brightcells
|
f587f0a48f |
user can just see photo after he joined the group & zh_Hans replace zh_CN in settings.py |
9 years ago |
Brightcells
|
42df840f43 |
return current_id for api flyimg_upload/flyimg_list |
9 years ago |
Brightcells
|
9077a53317 |
return next_id for api flyimg_upload/flyimg_list |
9 years ago |
Brightcells
|
f58bde298b |
add api flyimg_upload/flyimg_list |
9 years ago |
Brightcells
|
7fd74ed1e4 |
add group_join_api direct pass |
9 years ago |
Brightcells
|
7467a3e68a |
add api group_update/group_remove |
9 years ago |
Brightcells
|
7e305483ab |
add api group_detail/group_lock/group_pass/group_refuse |
9 years ago |
Brightcells
|
e184e7dd5b |
add api group_create/group_join |
9 years ago |
Brightcells
|
6e77deb909 |
https://pypi.python.org/pypi/django-curtail-uuid |
9 years ago |
Brightcells
|
e7d461ade5 |
upload photo with photo_id |
9 years ago |
Brightcells
|
ca16dc830e |
alias .img.xfoto.com.cn/photo |
9 years ago |
Brightcells
|
7ddb9f0b5e |
change to use img.xfoto.com.cn as photo domain |
9 years ago |
Brightcells
|
3454610bb7 |
add api of user signup/login |
9 years ago |
Brightcells
|
00e8234de9 |
add api photo_standard_api |
9 years ago |
Brightcells
|
e0ba30f506 |
add api session_detail_api |
9 years ago |
Brightcells
|
4a8b4f8819 |
add watermark |
9 years ago |
Brightcells
|
b9c2997666 |
change server name .api.xfoto.com.cn before .xfoto.com.cn |
9 years ago |
Brightcells
|
ca8b65a77e |
nginx conf & requirements |
9 years ago |
Brightcells
|
434468279f |
add api of lesman login & update other api |
9 years ago |
Brightcells
|
52ce35cbfc |
add api uuid_init/uuid |
9 years ago |
Brightcells
|
4defb80fdc |
gogs first init |
9 years ago |
|
|
@@ -1,13 +1,13 @@
|
1
|
1
|
# -*- coding: utf-8 -*-
|
2
|
2
|
|
3
|
3
|
from django.contrib import admin
|
4
|
|
-from django_admin import ChangeOnlyModelAdmin, ReadOnlyModelAdmin, AdvancedExportExcelModelAdmin
|
|
4
|
+from django_admin import ChangeOnlyModelAdmin, ReadOnlyModelAdmin
|
5
|
5
|
|
6
|
6
|
from account.models import UserInfo
|
7
|
7
|
from mch.models import ConsumeInfoSubmitLogInfo
|
8
|
8
|
|
9
|
9
|
|
10
|
|
-class UserInfoAdmin(AdvancedExportExcelModelAdmin, admin.ModelAdmin):
|
|
10
|
+class UserInfoAdmin(admin.ModelAdmin):
|
11
|
11
|
list_display = ('brand_id', 'user_id', 'nickname', 'phone', 'unionid', 'openid', 'openid_miniapp', 'location', 'balance', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
|
12
|
12
|
list_filter = ('brand_id', 'test_user', 'sex', 'user_status', 'status')
|
13
|
13
|
readonly_fields = ('user_id', )
|
|
|
@@ -40,11 +40,11 @@ class Command(CompatibilityBaseCommand):
|
40
|
40
|
|
41
|
41
|
with transaction.atomic():
|
42
|
42
|
try:
|
43
|
|
- gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0)), verify=False).json()
|
|
43
|
+ gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0))).json()
|
44
|
44
|
except Exception as e:
|
45
|
45
|
logger.info(e.message)
|
46
|
46
|
|
47
|
|
- zh1 = gisinfo.get('result', {}).get('address_component', {}).get('province', '')
|
|
47
|
+ zh1 = gisinfo.get('data', {}).get('zh1', '')
|
48
|
48
|
|
49
|
49
|
province_code = ProvinceModelMixin.PROVINCE_NAME_CODE_DICT.get(zh1) if zh1 else ''
|
50
|
50
|
|
|
|
@@ -415,7 +415,7 @@ KODO_DEFAULT_BRAND_NAME = ''
|
415
|
415
|
KODO_DEFAULT_BRAND_DOMAIN = ''
|
416
|
416
|
|
417
|
417
|
# 经纬度
|
418
|
|
-GIS_2_ADMINISTRATIVE_DIVISION = 'https://apis.map.qq.com/ws/geocoder/v1/?key=4FNBZ-TIIKW-MWJRQ-RHZJN-W6F7Q-BFBKX&location={0},{1}'
|
|
418
|
+GIS_2_ADMINISTRATIVE_DIVISION = 'http://116.196.105.215:1234/gis?auth_user=freevip&latitude={0}&longitude={1}'
|
419
|
419
|
PHONE_2_ADMINISTRATIVE_DIVISION = 'https://www.baifubao.com/callback?cmd=1059&callback=phone&phone={0}'
|
420
|
420
|
|
421
|
421
|
TESTING_SNS = ['000000']
|