Skip to content

Commit 4500c0b

Browse files
committed
修复部分字段命名错误,修改同步头像功能
1 parent 892e03d commit 4500c0b

13 files changed

Lines changed: 426 additions & 43 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ target/
6767
# virtualenv
6868
venv/
6969

70-
migrations/
71-
!migrations/__init__.py
7270
collectedstatic/
7371
djangoblog/whoosh_index/
7472
google93fd32dbd906620a.html
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Generated by Django 4.1.7 on 2023-03-02 07:14
2+
3+
import django.contrib.auth.models
4+
import django.contrib.auth.validators
5+
from django.db import migrations, models
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
initial = True
12+
13+
dependencies = [
14+
('auth', '0012_alter_user_first_name_max_length'),
15+
]
16+
17+
operations = [
18+
migrations.CreateModel(
19+
name='BlogUser',
20+
fields=[
21+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
22+
('password', models.CharField(max_length=128, verbose_name='password')),
23+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
24+
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
25+
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
26+
('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
27+
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
28+
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
29+
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
30+
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
31+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
32+
('nickname', models.CharField(blank=True, max_length=100, verbose_name='昵称')),
33+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
34+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
35+
('source', models.CharField(blank=True, max_length=100, verbose_name='创建来源')),
36+
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
37+
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
38+
],
39+
options={
40+
'verbose_name': '用户',
41+
'verbose_name_plural': '用户',
42+
'ordering': ['-id'],
43+
'get_latest_by': 'id',
44+
},
45+
managers=[
46+
('objects', django.contrib.auth.models.UserManager()),
47+
],
48+
),
49+
]
Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
1+
import requests
12
from django.core.management.base import BaseCommand
2-
from django.template.context_processors import static
3+
from django.templatetags.static import static
34

45
from djangoblog.utils import save_user_avatar
56
from oauth.models import OAuthUser
7+
from oauth.oauthmanager import get_manager_by_type
68

79

810
class Command(BaseCommand):
911
help = 'sync user avatar'
1012

13+
def test_picture(self, url):
14+
try:
15+
if requests.get(url, timeout=2).status_code == 200:
16+
return True
17+
except:
18+
pass
19+
1120
def handle(self, *args, **options):
12-
static_url = static("avatar/")
13-
users = OAuthUser.objects.filter(picture__isnull=False).exclude(
14-
picture__istartswith=static_url).all()
15-
self.stdout.write('开始同步{count}个用户头像'.format(count=len(users)))
21+
static_url = static("../")
22+
users = OAuthUser.objects.filter(picture__isnull=False).all()
23+
self.stdout.write(f'开始同步{len(users)}个用户头像')
1624
for u in users:
17-
self.stdout.write('开始同步:{id}'.format(id=u.nikename))
25+
self.stdout.write(f'开始同步:{u.nickname}')
1826
url = u.picture
27+
if self.test_picture(url):
28+
continue
29+
if url.startswith(static_url):
30+
manage = get_manager_by_type(u.type)
31+
url = manage.get_picture(u.metadata)
1932
url = save_user_avatar(url)
2033
if url:
2134
self.stdout.write(
22-
'结束同步:{id}.url:{url}'.format(
23-
id=u.nikename, url=url))
35+
f'结束同步:{u.nickname}.url:{url}')
2436
u.picture = url
2537
u.save()
2638
self.stdout.write('结束同步')

‎blog/migrations/0001_initial.py‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# Generated by Django 4.1.7 on 2023-03-02 07:14
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
import django.utils.timezone
7+
import mdeditor.fields
8+
9+
10+
class Migration(migrations.Migration):
11+
12+
initial = True
13+
14+
dependencies = [
15+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='BlogSettings',
21+
fields=[
22+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
23+
('sitename', models.CharField(default='', max_length=200, verbose_name='网站名称')),
24+
('site_description', models.TextField(default='', max_length=1000, verbose_name='网站描述')),
25+
('site_seo_description', models.TextField(default='', max_length=1000, verbose_name='网站SEO描述')),
26+
('site_keywords', models.TextField(default='', max_length=1000, verbose_name='网站关键字')),
27+
('article_sub_length', models.IntegerField(default=300, verbose_name='文章摘要长度')),
28+
('sidebar_article_count', models.IntegerField(default=10, verbose_name='侧边栏文章数目')),
29+
('sidebar_comment_count', models.IntegerField(default=5, verbose_name='侧边栏评论数目')),
30+
('article_comment_count', models.IntegerField(default=5, verbose_name='文章页面默认显示评论数目')),
31+
('show_google_adsense', models.BooleanField(default=False, verbose_name='是否显示谷歌广告')),
32+
('google_adsense_codes', models.TextField(blank=True, default='', max_length=2000, null=True, verbose_name='广告内容')),
33+
('open_site_comment', models.BooleanField(default=True, verbose_name='是否打开网站评论功能')),
34+
('beiancode', models.CharField(blank=True, default='', max_length=2000, null=True, verbose_name='备案号')),
35+
('analyticscode', models.TextField(default='', max_length=1000, verbose_name='网站统计代码')),
36+
('show_gongan_code', models.BooleanField(default=False, verbose_name='是否显示公安备案号')),
37+
('gongan_beiancode', models.TextField(blank=True, default='', max_length=2000, null=True, verbose_name='公安备案号')),
38+
],
39+
options={
40+
'verbose_name': '网站配置',
41+
'verbose_name_plural': '网站配置',
42+
},
43+
),
44+
migrations.CreateModel(
45+
name='Links',
46+
fields=[
47+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
48+
('name', models.CharField(max_length=30, unique=True, verbose_name='链接名称')),
49+
('link', models.URLField(verbose_name='链接地址')),
50+
('sequence', models.IntegerField(unique=True, verbose_name='排序')),
51+
('is_enable', models.BooleanField(default=True, verbose_name='是否显示')),
52+
('show_type', models.CharField(choices=[('i', '首页'), ('l', '列表页'), ('p', '文章页面'), ('a', '全站'), ('s', '友情链接页面')], default='i', max_length=1, verbose_name='显示类型')),
53+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
54+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
55+
],
56+
options={
57+
'verbose_name': '友情链接',
58+
'verbose_name_plural': '友情链接',
59+
'ordering': ['sequence'],
60+
},
61+
),
62+
migrations.CreateModel(
63+
name='SideBar',
64+
fields=[
65+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
66+
('name', models.CharField(max_length=100, verbose_name='标题')),
67+
('content', models.TextField(verbose_name='内容')),
68+
('sequence', models.IntegerField(unique=True, verbose_name='排序')),
69+
('is_enable', models.BooleanField(default=True, verbose_name='是否启用')),
70+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
71+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
72+
],
73+
options={
74+
'verbose_name': '侧边栏',
75+
'verbose_name_plural': '侧边栏',
76+
'ordering': ['sequence'],
77+
},
78+
),
79+
migrations.CreateModel(
80+
name='Tag',
81+
fields=[
82+
('id', models.AutoField(primary_key=True, serialize=False)),
83+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
84+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
85+
('name', models.CharField(max_length=30, unique=True, verbose_name='标签名')),
86+
('slug', models.SlugField(blank=True, default='no-slug', max_length=60)),
87+
],
88+
options={
89+
'verbose_name': '标签',
90+
'verbose_name_plural': '标签',
91+
'ordering': ['name'],
92+
},
93+
),
94+
migrations.CreateModel(
95+
name='Category',
96+
fields=[
97+
('id', models.AutoField(primary_key=True, serialize=False)),
98+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
99+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
100+
('name', models.CharField(max_length=30, unique=True, verbose_name='分类名')),
101+
('slug', models.SlugField(blank=True, default='no-slug', max_length=60)),
102+
('index', models.IntegerField(default=0, verbose_name='权重排序-越大越靠前')),
103+
('parent_category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.category', verbose_name='父级分类')),
104+
],
105+
options={
106+
'verbose_name': '分类',
107+
'verbose_name_plural': '分类',
108+
'ordering': ['-index'],
109+
},
110+
),
111+
migrations.CreateModel(
112+
name='Article',
113+
fields=[
114+
('id', models.AutoField(primary_key=True, serialize=False)),
115+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
116+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
117+
('title', models.CharField(max_length=200, unique=True, verbose_name='标题')),
118+
('body', mdeditor.fields.MDTextField(verbose_name='正文')),
119+
('pub_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='发布时间')),
120+
('status', models.CharField(choices=[('d', '草稿'), ('p', '发表')], default='p', max_length=1, verbose_name='文章状态')),
121+
('comment_status', models.CharField(choices=[('o', '打开'), ('c', '关闭')], default='o', max_length=1, verbose_name='评论状态')),
122+
('type', models.CharField(choices=[('a', '文章'), ('p', '页面')], default='a', max_length=1, verbose_name='类型')),
123+
('views', models.PositiveIntegerField(default=0, verbose_name='浏览量')),
124+
('article_order', models.IntegerField(default=0, verbose_name='排序,数字越大越靠前')),
125+
('show_toc', models.BooleanField(default=False, verbose_name='是否显示toc目录')),
126+
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='作者')),
127+
('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='blog.category', verbose_name='分类')),
128+
('tags', models.ManyToManyField(blank=True, to='blog.tag', verbose_name='标签集合')),
129+
],
130+
options={
131+
'verbose_name': '文章',
132+
'verbose_name_plural': '文章',
133+
'ordering': ['-article_order', '-pub_time'],
134+
'get_latest_by': 'id',
135+
},
136+
),
137+
]
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Generated by Django 4.1.7 on 2023-03-02 07:14
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
initial = True
12+
13+
dependencies = [
14+
('blog', '0001_initial'),
15+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='Comment',
21+
fields=[
22+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
23+
('body', models.TextField(max_length=300, verbose_name='正文')),
24+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
25+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
26+
('is_enable', models.BooleanField(default=True, verbose_name='是否显示')),
27+
('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='blog.article', verbose_name='文章')),
28+
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='作者')),
29+
('parent_comment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comments.comment', verbose_name='上级评论')),
30+
],
31+
options={
32+
'verbose_name': '评论',
33+
'verbose_name_plural': '评论',
34+
'ordering': ['-id'],
35+
'get_latest_by': 'id',
36+
},
37+
),
38+
]

‎djangoblog/utils.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,10 @@ def save_user_avatar(url):
177177
:param url:头像url
178178
:return: 本地路径
179179
'''
180-
setting = get_blog_setting()
181180
logger.info(url)
182181

183182
try:
184183
basedir = os.path.join(settings.STATICFILES, 'avatar')
185-
186-
imgname = url.split('/')[-1]
187-
if imgname:
188-
path = f'{basedir}/{imgname}'
189-
if os.path.exists(path):
190-
os.remove(path)
191184
rsp = requests.get(url, timeout=2)
192185
if rsp.status_code == 200:
193186
if not os.path.exists(basedir):
@@ -203,7 +196,7 @@ def save_user_avatar(url):
203196
return static('avatar/' + save_filename)
204197
except Exception as e:
205198
logger.error(e)
206-
return url
199+
return static('blog/img/avatar.png')
207200

208201

209202
def delete_sidebar_cache():

‎oauth/admin.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010

1111
class OAuthUserAdmin(admin.ModelAdmin):
12-
search_fields = ('nikename', 'email')
12+
search_fields = ('nickname', 'email')
1313
list_per_page = 20
1414
list_display = (
1515
'id',
16-
'nikename',
16+
'nickname',
1717
'link_to_usermodel',
1818
'show_user_image',
1919
'type',
2020
'email',
2121
)
22-
list_display_links = ('id', 'nikename')
22+
list_display_links = ('id', 'nickname')
2323
list_filter = ('author', 'type',)
2424
readonly_fields = []
2525

‎oauth/migrations/0001_initial.py‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Generated by Django 4.1.7 on 2023-03-07 09:53
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
initial = True
12+
13+
dependencies = [
14+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15+
]
16+
17+
operations = [
18+
migrations.CreateModel(
19+
name='OAuthConfig',
20+
fields=[
21+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
22+
('type', models.CharField(choices=[('weibo', '微博'), ('google', '谷歌'), ('github', 'GitHub'), ('facebook', 'FaceBook'), ('qq', 'QQ')], default='a', max_length=10, verbose_name='类型')),
23+
('appkey', models.CharField(max_length=200, verbose_name='AppKey')),
24+
('appsecret', models.CharField(max_length=200, verbose_name='AppSecret')),
25+
('callback_url', models.CharField(default='http://www.baidu.com', max_length=200, verbose_name='回调地址')),
26+
('is_enable', models.BooleanField(default=True, verbose_name='是否显示')),
27+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
28+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
29+
],
30+
options={
31+
'verbose_name': 'oauth配置',
32+
'verbose_name_plural': 'oauth配置',
33+
'ordering': ['-created_time'],
34+
},
35+
),
36+
migrations.CreateModel(
37+
name='OAuthUser',
38+
fields=[
39+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
40+
('openid', models.CharField(max_length=50)),
41+
('nickname', models.CharField(max_length=50, verbose_name='昵称')),
42+
('token', models.CharField(blank=True, max_length=150, null=True)),
43+
('picture', models.CharField(blank=True, max_length=350, null=True)),
44+
('type', models.CharField(max_length=50)),
45+
('email', models.CharField(blank=True, max_length=50, null=True)),
46+
('metadata', models.TextField(blank=True, null=True)),
47+
('created_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')),
48+
('last_mod_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='修改时间')),
49+
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='用户')),
50+
],
51+
options={
52+
'verbose_name': 'oauth用户',
53+
'verbose_name_plural': 'oauth用户',
54+
'ordering': ['-created_time'],
55+
},
56+
),
57+
]

0 commit comments

Comments
 (0)