nas/pthelper
1
0
Fork 0
mirror of https://github.com/xingsu1021/pthelper.git synced 2026-11-01 21:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加git操作

Browse Source
This commit is contained in:
xingsu1021
2022-05-23 15:46:25 +08:00
parent 0ba6449fa1
commit eff07348e6
7 changed files with 141 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
apps/common/templates/common/backup_load.html → apps/common/templates/common/backup.html
View File

74
apps/common/templates/common/update.html Normal file
View File

@@ -0,0 +1,74 @@
<!-- 正文开始 -->
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body">
<!-- 表单开始 -->
<form class="layui-form" id="updateForm" lay-filter="updateForm" method="POST">{% csrf_token %}
<input name="id" type="hidden" value="{{id}}"/>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-filter="updateSubmit" lay-submit>&emsp;升级&emsp;</button>
</div>
</div>
</form>
<!-- //表单结束 -->
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">说明</div>
<div class="layui-card-body">
<blockquote class="layui-elem-quote layui-quote-nm">更新本地git代码
</blockquote>
</div>
</div>
</div>
<!-- js部分 -->
<script>
layui.use(['layer', 'form', 'util', 'admin', 'xmSelect', 'formX', 'dropdown'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
var util = layui.util;
var admin = layui.admin;
var formX = layui.formX;
var setter = layui.setter;
var xmSelect = layui.xmSelect;
form.on('submit(updateSubmit)', function (data) {
layer.load(2);
admin.req('common/update', {'action':'update'}, function (data) {
layer.closeAll('loading');
if (data.code == 1) {
layer.msg(data.msg, {icon: 1});
} else {
layer.msg(data.msg, {icon: 2});
}
}, $('#updateForm').attr('method'));
return false;
});
// form.on('submit(updatecrtestSubmit)', function (data) {
// layer.load(2);
// admin.req('common/updatecrtest', data.field, function (data) {
// layer.closeAll('loading');
// if (data.code == 1) {
// layer.msg(data.msg, {icon: 1});
// } else {
// layer.msg(data.msg, {icon: 2});
// }
// }, $('#updatecrForm').attr('method'));
// return false;
// });
});
</script>

7
apps/common/urls/views_urls.py
View File

@@ -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()),
]

57
apps/common/views.py
View File

@@ -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)

4
apps/common/views_request.py
View File

@@ -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):
"""
数据恢复
"""

3
apps/sites/templates/sites/siteconfig.html
View File

@@ -42,7 +42,7 @@
<script>
layui.use(['layer', 'form', 'table', 'tableX', 'util', 'admin', 'xmSelect', 'formX', 'dropdown'], function () {
layui.use(['layer', 'form', 'table', 'tableX', 'util', 'admin', 'xmSelect', 'formX', 'dropdown', 'upload'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
@@ -53,6 +53,7 @@
var formX = layui.formX;
var setter = layui.setter;
var xmSelect = layui.xmSelect;
var upload = layui.upload;
form.render('select');
// 渲染表格

6
static/json/menus.json
View File

@@ -29,7 +29,11 @@
},
{
"title": "备份恢复",
"path": "#/common/backupload"
"path": "#/common/backup"
},
{
"title": "更新升级",
"path": "#/common/update"
}
]