Browse Source

update

tags/2.2.2 2.2.2
flucout 9 months ago
parent
commit
79fddbb943
  1. BIN
      public/install/src/panel6.zip
  2. BIN
      public/install/update/LinuxPanel-8.0.4.zip
  3. 1
      route/app.php
  4. 97
      wiki/files/linux/bt.js
  5. 2
      wiki/update.md

BIN
public/install/src/panel6.zip

BIN
public/install/update/LinuxPanel-8.0.4.zip

1
route/app.php

@ -49,6 +49,7 @@ Route::group('api', function () {
Route::get('/index/get_win_date', 'api/get_win_date'); Route::get('/index/get_win_date', 'api/get_win_date');
Route::get('/panel/is_pro', 'api/is_pro'); Route::get('/panel/is_pro', 'api/is_pro');
Route::get('/getIpAddress', 'api/get_ip_address'); Route::get('/getIpAddress', 'api/get_ip_address');
Route::get('/GetAD', 'api/return_empty');
Route::post('/Auth/GetAuthToken', 'api/get_auth_token'); Route::post('/Auth/GetAuthToken', 'api/get_auth_token');
Route::post('/Auth/GetBindCode', 'api/return_error'); Route::post('/Auth/GetBindCode', 'api/return_error');
Route::post('/Auth/GetSSLList', 'api/get_ssl_list'); Route::post('/Auth/GetSSLList', 'api/get_ssl_list');

97
wiki/files/linux/bt.js

@ -11,8 +11,8 @@ if("undefined" != typeof bt && bt.hasOwnProperty("show_confirm")){
shadeClose: true, shadeClose: true,
btn: [lan['public'].ok, lan['public'].cancel], btn: [lan['public'].ok, lan['public'].cancel],
content: "<div class='bt-form webDelete pd20'>\ content: "<div class='bt-form webDelete pd20'>\
<p style='font-size:13px;word-break: break-all;margin-bottom: 5px;'>" + msg + "</p>" + (error || '') + "\
</div>",
<p style='font-size:13px;word-break: break-all;margin-bottom: 5px;'>" + msg + "</p>" + (error || '') + "\
</div>",
yes: function (index, layero) { yes: function (index, layero) {
layer.close(index); layer.close(index);
if (callback) callback(); if (callback) callback();
@ -29,8 +29,8 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
closeBtn: 2, closeBtn: 2,
btn: ['确认', '取消'], btn: ['确认', '取消'],
content: "<div class='bt-form promptDelete pd20'>\ content: "<div class='bt-form promptDelete pd20'>\
<p>" + msg + "</p>\
</div>",
<p>" + msg + "</p>\
</div>",
yes: function (layers, index) { yes: function (layers, index) {
layer.close(layers) layer.close(layers)
if (callback) callback() if (callback) callback()
@ -40,28 +40,53 @@ if("undefined" != typeof bt && bt.hasOwnProperty("prompt_confirm")){
} }
if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){ if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){
bt.compute_confirm = function (config, callback) { bt.compute_confirm = function (config, callback) {
layer.open({
type: 1,
title: config.title,
area: '430px',
closeBtn: 2,
shadeClose: true,
btn: [lan['public'].ok, lan['public'].cancel],
content:
'<div class="bt-form hint_confirm pd30">\
layer.open({
type: 1,
title: config.title,
area: '430px',
closeBtn: 2,
shadeClose: true,
btn: [lan['public'].ok, lan['public'].cancel],
content:
'<div class="bt-form hint_confirm pd30">\
<div class="hint_title">\ <div class="hint_title">\
<i class="hint-confirm-icon"></i>\ <i class="hint-confirm-icon"></i>\
<div class="hint_con">' + <div class="hint_con">' +
config.msg +
'</div>\
config.msg +
'</div>\
</div>\ </div>\
</div>', </div>',
yes: function (layers, index) {
yes: function (layers, index) {
layer.close(layers) layer.close(layers)
if (callback) callback() if (callback) callback()
} }
});
}
});
}
}
if("undefined" != typeof bt && bt.hasOwnProperty("input_confirm")){
bt.input_confirm = function (config, callback) {
layer.open({
type: 1,
title: config.title,
area: '430px',
closeBtn: 2,
shadeClose: true,
btn: [lan['public'].ok, lan['public'].cancel],
content:
'<div class="bt-form hint_confirm pd30">\
<div class="hint_title">\
<i class="hint-confirm-icon"></i>\
<div class="hint_con">' +
config.msg +
'</div>\
</div>\
</div>',
yes: function (layers, index) {
layer.close(layers);
if (callback) callback();
},
});
}
} }
if("undefined" != typeof database && database.hasOwnProperty("del_database")){ if("undefined" != typeof database && database.hasOwnProperty("del_database")){
database.del_database = function (wid, dbname, obj, callback) { database.del_database = function (wid, dbname, obj, callback) {
@ -431,24 +456,24 @@ if("undefined" != typeof bt && bt.hasOwnProperty("firewall") && bt.firewall.hasO
} }
} }
function SafeMessage(j, h, g, f) { function SafeMessage(j, h, g, f) {
if(f == undefined) {
f = ""
}
var mess = layer.open({
type: 1,
title: j,
area: "350px",
closeBtn: 2,
shadeClose: true,
content: "<div class='bt-form webDelete pd20 pb70'><p>" + h + "</p>" + f + "<div class='bt-form-submit-btn'><button type='button' class='btn btn-danger btn-sm bt-cancel'>"+lan.public.cancel+"</button> <button type='button' id='toSubmit' class='btn btn-success btn-sm' >"+lan.public.ok+"</button></div></div>"
});
$(".bt-cancel").click(function(){
layer.close(mess);
});
$("#toSubmit").click(function() {
layer.close(mess);
g();
})
if(f == undefined) {
f = ""
}
var mess = layer.open({
type: 1,
title: j,
area: "350px",
closeBtn: 2,
shadeClose: true,
content: "<div class='bt-form webDelete pd20 pb70'><p>" + h + "</p>" + f + "<div class='bt-form-submit-btn'><button type='button' class='btn btn-danger btn-sm bt-cancel'>"+lan.public.cancel+"</button> <button type='button' id='toSubmit' class='btn btn-success btn-sm' >"+lan.public.ok+"</button></div></div>"
});
$(".bt-cancel").click(function(){
layer.close(mess);
});
$("#toSubmit").click(function() {
layer.close(mess);
g();
})
} }
$(document).ready(function () { $(document).ready(function () {
if($('#updata_pro_info').length>0){ if($('#updata_pro_info').length>0){

2
wiki/update.md

@ -57,8 +57,6 @@
__set_pyenv方法内,temp_file = public.readFile(filename)这行代码下面加上 __set_pyenv方法内,temp_file = public.readFile(filename)这行代码下面加上
```python ```python
temp_file = temp_file.replace('wget -O Tpublic.sh', '#wget -O Tpublic.sh')
temp_file = temp_file.replace('\cp -rpa Tpublic.sh', '#\cp -rpa Tpublic.sh')
temp_file = temp_file.replace('http://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh') temp_file = temp_file.replace('http://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
temp_file = temp_file.replace('https://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh') temp_file = temp_file.replace('https://download.bt.cn/install/public.sh', 'http://www.example.com/install/public.sh')
``` ```

Loading…
Cancel
Save