diff --git a/apps/common/templates/common/backup_load.html b/apps/common/templates/common/backup.html similarity index 100% rename from apps/common/templates/common/backup_load.html rename to apps/common/templates/common/backup.html diff --git a/apps/common/templates/common/update.html b/apps/common/templates/common/update.html new file mode 100644 index 0000000..175d3e0 --- /dev/null +++ b/apps/common/templates/common/update.html @@ -0,0 +1,74 @@ + + +
+
+
+ +
{% csrf_token %} + + +
+
+ + +
+
+
+ +
+
+ +
+
说明
+
+
更新本地git代码 +
+
+
+
+ + + \ No newline at end of file diff --git a/apps/common/urls/views_urls.py b/apps/common/urls/views_urls.py index 38ed8a6..c0a349e 100644 --- a/apps/common/urls/views_urls.py +++ b/apps/common/urls/views_urls.py @@ -10,11 +10,14 @@ urlpatterns = [ #百度ocr #path('baiduocr', views.BaiDuOcrView.as_view()), #备份恢复 - path('backupload', views.BackupLoadView.as_view()), - path('backup', views_request.backup), + path('backup', views.BackupView.as_view()), + path('backup/export', views_request.backupExport), + path('backup/import', views_request.backupImport), #补签 path('signagain', views_request.signAgain), path('signcheck', views_request.signCheck), + #升级 + path('update', views.UpdateView.as_view()), ] diff --git a/apps/common/views.py b/apps/common/views.py index 98bb23b..751fbf1 100644 --- a/apps/common/views.py +++ b/apps/common/views.py @@ -2,6 +2,8 @@ from django.shortcuts import render from django.views.generic import TemplateView from django.contrib.auth.mixins import LoginRequiredMixin from django.http import JsonResponse +from django.conf import settings +import git # Create your views here. #------------------------------ @@ -66,11 +68,11 @@ from django.http import JsonResponse #return JsonResponse(response_data) -class BackupLoadView(LoginRequiredMixin,TemplateView): +class BackupView(LoginRequiredMixin,TemplateView): """ 备份恢复 """ - template_name = 'common/backup_load.html' + template_name = 'common/backup.html' #显示添加模板 def get(self, request, *args, **kwargs): @@ -78,7 +80,7 @@ class BackupLoadView(LoginRequiredMixin,TemplateView): 得到 """ - return super(BackupLoadView, self).get(request, *args, **kwargs) + return super(BackupView, self).get(request, *args, **kwargs) #显示编辑模板 def get_context_data(self, **kwargs): @@ -87,5 +89,52 @@ class BackupLoadView(LoginRequiredMixin,TemplateView): } kwargs.update(context) - return super(BackupLoadView, self).get_context_data(**kwargs) + return super(BackupView, self).get_context_data(**kwargs) + +class UpdateView(LoginRequiredMixin,TemplateView): + """ + 升级 + """ + template_name = 'common/update.html' + + #显示添加模板 + def get(self, request, *args, **kwargs): + """ + 得到 + """ + + return super(UpdateView, self).get(request, *args, **kwargs) + + #显示编辑模板 + def get_context_data(self, **kwargs): + + context = { + + } + kwargs.update(context) + return super(UpdateView, self).get_context_data(**kwargs) + + #数据提交接收方法 + def post(self, request, *args, **kwargs): + """ + 数据提交 + """ + action = request.POST.get('action') + + if action == 'update': + #指定仓库地址 + repo = git.repo.Repo(settings.BASE_DIR) + #通过Repo对象获取git对象 + git = repo.git + #通过repo对象获取remote对象 + remote = repo.remote() + remote.pull() + + log_msg=git.log() + print (log_msg) + + + response_data={"code":1,"msg":"添加成功"} + + return JsonResponse(response_data) \ No newline at end of file diff --git a/apps/common/views_request.py b/apps/common/views_request.py index d6c5207..613db3b 100644 --- a/apps/common/views_request.py +++ b/apps/common/views_request.py @@ -15,7 +15,7 @@ from common.sites_sign import signIngress #================== @login_required -def backup(request): +def backupExport(request): """ 备份数据 """ @@ -55,7 +55,7 @@ def backup(request): #================== @login_required -def load(request): +def backupImport(request): """ 数据恢复 """ diff --git a/apps/sites/templates/sites/siteconfig.html b/apps/sites/templates/sites/siteconfig.html index 034e265..de8b7ae 100644 --- a/apps/sites/templates/sites/siteconfig.html +++ b/apps/sites/templates/sites/siteconfig.html @@ -42,7 +42,7 @@