|
80
|
|
- set_latest_app(obj.src)
|
|
81
|
|
-
|
|
82
|
|
-
|
|
83
|
|
-class PatchInfoAdmin(admin.ModelAdmin):
|
|
84
|
|
- list_display = ('platform', 'version', 'patch', 'src', 'status', 'created_at', 'updated_at')
|
|
85
|
|
- list_filter = ('platform', 'src', 'status')
|
|
86
|
|
-
|
|
87
|
|
- def save_model(self, request, obj, form, change):
|
|
88
|
|
- obj.version = strip(obj.version)
|
|
89
|
|
- obj.save()
|
|
90
|
|
-
|
|
91
|
|
- # 设置 APP 补丁信息
|
|
92
|
|
- set_app_patch_info(obj)
|
|
93
|
|
-
|
|
94
|
|
- def delete_model(self, request, obj):
|
|
95
|
|
- obj.delete()
|
|
96
|
|
-
|
|
97
|
|
- # 删除 APP 补丁信息
|
|
98
|
|
- del_app_patch_info(obj)
|
|
99
|
|
-
|
|
100
|
|
-
|
|
101
|
|
-class APPSettingsInfoAdmin(admin.ModelAdmin):
|
|
102
|
|
- list_display = ('platform', 'channel', 'version', 'online', 'status', 'created_at', 'updated_at')
|
|
103
|
|
- list_filter = ('platform', 'online', 'status')
|
|
104
|
|
-
|
|
105
|
|
- def save_model(self, request, obj, form, change):
|
|
106
|
|
- obj.channel = strip(obj.channel)
|
|
107
|
|
- obj.version = strip(obj.version)
|
|
108
|
|
- obj.save()
|
|
109
|
|
-
|
|
110
|
|
- # 设置 APP 设置信息
|
|
111
|
|
- set_app_settings_info(obj)
|
|
112
|
|
-
|
|
113
|
|
- def delete_model(self, request, obj):
|
|
114
|
|
- obj.delete()
|
|
115
|
|
-
|
|
116
|
|
- # 删除 APP 设置信息
|
|
117
|
|
- del_app_settings_info(obj)
|
|
118
|
|
-
|
|
119
|
|
-
|
|
120
|
|
-class SplashInfoAdmin(admin.ModelAdmin):
|
|
121
|
|
- list_display = ('splash_image', 'spalash_image_airtime', 'spalash_image_deadline', 'src', 'status', 'created_at', 'updated_at')
|
|
122
|
|
- list_filter = ('src', 'status')
|
|
123
|
|
-
|
|
124
|
|
-
|
|
125
|
|
-class FeedbackInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):
|
|
126
|
|
- list_display = ('user_id', 'feedback', 'src', 'status', 'created_at', 'updated_at')
|
|
127
|
|
- list_filter = ('src', 'status')
|
|
128
|
|
-
|
|
129
|
|
-
|
|
130
|
|
-class GuestEntranceControlInfoAdmin(admin.ModelAdmin):
|
|
131
|
|
- list_display = ('platform', 'min_adr', 'max_adr', 'min_ios', 'max_ios', 'src', 'status', 'created_at', 'updated_at')
|
|
132
|
|
- list_filter = ('src', 'status')
|
|
133
|
|
-
|
|
134
|
|
- def save_model(self, request, obj, form, change):
|
|
135
|
|
- obj.min_adr = strip(obj.min_adr)
|
|
136
|
|
- obj.max_adr = strip(obj.max_adr)
|
|
137
|
|
- obj.min_ios = strip(obj.min_ios)
|
|
138
|
|
- obj.max_ios = strip(obj.max_ios)
|
|
139
|
|
- obj.save()
|
|
140
|
|
-
|
|
141
|
|
- # 设置游客入口控制
|
|
142
|
|
- set_guest_entrance_control(obj)
|
|
143
|
|
-
|
|
144
|
|
- def delete_model(self, request, obj):
|
|
145
|
|
- obj.delete()
|
|
146
|
|
-
|
|
147
|
|
- # 删除游客入口控制
|
|
148
|
|
- delete_guest_entrance_control()
|
|
149
|
|
-
|
|
150
|
|
-
|
|
151
|
|
-class BoxProgramVersionInfoAdmin(admin.ModelAdmin):
|
|
152
|
|
- list_display = ('srv_version_code', 'srv_version_name', 'srv_sha1', 'proc_version_code', 'proc_version_name', 'proc_sha1', 'status', 'created_at', 'updated_at')
|
|
153
|
|
- list_filter = ('status', )
|
|
154
|
|
-
|
|
155
|
|
- def save_model(self, request, obj, form, change):
|
|
156
|
|
- obj.srv_version_name = strip(obj.srv_version_name)
|
|
157
|
|
- obj.srv_sha1 = strip(obj.srv_sha1)
|
|
158
|
|
- obj.proc_version_name = strip(obj.proc_version_name)
|
|
159
|
|
- obj.proc_sha1 = strip(obj.proc_sha1)
|
|
160
|
|
- obj.save()
|
|
161
|
|
-
|
|
162
|
|
- # 设置 BOX 程序版本信息
|
|
163
|
|
- set_box_program_version()
|
|
164
|
|
-
|
|
165
|
|
- def delete_model(self, request, obj):
|
|
166
|
|
- obj.delete()
|
|
167
|
|
-
|
|
168
|
|
- # 设置 BOX 程序版本信息
|
|
169
|
|
- set_box_program_version()
|
|
170
|
2
|
|
|
171
|
3
|
|
|
172
|
|
-# admin.site.register(LatestAppInfo, LatestAppInfoAdmin)
|
|
173
|
|
-# admin.site.register(PatchInfo, PatchInfoAdmin)
|
|
174
|
|
-# admin.site.register(APPSettingsInfo, APPSettingsInfoAdmin)
|
|
175
|
|
-# admin.site.register(SplashInfo, SplashInfoAdmin)
|
|
176
|
|
-# admin.site.register(FeedbackInfo, FeedbackInfoAdmin)
|
|
177
|
|
-# admin.site.register(GuestEntranceControlInfo, GuestEntranceControlInfoAdmin)
|
|
178
|
|
-# admin.site.register(BoxProgramVersionInfo, BoxProgramVersionInfoAdmin)
|
|
|
4
|
+# Register your models here.
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.db import models
|
|
4
|
4
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
|
-from models_ext import BaseModelMixin, upload_file_url, upload_path
|
|
|
5
|
+from django_models_ext import BaseModelMixin, upload_file_url, upload_path
|
|
6
|
6
|
|
|
7
|
7
|
from pai2.basemodels import PaiaiSrcMixin, PlatformMixin, VersionMixin
|
|
8
|
8
|
|
|
|
|
@@ -4,8 +4,8 @@ import os
|
|
4
|
4
|
|
|
5
|
5
|
from django.conf import settings
|
|
6
|
6
|
from django.shortcuts import redirect
|
|
|
7
|
+from django_logit import logit
|
|
7
|
8
|
from django_response import response
|
|
8
|
|
-from logit import logit
|
|
9
|
9
|
|
|
10
|
10
|
from account.models import UserInfo
|
|
11
|
11
|
from operation.models import FeedbackInfo, GuestEntranceControlInfo, LatestAppInfo, SplashInfo
|
|
|
|
@@ -3,9 +3,9 @@
|
|
3
|
3
|
from django.conf import settings
|
|
4
|
4
|
from django.db import transaction
|
|
5
|
5
|
from django.shortcuts import render
|
|
|
6
|
+from django_logit import logit
|
|
6
|
7
|
from django_response import response
|
|
7
|
8
|
from json_render import json_render
|
|
8
|
|
-from logit import logit
|
|
9
|
9
|
|
|
10
|
10
|
from account.models import FranchiserInfo, LensmanInfo, SaleclerkInfo, TourGuideInfo
|
|
11
|
11
|
from utils.error.errno_utils import FranchiserStatusCode, SaleclerkStatusCode
|
|
|
|
@@ -5,8 +5,8 @@ from __future__ import division
|
|
5
|
5
|
from django.conf import settings
|
|
6
|
6
|
from django.db import transaction
|
|
7
|
7
|
from django.shortcuts import render
|
|
|
8
|
+from django_logit import logit
|
|
8
|
9
|
from django_response import response
|
|
9
|
|
-from logit import logit
|
|
10
|
10
|
|
|
11
|
11
|
from account.models import SaleclerkInfo
|
|
12
|
12
|
from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
|
|
|
|
@@ -44,10 +44,10 @@ INSTALLED_APPS = (
|
|
44
|
44
|
'django.contrib.messages',
|
|
45
|
45
|
'django.contrib.staticfiles',
|
|
46
|
46
|
'django_file_upload',
|
|
47
|
|
- 'django_rlog',
|
|
48
|
47
|
'django_uniapi',
|
|
|
48
|
+ 'django_admin',
|
|
|
49
|
+ 'django_rlog',
|
|
49
|
50
|
'django_we',
|
|
50
|
|
- 'djadmin',
|
|
51
|
51
|
'api',
|
|
52
|
52
|
'account',
|
|
53
|
53
|
'box',
|
|
|
|
@@ -1,16 +1,4 @@
|
|
1
|
|
-# -*- coding: utf-8 -*-
|
|
2
|
|
-
|
|
3
|
|
-from djadmin import ReadOnlyModelAdmin
|
|
4
|
1
|
from django.contrib import admin
|
|
5
|
2
|
|
|
6
|
|
-from pay.models import OrderInfo
|
|
7
|
|
-
|
|
8
|
|
-
|
|
9
|
|
-class OrderInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
|
|
10
|
|
- list_display = ('order_id', 'photo_type', 'photo_status', 'from_uid', 'to_uid', 'pay_status', 'paid_at', 'reback_status', 'reback_at', 'status', 'created_at', 'updated_at')
|
|
11
|
|
- list_filter = ('photo_type', 'photo_status', 'pay_status', 'reback_status', 'status')
|
|
12
|
|
- readonly_fields = ('order_id', 'prepay_id', 'transaction_id', 'unifiedorder_result', 'notify_msg')
|
|
13
|
|
- search_fields = ('prepay_id', 'transaction_id', 'group_id', 'session_id', 'photo_id', 'lensman_photo_id', 'from_uid', 'to_uid')
|
|
14
|
|
-
|
|
15
|
3
|
|
|
16
|
|
-# admin.site.register(OrderInfo, OrderInfoAdmin)
|
|
|
4
|
+# Register your models here.
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.db import models
|
|
4
|
4
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
|
-from models_ext import BaseModelMixin
|
|
|
5
|
+from django_models_ext import BaseModelMixin
|
|
6
|
6
|
from shortuuidfield import ShortUUIDField
|
|
7
|
7
|
from TimeConvert import TimeConvert as tc
|
|
8
|
8
|
|
|
|
|
@@ -3,8 +3,8 @@
|
|
3
|
3
|
from django.conf import settings
|
|
4
|
4
|
from django.db import transaction
|
|
5
|
5
|
from django.shortcuts import HttpResponse
|
|
|
6
|
+from django_logit import logit
|
|
6
|
7
|
from django_response import response
|
|
7
|
|
-from logit import logit
|
|
8
|
8
|
from paginator import pagination
|
|
9
|
9
|
from pywe_exception import WeChatPayException
|
|
10
|
10
|
from pywe_pay import WeChatPay
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.db import models
|
|
4
|
4
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
|
-from models_ext import BaseModelMixin
|
|
|
5
|
+from django_models_ext import BaseModelMixin
|
|
6
|
6
|
|
|
7
|
7
|
from utils.qiniucdn import qiniu_file_url
|
|
8
|
8
|
|
|
|
|
@@ -3,9 +3,9 @@
|
|
3
|
3
|
from django.db import transaction
|
|
4
|
4
|
from django.shortcuts import render
|
|
5
|
5
|
from django_curtail_uuid import CurtailUUID
|
|
|
6
|
+from django_logit import logit
|
|
6
|
7
|
from django_response import response
|
|
7
|
8
|
from ipaddr import client_ip
|
|
8
|
|
-from logit import logit
|
|
9
|
9
|
from rest_framework import viewsets
|
|
10
|
10
|
from TimeConvert import TimeConvert as tc
|
|
11
|
11
|
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.db import models
|
|
4
|
4
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
|
-from models_ext import BaseModelMixin, SexModelMixin
|
|
|
5
|
+from django_models_ext import BaseModelMixin, SexModelMixin
|
|
6
|
6
|
from shortuuidfield import ShortUUIDField
|
|
7
|
7
|
|
|
8
|
8
|
|
|
|
|
@@ -5,26 +5,26 @@ Pillow==5.0.0
|
|
5
|
5
|
StatusCode==1.0.0
|
|
6
|
6
|
TimeConvert==1.4.3
|
|
7
|
7
|
cryptography==1.5.2
|
|
8
|
|
-django-admin==1.1.1
|
|
|
8
|
+django-admin==1.2.0
|
|
9
|
9
|
django-curtail-uuid==1.0.4
|
|
10
|
10
|
django-detect==1.0.5
|
|
11
|
|
-django-file-md5==1.0.1
|
|
|
11
|
+django-file-md5==1.0.2
|
|
12
|
12
|
django-file-upload==1.0.0
|
|
13
|
13
|
django-ip==1.0.2
|
|
14
|
14
|
django-json-render==1.0.0
|
|
15
|
15
|
django-json-response==1.1.5
|
|
16
|
|
-django-logit==1.0.8
|
|
|
16
|
+django-logit==1.1.2
|
|
17
|
17
|
django-mobi==0.1.7
|
|
18
|
|
-django-models-ext==1.1.0
|
|
|
18
|
+django-models-ext==1.1.1
|
|
19
|
19
|
django-multidomain==1.1.4
|
|
20
|
20
|
django-paginator2==1.0.3
|
|
21
|
21
|
django-redis-connector==1.0.1
|
|
22
|
|
-django-response==1.0.2
|
|
|
22
|
+django-response==1.1.1
|
|
23
|
23
|
django-rlog==1.0.7
|
|
24
|
24
|
django-shortuuidfield==0.1.3
|
|
25
|
25
|
django-six==1.0.4
|
|
26
|
26
|
django-uniapi==1.0.1
|
|
27
|
|
-django-we==1.1.6
|
|
|
27
|
+django-we==1.2.1
|
|
28
|
28
|
djangorestframework==3.7.7
|
|
29
|
29
|
furl==1.0.1
|
|
30
|
30
|
hiredis==0.2.0
|
|
|
|
@@ -37,7 +37,7 @@ pywe-membercard==1.0.0
|
|
37
|
37
|
pywe-miniapp==1.0.2
|
|
38
|
38
|
pywe-oauth==1.0.6
|
|
39
|
39
|
pywe-pay==1.0.11
|
|
40
|
|
-pywe-pay-notify==1.0.1
|
|
|
40
|
+pywe-pay-notify==1.0.4
|
|
41
|
41
|
pywe-response==1.0.1
|
|
42
|
42
|
pywe-sign==1.0.7
|
|
43
|
43
|
pywe-xml==1.0.0
|
|
|
|
@@ -48,5 +48,4 @@ requests==2.18.4
|
|
48
|
48
|
rlog==0.3
|
|
49
|
49
|
rsa==3.4.2
|
|
50
|
50
|
shortuuid==0.5.0
|
|
51
|
|
-uWSGI==2.0.15
|
|
52
|
51
|
versions==0.10.0
|
|
|
|
@@ -1,7 +1,7 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
|
3
|
+from django_logit import logit
|
|
3
|
4
|
from django_response import response
|
|
4
|
|
-from logit import logit
|
|
5
|
5
|
from TimeConvert import TimeConvert as tc
|
|
6
|
6
|
|
|
7
|
7
|
|
|
|
|
@@ -1,7 +1,6 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
3
|
from filemd5 import calculate_md5
|
|
4
|
|
-
|
|
5
|
4
|
from utils.redis.connect import r
|
|
6
|
5
|
|
|
7
|
6
|
|
|
|
|
@@ -6,8 +6,8 @@ import shortuuid
|
|
6
|
6
|
from django.conf import settings
|
|
7
|
7
|
from django.core.files.storage import default_storage
|
|
8
|
8
|
from django.db import transaction
|
|
9
|
|
-from filemd5 import calculate_md5
|
|
10
|
9
|
|
|
|
10
|
+from filemd5 import calculate_md5
|
|
11
|
11
|
from photo.models import PhotoUUIDInfo
|
|
12
|
12
|
from utils.qiniucdn import upload_file_path
|
|
13
|
13
|
from utils.thumbnail_utils import make_thumbnail
|
|
|
|
@@ -6,8 +6,8 @@ import shortuuid
|
|
6
|
6
|
from django.conf import settings
|
|
7
|
7
|
from django.core.files.storage import default_storage
|
|
8
|
8
|
from django.db import transaction
|
|
9
|
|
-from filemd5 import calculate_md5
|
|
10
|
9
|
|
|
|
10
|
+from filemd5 import calculate_md5
|
|
11
|
11
|
from photo.models import PhotoUUIDInfo
|
|
12
|
12
|
from utils.thumbnail_utils import make_thumbnail
|
|
13
|
13
|
from utils.watermark_utils import watermark_wrap
|