新增自定义ssr订阅地址
修改http→https
This commit is contained in:
parent
2128d7893f
commit
322e00404c
@ -1,11 +1,12 @@
|
||||
package com.yutou.tools;
|
||||
|
||||
import com.yutou.tools.other.tools;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication
|
||||
public class ToolsApplication {
|
||||
public static final String version="1.4.4.1";
|
||||
public static final String version="1.4.4.4";
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println("当前版本号:" + version);
|
||||
|
||||
@ -152,8 +152,13 @@ public class tools {
|
||||
@RequestMapping(value="/tools/clash/get.do",produces ="text/plain;charset=utf-8")
|
||||
public String getClash(){
|
||||
StringBuilder builder=new StringBuilder();
|
||||
String ssrUrl="https://s.sublink.me/subscribe/49191/IsXYcj95sGg/ssr/";
|
||||
String text= HttpTools.get("https://pub-api-1.bianyuan.xyz/sub?url="+ URLEncoder.encode(ssrUrl, StandardCharsets.UTF_8) +"&insert=false&config=https%3A%2F%2Fraw.githubusercontent.com%2FDarkatse%2FACL4SSR%2Fmaster%2FClash%2Fconfig%2FACL4SSR_Online.ini&target=clash");
|
||||
String ssrUrl=RedisTools.get("ssr");
|
||||
String url="http://127.0.0.1:25500/sub?target=clash&new_name=true&url="+URLEncoder.encode(ssrUrl, StandardCharsets.UTF_8) +"&insert=false&config=http%3A%2F%2Fgit.yutou233.cn%2Fyutou%2FACL4SSR%2Fsrc%2Fmaster%2FClash%2Fconfig%2FACL4SSR.ini";
|
||||
String text= HttpTools.get(url);
|
||||
if(text==null){
|
||||
System.out.println("ssr is Null = " + url);
|
||||
return "";
|
||||
}
|
||||
String[] tmp=text.split("\n");
|
||||
text=RedisTools.get("clash");
|
||||
builder.append("mixed-port: 7890").append("\n");
|
||||
@ -174,6 +179,22 @@ public class tools {
|
||||
return builder.toString();
|
||||
}
|
||||
@ResponseBody
|
||||
@RequestMapping("/tools/clash/ssr.do")
|
||||
public JSONObject setClashSSR(String url){
|
||||
RedisTools.set("ssr",url);
|
||||
JSONObject json=new JSONObject();
|
||||
json.put("msg","OK~");
|
||||
return json;
|
||||
}
|
||||
@ResponseBody
|
||||
@RequestMapping("/tools/clash/getssr.do")
|
||||
public JSONObject getClashSSR(){
|
||||
JSONObject json=new JSONObject();
|
||||
json.put("code",0);
|
||||
json.put("data",RedisTools.get("ssr"));
|
||||
return json;
|
||||
}
|
||||
@ResponseBody
|
||||
@RequestMapping("/tools/clash/list.do")
|
||||
public JSONObject clashList(){
|
||||
String text=RedisTools.get("clash");
|
||||
|
||||
@ -72,7 +72,7 @@ public class userController {
|
||||
RedisTools.set("login", cc, 5 * 60 * 1000);
|
||||
String token = UUID.randomUUID().toString().replace("-", "");
|
||||
RedisTools.set(token, Tools.getRemoteAddress(request), 10 * 60 * 1000);
|
||||
String url = "http://tools.yutou233.cn/login/ban.do?token=" + token;
|
||||
String url = "https://tools.yutou233.cn/login/ban.do?token=" + token;
|
||||
Tools.sendServer("管理后台登录验证码", "本次登录验证码为:" + cc
|
||||
+ ",登录IP:" + Tools.getRemoteAddress(request)
|
||||
+ ",非正常登录，封禁IP:" + url);*/
|
||||
@ -108,7 +108,7 @@ public class userController {
|
||||
RedisTools.set("ban", array.toJSONString());
|
||||
writer.write("已封禁");
|
||||
} else {
|
||||
String url = "http://tools.yutou233.cn/login/ban.do?token=" + token + "&model=yes";
|
||||
String url = "https://tools.yutou233.cn/login/ban.do?token=" + token + "&model=yes";
|
||||
String html = "<div><a href=" + url + ">click my is ban this IP :" + ip + "</a></div>";
|
||||
writer.write(html);
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
}
|
||||
localhost = json.data ;
|
||||
if (localhost === 'http://null:8000' || localhost === ":8000") {
|
||||
localhost = "http://"+window.location.host;
|
||||
localhost = "https://"+window.location.host;
|
||||
}
|
||||
} catch (e) {
|
||||
localhost = ""
|
||||
@ -189,7 +189,7 @@
|
||||
if(json.code===0){
|
||||
layer.prompt({
|
||||
title:"分享链接",
|
||||
value:"http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
|
||||
value:"https://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
|
||||
},function (value,index,elem){
|
||||
layer.close(index);
|
||||
})
|
||||
@ -258,7 +258,7 @@
|
||||
if(json.code===0){
|
||||
layer.prompt({
|
||||
title:"分享链接",
|
||||
value:"http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
|
||||
value:"https://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
@ -13,6 +13,12 @@
|
||||
<div id="header"></div>
|
||||
<div class="layui-body" style="left: 200px;">
|
||||
<div id="side"></div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">ssr订阅地址</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" id="ssr" required lay-verify="required" placeholder="请输入订阅地址,回车提交" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
<table id="oss" lay-filter="myOssFilter"></table>
|
||||
<div id="footer"></div>
|
||||
</div>
|
||||
@ -73,7 +79,7 @@
|
||||
} else if(obj.event === 'showUrl'){
|
||||
layer.prompt({
|
||||
formType: 2,
|
||||
value: 'http://'+window.location.host+'/tools/clash/get.do?token=X9C2h61pDI7KFa0kaHNITjlCY7bbIFN0',
|
||||
value: 'https://'+window.location.host+'/tools/clash/get.do?token=X9C2h61pDI7KFa0kaHNITjlCY7bbIFN0',
|
||||
title: '请输入地址',
|
||||
}, function (path, index, elem) {
|
||||
$.post('/tools/clash/add.do', {'url': path}, function (json) {
|
||||
@ -87,7 +93,18 @@
|
||||
|
||||
})
|
||||
|
||||
|
||||
$('#ssr').keyup(function (event) {
|
||||
if(event.keyCode===13){
|
||||
$.post("/tools/clash/ssr.do?url="+$('#ssr')[0].value,function (json) {
|
||||
layer.msg(json.msg)
|
||||
})
|
||||
}
|
||||
})
|
||||
$.get("/tools/clash/getssr.do",function(json){
|
||||
if(json.code===0){
|
||||
$('#ssr')[0].value=json.data
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
$('#header').load("/html/header.html");
|
||||
|
||||
219
web/js/recordmp3.js
Normal file
219
web/js/recordmp3.js
Normal file
@ -0,0 +1,219 @@
|
||||
(function(window){
|
||||
|
||||
var WORKER_PATH = '/js/recorderWorker.js';
|
||||
var encoderWorker = new Worker('/js/mp3Worker.js');
|
||||
|
||||
var Recorder = function(source, cfg){
|
||||
var config = cfg || {};
|
||||
var bufferLen = config.bufferLen || 4096;
|
||||
var numChannels = config.numChannels || 2;
|
||||
this.context = source.context;
|
||||
this.node = (this.context.createScriptProcessor ||
|
||||
this.context.createJavaScriptNode).call(this.context,
|
||||
bufferLen, numChannels, numChannels);
|
||||
var worker = new Worker(config.workerPath || WORKER_PATH);
|
||||
worker.postMessage({
|
||||
command: 'init',
|
||||
config: {
|
||||
sampleRate: this.context.sampleRate,
|
||||
numChannels: numChannels
|
||||
}
|
||||
});
|
||||
var recording = false,
|
||||
currCallback;
|
||||
|
||||
this.node.onaudioprocess = function(e){
|
||||
if (!recording) return;
|
||||
var buffer = [];
|
||||
for (var channel = 0; channel < numChannels; channel++){
|
||||
buffer.push(e.inputBuffer.getChannelData(channel));
|
||||
}
|
||||
worker.postMessage({
|
||||
command: 'record',
|
||||
buffer: buffer
|
||||
});
|
||||
}
|
||||
|
||||
this.configure = function(cfg){
|
||||
for (var prop in cfg){
|
||||
if (cfg.hasOwnProperty(prop)){
|
||||
config[prop] = cfg[prop];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.record = function(){
|
||||
recording = true;
|
||||
}
|
||||
|
||||
this.stop = function(){
|
||||
recording = false;
|
||||
}
|
||||
|
||||
this.clear = function(){
|
||||
worker.postMessage({ command: 'clear' });
|
||||
}
|
||||
|
||||
this.getBuffer = function(cb) {
|
||||
currCallback = cb || config.callback;
|
||||
worker.postMessage({ command: 'getBuffer' })
|
||||
}
|
||||
|
||||
this.exportWAV = function(cb, type){
|
||||
currCallback = cb || config.callback;
|
||||
type = type || config.type || 'audio/wav';
|
||||
if (!currCallback) throw new Error('Callback not set');
|
||||
worker.postMessage({
|
||||
command: 'exportWAV',
|
||||
type: type
|
||||
});
|
||||
}
|
||||
|
||||
//Mp3 conversion
|
||||
worker.onmessage = function(e){
|
||||
var blob = e.data;
|
||||
//console.log("the blob " + blob + " " + blob.size + " " + blob.type);
|
||||
|
||||
var arrayBuffer;
|
||||
var fileReader = new FileReader();
|
||||
|
||||
fileReader.onload = function(){
|
||||
arrayBuffer = this.result;
|
||||
var buffer = new Uint8Array(arrayBuffer),
|
||||
data = parseWav(buffer);
|
||||
|
||||
console.log(data);
|
||||
console.log("Converting to Mp3");
|
||||
//log.innerHTML += "\n" + "Converting to Mp3";
|
||||
|
||||
encoderWorker.postMessage({ cmd: 'init', config:{
|
||||
mode : 3,
|
||||
channels:1,
|
||||
samplerate: data.sampleRate,
|
||||
bitrate: data.bitsPerSample
|
||||
}});
|
||||
|
||||
encoderWorker.postMessage({ cmd: 'encode', buf: Uint8ArrayToFloat32Array(data.samples) });
|
||||
encoderWorker.postMessage({ cmd: 'finish'});
|
||||
encoderWorker.onmessage = function(e) {
|
||||
if (e.data.cmd == 'data') {
|
||||
|
||||
console.log("Done converting to Mp3");
|
||||
//log.innerHTML += "\n" + "Done converting to Mp3";
|
||||
|
||||
/*var audio = new Audio();
|
||||
audio.src = 'data:audio/mp3;base64,'+encode64(e.data.buf);
|
||||
audio.play();*/
|
||||
|
||||
//console.log ("The Mp3 data " + e.data.buf);
|
||||
|
||||
var mp3Blob = new Blob([new Uint8Array(e.data.buf)], {type: 'audio/mp3'});
|
||||
uploadAudio(mp3Blob);
|
||||
|
||||
var url = 'data:audio/mp3;base64,'+encode64(e.data.buf);
|
||||
var li = document.createElement('li');
|
||||
var au = document.createElement('audio');
|
||||
var hf = document.createElement('a');
|
||||
|
||||
au.controls = true;
|
||||
au.src = url;
|
||||
hf.href = url;
|
||||
hf.download = 'audio_recording_' + new Date().getTime() + '.mp3';
|
||||
hf.innerHTML = hf.download;
|
||||
li.appendChild(au);
|
||||
li.appendChild(hf);
|
||||
recordingslist.appendChild(li);
|
||||
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
fileReader.readAsArrayBuffer(blob);
|
||||
|
||||
currCallback(blob);
|
||||
}
|
||||
|
||||
|
||||
function encode64(buffer) {
|
||||
var binary = '',
|
||||
bytes = new Uint8Array( buffer ),
|
||||
len = bytes.byteLength;
|
||||
|
||||
for (var i = 0; i < len; i++) {
|
||||
binary += String.fromCharCode( bytes[ i ] );
|
||||
}
|
||||
return window.btoa( binary );
|
||||
}
|
||||
|
||||
function parseWav(wav) {
|
||||
function readInt(i, bytes) {
|
||||
var ret = 0,
|
||||
shft = 0;
|
||||
|
||||
while (bytes) {
|
||||
ret += wav[i] << shft;
|
||||
shft += 8;
|
||||
i++;
|
||||
bytes--;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
if (readInt(20, 2) != 1) throw 'Invalid compression code, not PCM';
|
||||
if (readInt(22, 2) != 1) throw 'Invalid number of channels, not 1';
|
||||
return {
|
||||
sampleRate: readInt(24, 4),
|
||||
bitsPerSample: readInt(34, 2),
|
||||
samples: wav.subarray(44)
|
||||
};
|
||||
}
|
||||
|
||||
function Uint8ArrayToFloat32Array(u8a){
|
||||
var f32Buffer = new Float32Array(u8a.length);
|
||||
for (var i = 0; i < u8a.length; i++) {
|
||||
var value = u8a[i<<1] + (u8a[(i<<1)+1]<<8);
|
||||
if (value >= 0x8000) value |= ~0x7FFF;
|
||||
f32Buffer[i] = value / 0x8000;
|
||||
}
|
||||
return f32Buffer;
|
||||
}
|
||||
|
||||
function uploadAudio(mp3Data){
|
||||
var reader = new FileReader();
|
||||
reader.onload = function(event){
|
||||
var fd = new FormData();
|
||||
var mp3Name = encodeURIComponent('audio_recording_' + new Date().getTime() + '.mp3');
|
||||
console.log("mp3name = " + mp3Name);
|
||||
fd.append('fname', mp3Name);
|
||||
fd.append('data', event.target.result);
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: 'upload.php',
|
||||
data: fd,
|
||||
processData: false,
|
||||
contentType: false
|
||||
}).done(function(data) {
|
||||
//console.log(data);
|
||||
log.innerHTML += "\n" + data;
|
||||
});
|
||||
};
|
||||
reader.readAsDataURL(mp3Data);
|
||||
}
|
||||
|
||||
source.connect(this.node);
|
||||
this.node.connect(this.context.destination); //this should not be necessary
|
||||
};
|
||||
|
||||
/*Recorder.forceDownload = function(blob, filename){
|
||||
console.log("Force download");
|
||||
var url = (window.URL || window.webkitURL).createObjectURL(blob);
|
||||
var link = window.document.createElement('a');
|
||||
link.href = url;
|
||||
link.download = filename || 'output.wav';
|
||||
var click = document.createEvent("Event");
|
||||
click.initEvent("click", true, true);
|
||||
link.dispatchEvent(click);
|
||||
}*/
|
||||
|
||||
window.Recorder = Recorder;
|
||||
|
||||
})(window);
|
||||
Loading…
Reference in New Issue
Block a user