pull/109/head
Mr Chen 6 years ago
parent 248b0851da
commit 581f16e105
  1. 4
      plugins/gogs/index.html
  2. 18
      plugins/gogs/index.py
  3. 2
      plugins/openresty/index.html
  4. 19
      static/app/public.js

@ -3,7 +3,9 @@
<div class="bt-w-menu"> <div class="bt-w-menu">
<p class="bgw" onclick="pluginService('gogs');">服务</p> <p class="bgw" onclick="pluginService('gogs');">服务</p>
<p onclick="pluginInitD('gogs');">自启动</p> <p onclick="pluginInitD('gogs');">自启动</p>
<p onclick="pluginConfig('gogs');">配置修改</p> <p onclick="pluginConfig('gogs',null, 'init_conf');">自启动配置</p>
<p onclick="pluginConfig('gogs',null, 'conf');">运行配置</p>
<p onclick="pluginLogs('gogs',null,'run_log');">运行日志</p>
</div> </div>
<div class="bt-w-con pd15"> <div class="bt-w-con pd15">
<div class="soft-man-con"></div> <div class="soft-man-con"></div>

@ -52,11 +52,16 @@ def getArgs():
return tmp return tmp
def getConf(): def getInitdConf():
path = getPluginDir() + "/init.d/gogs.tpl" path = getPluginDir() + "/init.d/gogs.tpl"
return path return path
def getConf():
path = getServerDir() + "/custom/conf/app.ini"
return path
def status(): def status():
data = public.execShell( data = public.execShell(
"ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'") "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
@ -154,6 +159,11 @@ def initdUinstall():
os.remove(initd_bin) os.remove(initd_bin)
return 'ok' return 'ok'
def runLog():
log_path = getServerDir() + '/log/gogs.log'
return log_path
if __name__ == "__main__": if __name__ == "__main__":
func = sys.argv[1] func = sys.argv[1]
if func == 'status': if func == 'status':
@ -172,9 +182,11 @@ if __name__ == "__main__":
print initdInstall() print initdInstall()
elif func == 'initd_uninstall': elif func == 'initd_uninstall':
print initdUinstall() print initdUinstall()
elif func == 'run_info': elif func == 'run_log':
print runInfo() print runLog()
elif func == 'conf': elif func == 'conf':
print getConf() print getConf()
elif func == 'init_conf':
print getInitdConf()
else: else:
print 'fail' print 'fail'

@ -5,7 +5,7 @@
<p onclick="pluginInitD('openresty');">自启动</p> <p onclick="pluginInitD('openresty');">自启动</p>
<p onclick="pluginConfig('openresty');">配置修改</p> <p onclick="pluginConfig('openresty');">配置修改</p>
<p onclick="getOpenrestyStatus();">负载状态</p> <p onclick="getOpenrestyStatus();">负载状态</p>
<p onclick="pluginErrorLogs('openresty');">错误日志</p> <p onclick="pluginLogs('openresty');">错误日志</p>
</div> </div>
<div class="bt-w-con pd15"> <div class="bt-w-con pd15">
<div class="soft-man-con"></div> <div class="soft-man-con"></div>

@ -1588,11 +1588,16 @@ function pluginOpService(a, b, v) {
//配置修改 --- start //配置修改 --- start
function pluginConfig(_name, version){ function pluginConfig(_name, version, func){
if ( typeof(version) == 'undefined' ){ if ( typeof(version) == 'undefined' ){
version = ''; version = '';
} }
var func_name = 'conf';
if ( typeof(func) != 'undefined' ){
func_name = func;
}
var con = '<p style="color: #666; margin-bottom: 7px">提示Ctrl+F 搜索关键字Ctrl+G 查找下一个Ctrl+S 保存Ctrl+Shift+R 查找替换!</p>\ var con = '<p style="color: #666; margin-bottom: 7px">提示Ctrl+F 搜索关键字Ctrl+G 查找下一个Ctrl+S 保存Ctrl+Shift+R 查找替换!</p>\
<textarea class="bt-input-text" style="height: 320px; line-height:18px;" id="textBody"></textarea>\ <textarea class="bt-input-text" style="height: 320px; line-height:18px;" id="textBody"></textarea>\
<button id="onlineEditFileBtn" class="btn btn-success btn-sm" style="margin-top:10px;">保存</button>\ <button id="onlineEditFileBtn" class="btn btn-success btn-sm" style="margin-top:10px;">保存</button>\
@ -1602,7 +1607,7 @@ function pluginConfig(_name, version){
$(".soft-man-con").html(con); $(".soft-man-con").html(con);
var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']}); var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
$.post('/plugins/run', {name:_name, func:'conf',version:version},function (data) { $.post('/plugins/run', {name:_name, func:func_name,version:version},function (data) {
layer.close(loadT); layer.close(loadT);
var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']}); var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
@ -1712,13 +1717,19 @@ function pluginOpInitD(a, b) {
}) })
} }
function pluginErrorLogs(_name, version){ function pluginLogs(_name, version, func){
if ( typeof(version) == 'undefined' ){ if ( typeof(version) == 'undefined' ){
version = ''; version = '';
} }
var func_name = 'error_log';
if ( typeof(func) != 'undefined' ){
func_name = func;
}
var loadT = layer.msg('错误日志路径获取中...',{icon:16,time:0,shade: [0.3, '#000']}); var loadT = layer.msg('错误日志路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
$.post('/plugins/run', {name:_name, func:'error_log',version:version},function (data) { $.post('/plugins/run', {name:_name, func:func_name, version:version},function (data) {
layer.close(loadT); layer.close(loadT);
var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']}); var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});

Loading…
Cancel
Save