"); - WebSocketEntity entity = new WebSocketEntity(); - entity.setSend(WebSocketEnums.SEND_TP_LOGGING.getCode()); - entity.setData(result); - WebSocketOnline.sendMessage(socketSessionId, JSONUtil.toJsonStr(entity)); - - //休眠一秒 - Thread.sleep(Long.parseLong(ParamUtils.getReadInterval())); - } catch (Exception e) { - logger.error("读取日志异常：{}", ErrorUtil.errorInfoToString(e)); - } finally { - try { - assert reader != null; - reader.close(); - } catch (IOException ioe) { - logger.error("字符流关闭异常：{}", ErrorUtil.errorInfoToString(ioe)); - } - } - } - } catch (Exception e) { - logger.error("读取日志异常：{}", ErrorUtil.errorInfoToString(e)); - } - }).start(); - } -} diff --git a/src/main/java/cn/somkit/fmt/utils/LoggerQueue.java b/src/main/java/cn/somkit/fmt/utils/LoggerQueue.java new file mode 100644 index 0000000..07754d7 --- /dev/null +++ b/src/main/java/cn/somkit/fmt/utils/LoggerQueue.java @@ -0,0 +1,28 @@ +package cn.somkit.fmt.utils; + +import cn.somkit.fmt.entity.LoggerMessage; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; + +public final class LoggerQueue { + private static final LoggerQueue INSTANCE = new LoggerQueue(); + private final BlockingQueue
- * 代码示例：
- * let FmtSocket = new FmtSocket(
- * {url:'websocket服务器地址',id:'唯一标识',timeout:心跳检测间隔时间(毫秒)}
- * );
- * //调用初始化方法
- * FmtSocket.init((data) => {
- * //初始化完成之后的回调函数 ata为监听到的数据
- * //可以在这里做接收到消息后的逻辑处理
- * console.log(data);
- * });
- * //调用发送消息方法 message 消息字符串或对象
- * FmtSocket.sendMsg(message, () => {
- * //发送消息成功之后的回调函数
- * });
- *
- */
-class FmtSocket {
- id;
- #options;
- #ws;
- #entity;
- #deepProxyObj;
- #proxyMsg;
- /**
- * 构造函数
- * @param {Object} options
- */
- constructor(options) {
- this.#options = this.#extend({
- url: 'http://127.0.0.1/socket/ws',//后台websocket服务地址
- id: this.#uuid(),//如果没传此参数，创建一个随机的UUID传给后台服务作为标识
- timeout: 30000 //心跳检测间隔时间 默认30秒
- }, options);
- this.id = this.#options.id;
- this.#ws = null;
- //send:发送类型 HeartBeat:心跳 Logging:消息
- this.#entity = {send: null, data: null};
- }
-
- /**
- * 初始化websocket
- * @param {Function} callback (type, data) 回调函数
- */
- init(callback){
- if(callback && typeof callback === 'function'){
- this.#proxyMsg = [];
- this.#deepProxyObj = this.#deepProxy(this.#proxyMsg,callback);
- }
- this.#createWebSocket();
- }
- /**
- * 对象、数组变化监听(增删改)
- * @param {Object} obj
- * @param {Function} callback
- * @return {Object}
- */
- #deepProxy(obj, callback){
- if (typeof obj === 'object') {
- for (let key in obj) {
- if (typeof obj[key] === 'object') {
- obj[key] = this.#deepProxy(obj[key], callback);
- }
- }
- }
- return new Proxy(obj, {
- /**
- * @param {Object, Array} target 设置值的对象
- * @param {String} key 属性
- * @param {any} value 值
- * @param {Object} receiver this
- */
- set: (target, key, value, receiver)=> {
- if (typeof value === 'object') {
- value = this.#deepProxy(value, callback);
- }
- let cbType = target[key] === undefined ? 'create' : 'modify';
- //排除数组修改length回调
- if (!(Array.isArray(target) && key === 'length')) {
- if (cbType === 'create') {
- callback(value);
- }
- }
- return Reflect.set(target, key, value, receiver);
- },
- deleteProperty(target, key) {
- return Reflect.deleteProperty(target, key);
- }
- });
- }
- #createWebSocket(){
- try {
- if ('WebSocket' in window) {
- this.#ws = new WebSocket((this.#options.url + "?id=" + this.#options.id)
- .replace("http", "ws")
- .replace("https", "wss"));
- } else {
- alert('浏览器不支持WebSocket通讯');
- return false;
- }
- this.#onopen();
- this.#onmessage();
- this.#onerror();
- this.#onclose();
- //监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
- window.onbeforeunload = ()=> {
- this.#ws.close();
- };
- } catch (e) {
- console.log("WebSocket:链接失败", e);
- alert('WebSocket:链接失败');
- }
- }
- /**
- * 关闭websocket链接
- * @param {Function} callback
- */
- closeWebSocket(callback){
- if(this.#ws){
- this.#ws.close();
- }
- if(callback && typeof callback === 'function'){
- callback();
- }
- }
- /**
- * 发送消息
- * @param {String, Object} message
- * @param {Function} callback
- */
- sendMsg(message, callback){
- if(!message || typeof message !== 'string' || typeof message !== 'object'){
- alert("FmtSocket sendMsg message is not null or message is not a string or object");
- return false;
- }
- if(callback && typeof callback !== 'function'){
- alert("FmtSocket sendMsg callback is not a function");
- return false;
- }
- this.#emptyObjectPropertyValues(this.#entity);
- this.#entity.send = 'Message';
- this.#entity.data = message;
- if (this.#ws.readyState === this.#ws.CONNECTING) {
- // 正在开启状态，等待1s后重新调用
- let socket = this;
- setTimeout(function () {
- socket.#ws.send(JSON.stringify(socket.#entity));
- callback();
- }, 1000)
- }else{
- this.#ws.send(JSON.stringify(this.#entity));
- callback();
- }
- }
- #onopen(){
- this.#ws.onopen = (event) => {
- console.log("WebSocket:链接开启");
- }
- }
- #onmessage(){
- this.#ws.onmessage = (event) => {
- this.#emptyObjectPropertyValues(this.#entity);
- this.#entity = JSON.parse(event.data);
- //心跳检测
- if(this.#entity.send === 'HeartBeat'){
- this.#heartBeat();
- }
- if(this.#deepProxyObj){
- this.#deepProxyObj.splice(0);//赋值前先清空，保证消息数组里只有一条最新的数据
- let data = JSON.parse(JSON.stringify(this.#entity));
- this.#deepProxyObj.push(data);
- }
- }
- }
- #onerror(){
- this.#ws.onerror = (event) => {
- console.log("WebSocket:发生错误", event);
- }
- }
- #onclose(){
- this.#ws.onclose = (event) => {
- console.log("WebSocket:链接关闭");
- }
- }
- #heartBeat(){
- setTimeout(()=> {
- this.#emptyObjectPropertyValues(this.#entity);
- if (this.#ws.readyState === this.#ws.CLOSING
- || this.#ws.readyState === this.#ws.CLOSED){
- alert("WebSocket通讯服务链接已关闭");
- return false;
- }
- this.#entity.send = 'HeartBeat';
- this.#entity.data = '心跳检测';
- if (this.#ws.readyState === this.#ws.CONNECTING) {
- // 正在开启状态，等待1s后重新调用
- setTimeout(()=> {
- this.#ws.send(JSON.stringify(this.#entity));
- }, 1000)
- }else{
- this.#ws.send(JSON.stringify(this.#entity));
- }
- },this.#options.timeout);
- }
- /**
- * 扩展，source相同属性的值去覆盖target, target如果没有这个属性就新增
- * @param {Object} target
- * @param {Object} source
- * @returns {Object}
- */
- #extend(target, source){
- if(typeof target !== 'object') return null;
- if(typeof source !== 'object') return null;
- for (const key in source) {
- // 使用for in会遍历数组所有的可枚举属性，包括原型。
- if (Object.prototype.hasOwnProperty.call(source, key)) {
- target[key] = source[key];
- }
- }
- return target;
- }
- #uuid(len, radix){
- const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
- let uuid = [], i;
- radix = radix || chars.length;
- if (len) {
- // Compact form
- for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
- } else {
- // rfc4122, version 4 form
- let r;
- // rfc4122 requires these characters
- uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
- uuid[14] = '4';
- // Fill in random data. At i==19 set the high bits of clock sequence as
- // per rfc4122, sec. 4.1.5
- for (i = 0; i < 36; i++) {
- if (!uuid[i]) {
- r = 0 | Math.random() * 16;
- uuid[i] = chars[(i === 19) ? (r & 0x3) | 0x8 : r];
- }
- }
- }
- return uuid.join('');
- }
- #emptyObjectPropertyValues(person){
- Object.keys(person).forEach(key => (person[key] = null));
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/templates/download.html b/src/main/resources/templates/download.html
index dbd5214..180062b 100644
--- a/src/main/resources/templates/download.html
+++ b/src/main/resources/templates/download.html
@@ -40,7 +40,7 @@
diff --git a/src/main/resources/templates/logging.html b/src/main/resources/templates/logging.html
index 0ea0d26..3a31b6c 100644
--- a/src/main/resources/templates/logging.html
+++ b/src/main/resources/templates/logging.html
@@ -1,66 +1,72 @@
-
+
-
-
-
-
-
-
-
-
-
+
在线日志
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
diff --git a/src/main/resources/templates/upload.html b/src/main/resources/templates/upload.html
index 893e4fe..0254c11 100644
--- a/src/main/resources/templates/upload.html
+++ b/src/main/resources/templates/upload.html
@@ -33,7 +33,7 @@
diff --git a/src/test/java/cn/somkit/fmt/FmtApplicationTests.java b/src/test/java/cn/somkit/fmt/FmtApplicationTests.java
deleted file mode 100644
index 02d4233..0000000
--- a/src/test/java/cn/somkit/fmt/FmtApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.somkit.fmt;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class FmtApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}