diff --git a/README.md b/README.md index 33319bc9..54a27f2e 100644 --- a/README.md +++ b/README.md @@ -121,17 +121,17 @@ python manage.py compress --force 如果您觉得本项目对您有所帮助，欢迎您请我喝杯咖啡，您的支持是我最大的动力，您可以扫描下方二维码为我付款，谢谢。 ### 支付宝：
- +
### 微信：
- +
--- 感谢jetbrains
- +
diff --git a/blog/migrations/0006_alter_blogsettings_options.py b/blog/migrations/0006_alter_blogsettings_options.py new file mode 100644 index 00000000..e36feb4c --- /dev/null +++ b/blog/migrations/0006_alter_blogsettings_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.7 on 2024-01-26 02:41 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0005_alter_article_options_alter_category_options_and_more'), + ] + + operations = [ + migrations.AlterModelOptions( + name='blogsettings', + options={'verbose_name': 'Website configuration', 'verbose_name_plural': 'Website configuration'}, + ), + ] diff --git a/docs/imgs/alipay.jpg b/docs/imgs/alipay.jpg new file mode 100644 index 00000000..424d70a2 Binary files /dev/null and b/docs/imgs/alipay.jpg differ diff --git a/docs/imgs/pycharm_logo.png b/docs/imgs/pycharm_logo.png new file mode 100644 index 00000000..b8add2a5 Binary files /dev/null and b/docs/imgs/pycharm_logo.png differ diff --git a/docs/imgs/wechat.jpg b/docs/imgs/wechat.jpg new file mode 100644 index 00000000..7edf525a Binary files /dev/null and b/docs/imgs/wechat.jpg differ diff --git a/oauth/migrations/0003_alter_oauthuser_nickname.py b/oauth/migrations/0003_alter_oauthuser_nickname.py new file mode 100644 index 00000000..6af08ebb --- /dev/null +++ b/oauth/migrations/0003_alter_oauthuser_nickname.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-01-26 02:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('oauth', '0002_alter_oauthconfig_options_alter_oauthuser_options_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='oauthuser', + name='nickname', + field=models.CharField(max_length=50, verbose_name='nick name'), + ), + ] diff --git a/owntracks/views.py b/owntracks/views.py index 2bb6e8a5..6c87a2bf 100644 --- a/owntracks/views.py +++ b/owntracks/views.py @@ -116,10 +116,14 @@ def get_datas(request): d = dict() d["name"] = tid paths = list() - locations = convert_to_amap( - sorted(item, key=lambda x: x.creation_time)) - for i in locations.split(';'): - paths.append(i.split(',')) + # 使用高德转换后的经纬度 + # locations = convert_to_amap( + # sorted(item, key=lambda x: x.creation_time)) + # for i in locations.split(';'): + # paths.append(i.split(',')) + # 使用GPS原始经纬度 + for location in sorted(item, key=lambda x: x.creation_time): + paths.append([str(location.lon), str(location.lat)]) d["path"] = paths result.append(d) return JsonResponse(result, safe=False)