优化ipu-stomp.js

2020/stomp/js/biz/canvas-login.js

@@ -37,7 +37,7 @@ require(["jquery", "ipu-stomp"], function($, IpuStomp,) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/biz/canvas-show.js

@@ -38,7 +38,7 @@ require(["jquery", "ipu-stomp"], function($, IpuStomp) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/biz/im-sockjs.js

@@ -28,7 +28,7 @@ require([ "jquery", "ipu-stomp" ], function($, IpuStomp) {
					alert("请填写用户名")
					return;
				}
				client = IpuStomp.connect(baseUrl, callbacks);
				client = IpuStomp.connect({url:baseUrl}, callbacks);
				client.setTopicPath("topic");
				$("#connBtn").val("断开连接");
				$("#connBtn").attr("id", "disconnBtn");

2020/stomp/js/biz/im-stomp.js

@@ -37,7 +37,7 @@ require([ "jquery", "ipu-stomp" ], function($, IpuStomp) {
					alert("请填写用户名")
					return;
				}
				client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
				client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
				client.setTopicPath("topic");
				
			} else {

2020/stomp/js/biz/map-login.js

@@ -37,7 +37,7 @@ require(["jquery", "ipu-stomp"], function($, IpuStomp,) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/biz/map-show.js

@@ -38,7 +38,7 @@ require(["jquery", "ipu-stomp"], function($, IpuStomp) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/biz/md-login.js

@@ -50,7 +50,7 @@ require(deps, function($, IpuStomp, editormd) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/biz/md.js

@@ -50,7 +50,7 @@ require(deps, function($, IpuStomp, editormd) {
            alert("请填写用户名")
            return;
          }
          client = IpuStomp.connect(baseUrl, login, passcode, callbacks, host);
          client = IpuStomp.connect({url:baseUrl,name:login,passcode:passcode,host:host}, callbacks);
          client.setTopicPath("topic");
          
        } else {

2020/stomp/js/lib/ipu-stomp.js

@@ -1,48 +1,71 @@
define(["sockjs", "stomp", "uuid"],function(SockJS, Stomp, UUID) {
    var IpuStomp = {};
    IpuStomp.connect = function(url, login, passcode, callbacks, host){
    	if(url.startsWith("http")||url.startsWith("https")){
    		return connectWithSockJS(url, login, passcode, callbacks, host); //SockJS支持http和https前缀
    	}else {
    		return connectWithStomp(url, login, passcode, callbacks, host); //SockJS支持ws前缀
    	}
    }
    
    function connectWithStomp(url, login, passcode, callbacks, host){
    	var onConnected, onFailure;
    IpuStomp.connect = function(params,callbacks){
        var onConnected, onFailure;
        if(callbacks){
        	/*供stomp.js中做判断：args[1] instanceof Function*/
        	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
            /*供stomp.js中做判断：args[1] instanceof Function*/
            onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
            onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
        }else{
        	onConnected = new Function();
        	onFailure = new Function();
            onConnected = new Function();
            onFailure = new Function();
        }
        var client = Stomp.client(url);
        var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
        client.connect(headers, onConnected, onFailure);
        return new StompClient(client);
    }
    
    function connectWithSockJS(url, login, passcode, callbacks, host){
    	var onConnected, onFailure;
        if(callbacks){
        	/*供stomp.js中做判断：args[1] instanceof Function*/
        	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
            onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
        }else{
        	onConnected = new Function();
        	onFailure = new Function();
        var client;
        if(params.url.startsWith("http")||params.url.startsWith("https")){//SockJS支持http和https前缀
            var socket = new SockJS(params.url);
            client = Stomp.over(socket);
        } else {                                                            //SockJS支持ws前缀
            client = Stomp.client(params.url);
        }
    	
    	var socket = new SockJS(url);
        var client = Stomp.over(socket);
        var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
        var headers = {"name":params.name,"passcode":params.passcode,"host":params.host,"uuid":(params.UUID?params.UUID:UUID)};
        client.connect(headers, onConnected, onFailure);
        return new StompClient(client);
    }
    // IpuStomp.connect = function(url, login, passcode, callbacks, host){
    // 	if(url.startsWith("http")||url.startsWith("https")){
    // 		return connectWithSockJS(url, login, passcode, callbacks, host); //SockJS支持http和https前缀
    // 	}else {
    // 		return connectWithStomp(url, login, passcode, callbacks, host); //SockJS支持ws前缀
    // 	}
    // }
    //
    // function connectWithStomp(url, login, passcode, callbacks, host){
    // 	var onConnected, onFailure;
    //     if(callbacks){
    //     	/*供stomp.js中做判断：args[1] instanceof Function*/
    //     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
    //         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
    //     }else{
    //     	onConnected = new Function();
    //     	onFailure = new Function();
    //     }
    //     var client = Stomp.client(url);
    //     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
    //     client.connect(headers, onConnected, onFailure);
    //     return new StompClient(client);
    // }
    //
    // function connectWithSockJS(url, login, passcode, callbacks, host){
    // 	var onConnected, onFailure;
    //     if(callbacks){
    //     	/*供stomp.js中做判断：args[1] instanceof Function*/
    //     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
    //         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
    //     }else{
    //     	onConnected = new Function();
    //     	onFailure = new Function();
    //     }
    //
    // 	var socket = new SockJS(url);
    //     var client = Stomp.over(socket);
    //     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
    //     client.connect(headers, onConnected, onFailure);
    //     return new StompClient(client);
    // }
    function StompClient(client){
        this.client = client;
    }

2020/stomp/js/lib/stomp.js

@@ -219,14 +219,14 @@ define(function(){
                    if (args[1] instanceof Function) {
                        headers = args[0], connectCallback = args[1], errorCallback = args[2];
                    } else {
                        headers.login = args[0], headers.passcode = args[1], connectCallback = args[2];
                        headers.name = args[0], headers.passcode = args[1], connectCallback = args[2];
                    }
                    break;
                case 4:
                    headers.login = args[0], headers.passcode = args[1], connectCallback = args[2], errorCallback = args[3];
                    headers.name = args[0], headers.passcode = args[1], connectCallback = args[2], errorCallback = args[3];
                    break;
                default:
                    headers.login = args[0], headers.passcode = args[1], connectCallback = args[2], errorCallback = args[3], headers.host = args[4];
                    headers.name = args[0], headers.passcode = args[1], connectCallback = args[2], errorCallback = args[3], headers.host = args[4];
            }
            return [headers, connectCallback, errorCallback];
        };