im-ui更名为im-web

.gitignore

@@ -9,10 +9,10 @@
 /im-server/src/main/resources/logback-prod.xml
 /im-commom/im-commom.iml
 /im-uniapp/node_modules/
-/im-ui/package-lock.json
+/im-web/package-lock.json
 /im-uniapp/unpackage/
 /im-uniapp/hybrid/
 /im-uniapp/package-lock.json
-/im-ui/src/components/rtc/LocalVideo.vue
-/im-ui/src/components/rtc/RemoteVideo.vue
-/im-ui/src/components/rtc/RtcGroupAcceptor.vue
+/im-web/src/components/rtc/LocalVideo.vue
+/im-web/src/components/rtc/RemoteVideo.vue
+/im-web/src/components/rtc/RtcGroupAcceptor.vue

im-ui/.gitignore

@@ -1,26 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-# 
-package-lock.json

im-ui/README.md → im-web/README.md

@@ -1,24 +1,24 @@
-# web
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Lints and fixes files
-```
-npm run lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+# web
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

im-ui/babel.config.js → im-web/babel.config.js

@@ -1,5 +1,5 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}

im-ui/package.json → im-web/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "boxim",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "axios": "^1.1.3",
-    "core-js": "^3.6.5",
-    "element-ui": "^2.15.10",
-    "js-audio-recorder": "^1.0.7",
-    "localforage": "^1.10.0",
-    "sass": "^1.47.0",
-    "sass-loader": "^10.1.1",
-    "vue": "^2.6.11",
-    "vue-axios": "^3.5.0",
-    "vue-router": "^3.3.3",
-    "vuex": "^3.6.2",
-    "vuex-persist": "^3.1.3"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.12",
-    "@vue/cli-plugin-eslint": "~4.5.12",
-    "@vue/cli-service": "~4.5.12",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {
-      "no-mixed-spaces-and-tabs": 0,
-      "generator-star-spacing": "off",
-      "no-tabs": "off",
-      "no-unused-vars": "off",
-      "no-unused-labels": "off",
-      "no-console": "off",
-      "vue/no-unused-components": "off",
-      "no-irregular-whitespace": "off",
-      "no-debugger": "off",
-      "no-useless-escape": "off"
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
+{
+  "name": "boxim",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "axios": "^1.1.3",
+    "core-js": "^3.6.5",
+    "element-ui": "^2.15.10",
+    "js-audio-recorder": "^1.0.7",
+    "localforage": "^1.10.0",
+    "sass": "^1.47.0",
+    "sass-loader": "^10.1.1",
+    "vue": "^2.6.11",
+    "vue-axios": "^3.5.0",
+    "vue-router": "^3.3.3",
+    "vuex": "^3.6.2",
+    "vuex-persist": "^3.1.3"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.5.12",
+    "@vue/cli-plugin-eslint": "~4.5.12",
+    "@vue/cli-service": "~4.5.12",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "babel-eslint"
+    },
+    "rules": {
+      "no-mixed-spaces-and-tabs": 0,
+      "generator-star-spacing": "off",
+      "no-tabs": "off",
+      "no-unused-vars": "off",
+      "no-unused-labels": "off",
+      "no-console": "off",
+      "vue/no-unused-components": "off",
+      "no-irregular-whitespace": "off",
+      "no-debugger": "off",
+      "no-useless-escape": "off"
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
+}

im-ui/public/index.html → im-web/public/index.html

@@ -1,13 +1,13 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>盒子IM</title>
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>logo.png">
+    <title>盒子IM</title>
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

im-ui/src/App.vue → im-web/src/App.vue

@@ -1,115 +1,115 @@
-<template>
-	<div id="app">
-		<router-view></router-view>
-	</div>
-</template>
-
-<script>
-	export default {
-		name: 'App',
-		components: {}
-	}
-</script>
-
-<style lang="scss">
-@import './assets/style/global.css';
-
-#app {
-	font-family: 'Avenir', Helvetica, Arial, sans-serif;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	position: absolute;
-	height: 100%;
-	width: 100%;
-}
-
-.el-message {
-	z-index: 99999999 !important;
-}
-
-.el-scrollbar__thumb {
-	background-color: #A0A8AF !important;
-}
-
-.el-dialog {
-	border-radius: 8px !important;
-	overflow: hidden !important;
-}
-
-.el-dialog__header {
-	background-color: #5870e6 !important;
-	
-}
-
-.el-dialog__title {
-	color: #f8f8f8 !important;
-}
-
-.el-dialog__close {
-	color: white !important;
-	font-size: 20px;
-}
-
-.el-checkbox__inner {
-	border-radius: 50% !important;
-}
-
-.el-input__inner {
-	border-radius: 5px !important;
-	border: #587FF0 1px solid !important;
-}
-
-.el-textarea__inner{
-	border-radius: 5px !important;
-	border: #587FF0 1px solid !important;
-}
-
-.el-icon-search {
-	color:#587FF0 !important;
-}
-
+<template>
+	<div id="app">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: 'App',
+		components: {}
+	}
+</script>
+
+<style lang="scss">
+@import './assets/style/global.css';
+
+#app {
+	font-family: 'Avenir', Helvetica, Arial, sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	position: absolute;
+	height: 100%;
+	width: 100%;
+}
+
+.el-message {
+	z-index: 99999999 !important;
+}
+
+.el-scrollbar__thumb {
+	background-color: #A0A8AF !important;
+}
+
+.el-dialog {
+	border-radius: 8px !important;
+	overflow: hidden !important;
+}
+
+.el-dialog__header {
+	background-color: #5870e6 !important;
+	
+}
+
+.el-dialog__title {
+	color: #f8f8f8 !important;
+}
+
+.el-dialog__close {
+	color: white !important;
+	font-size: 20px;
+}
+
+.el-checkbox__inner {
+	border-radius: 50% !important;
+}
+
+.el-input__inner {
+	border-radius: 5px !important;
+	border: #587FF0 1px solid !important;
+}
+
+.el-textarea__inner{
+	border-radius: 5px !important;
+	border: #587FF0 1px solid !important;
+}
+
+.el-icon-search {
+	color:#587FF0 !important;
+}
+
 .el-button--primary {
-    background-color: #687Ff0 !important;
-	border-color: #687Ff0 !important;
-}
-
-.el-button--success {
-	background-color: #4cae1b !important;
-	border-color: #4cae1b !important;
-}
-.el-button--danger {
-	background-color: #ea4949 !important;
-	border-color: #ea4949 !important;
-}
-
-.el-button {
-	padding: 8px 15px !important;
-}
-
-.el-checkbox {
-	display: flex;
-	align-items: center;
-
-	//修改选中框的大小
-	.el-checkbox__inner {
-		width: 20px;
-		height: 20px;
-
-		//修改选中框中的对勾的大小和位置
-		&::after {
-			height: 12px;
-			left: 7px;
-		}
-	}
-
-	//修改点击文字颜色不变
-	.el-checkbox__input.is-checked+.el-checkbox__label {
-		color: #333333;
-	}
-
-	.el-checkbox__label {
-		line-height: 20px;
-		padding-left: 8px;
-	}
-}
+    background-color: #687Ff0 !important;
+	border-color: #687Ff0 !important;
+}
+
+.el-button--success {
+	background-color: #4cae1b !important;
+	border-color: #4cae1b !important;
+}
+.el-button--danger {
+	background-color: #ea4949 !important;
+	border-color: #ea4949 !important;
+}
+
+.el-button {
+	padding: 8px 15px !important;
+}
+
+.el-checkbox {
+	display: flex;
+	align-items: center;
+
+	//修改选中框的大小
+	.el-checkbox__inner {
+		width: 20px;
+		height: 20px;
+
+		//修改选中框中的对勾的大小和位置
+		&::after {
+			height: 12px;
+			left: 7px;
+		}
+	}
+
+	//修改点击文字颜色不变
+	.el-checkbox__input.is-checked+.el-checkbox__label {
+		color: #333333;
+	}
+
+	.el-checkbox__label {
+		line-height: 20px;
+		padding-left: 8px;
+	}
+}
 </style>

im-ui/src/api/wssocket.js → im-web/src/api/wssocket.js

@@ -1,145 +1,145 @@
-var websock = null;
-let rec; //断线重连后，延迟5秒重新创建WebSocket连接  rec用来存储延迟请求的代码
-let isConnect = false; //连接标识 避免重复连接
-let connectCallBack= null;
-let messageCallBack = null;
-let closeCallBack = null
-
-
-let connect = (wsurl,accessToken) => {
-	try {
-		if (isConnect) {
-			return;
-		}
-		console.log("连接WebSocket");
-		websock = new WebSocket(wsurl); 
-		websock.onmessage = function(e) {
-			let sendInfo = JSON.parse(e.data)
-			if (sendInfo.cmd == 0) {	
-				heartCheck.start()
-				// 登录成功才算真正完成连接
-				connectCallBack && connectCallBack();
-				console.log('WebSocket登录成功')
-			} else if (sendInfo.cmd == 1) {
-				// 重新开启心跳定时
-				heartCheck.reset();
-			} else {
-				// 其他消息转发出去
-				console.log("收到消息:",sendInfo);  
-				messageCallBack && messageCallBack(sendInfo.cmd, sendInfo.data)
-			}
-		}
-		websock.onclose = function(e) {
-			console.log('WebSocket连接关闭')
-			isConnect = false; //断开后修改标识
-			closeCallBack && closeCallBack(e);
-		}
-		websock.onopen = function() {
-			console.log("WebSocket连接成功");
-			isConnect = true;
-			// 发送登录命令
-			let loginInfo = {
-				cmd: 0,
-				data: {
-					accessToken: accessToken
-				}
-			};
-			websock.send(JSON.stringify(loginInfo));
-		}
-
-		// 连接发生错误的回调方法
-		websock.onerror = function() {
-			console.log('WebSocket连接发生错误')
-			isConnect = false; //连接断开修改标识
-			reconnect(wsurl,accessToken);
-		}
-	} catch (e) {
-		console.log("尝试创建连接失败");
-		reconnect(wsurl,accessToken); //如果无法连接上webSocket 那么重新连接！可能会因为服务器重新部署，或者短暂断网等导致无法创建连接
-	}
-};
-
-//定义重连函数
-let reconnect = (wsurl,accessToken) => {
-	console.log("尝试重新连接");
-	if (isConnect){
-		//如果已经连上就不在重连了
-		return; 
-	}
-	rec && clearTimeout(rec);
-	rec = setTimeout(function() { // 延迟5秒重连  避免过多次过频繁请求重连
-		connect(wsurl,accessToken);
-	}, 15000);
-};
-//设置关闭连接
-let close = (code) => {
-	websock && websock.close(code);
-};
-
-
-//心跳设置
-let heartCheck = {
-	timeout: 5000, //每段时间发送一次心跳包 这里设置为20s
-	timeoutObj: null, //延时发送消息对象（启动心跳新建这个对象，收到消息后重置对象）
-	start: function() {
-		if (isConnect) {
-			console.log('发送WebSocket心跳')
-			let heartBeat = {
-				cmd: 1,
-				data: {}
-			};
-			websock.send(JSON.stringify(heartBeat))
-		}
-	},
-
-	reset: function() {
-		clearTimeout(this.timeoutObj);
-		this.timeoutObj = setTimeout(function() {
-			heartCheck.start();
-		}, this.timeout);
-
-	}
-};
-
-
-
-// 实际调用的方法
-let sendMessage = (agentData) => {
-	if (websock.readyState === websock.OPEN) {
-		// 若是ws开启状态
-		websock.send(JSON.stringify(agentData))
-	} else if (websock.readyState === websock.CONNECTING) {
-		// 若是 正在开启状态，则等待1s后重新调用
-		setTimeout(function() {
-			sendMessage(agentData)
-		}, 1000)
-	} else {
-		// 若未开启 ，则等待1s后重新调用
-		setTimeout(function() {
-			sendMessage(agentData)
-		}, 1000)
-	}
-}
-
-let onConnect = (callback) => {
-	connectCallBack = callback;
-}
-
-let onMessage = (callback) => {
-	messageCallBack = callback;
-}
-
-
-let onClose = (callback) => {
-	closeCallBack = callback;
-}
-// 将方法暴露出去
-export {
-	connect,
-	reconnect,
-	close,
-	sendMessage,
-	onConnect,
-	onMessage,
-	onClose,
-}
+var websock = null;
+let rec; //断线重连后，延迟5秒重新创建WebSocket连接  rec用来存储延迟请求的代码
+let isConnect = false; //连接标识 避免重复连接
+let connectCallBack= null;
+let messageCallBack = null;
+let closeCallBack = null
+
+
+let connect = (wsurl,accessToken) => {
+	try {
+		if (isConnect) {
+			return;
+		}
+		console.log("连接WebSocket");
+		websock = new WebSocket(wsurl); 
+		websock.onmessage = function(e) {
+			let sendInfo = JSON.parse(e.data)
+			if (sendInfo.cmd == 0) {	
+				heartCheck.start()
+				// 登录成功才算真正完成连接
+				connectCallBack && connectCallBack();
+				console.log('WebSocket登录成功')
+			} else if (sendInfo.cmd == 1) {
+				// 重新开启心跳定时
+				heartCheck.reset();
+			} else {
+				// 其他消息转发出去
+				console.log("收到消息:",sendInfo);  
+				messageCallBack && messageCallBack(sendInfo.cmd, sendInfo.data)
+			}
+		}
+		websock.onclose = function(e) {
+			console.log('WebSocket连接关闭')
+			isConnect = false; //断开后修改标识
+			closeCallBack && closeCallBack(e);
+		}
+		websock.onopen = function() {
+			console.log("WebSocket连接成功");
+			isConnect = true;
+			// 发送登录命令
+			let loginInfo = {
+				cmd: 0,
+				data: {
+					accessToken: accessToken
+				}
+			};
+			websock.send(JSON.stringify(loginInfo));
+		}
+
+		// 连接发生错误的回调方法
+		websock.onerror = function() {
+			console.log('WebSocket连接发生错误')
+			isConnect = false; //连接断开修改标识
+			reconnect(wsurl,accessToken);
+		}
+	} catch (e) {
+		console.log("尝试创建连接失败");
+		reconnect(wsurl,accessToken); //如果无法连接上webSocket 那么重新连接！可能会因为服务器重新部署，或者短暂断网等导致无法创建连接
+	}
+};
+
+//定义重连函数
+let reconnect = (wsurl,accessToken) => {
+	console.log("尝试重新连接");
+	if (isConnect){
+		//如果已经连上就不在重连了
+		return; 
+	}
+	rec && clearTimeout(rec);
+	rec = setTimeout(function() { // 延迟5秒重连  避免过多次过频繁请求重连
+		connect(wsurl,accessToken);
+	}, 15000);
+};
+//设置关闭连接
+let close = (code) => {
+	websock && websock.close(code);
+};
+
+
+//心跳设置
+let heartCheck = {
+	timeout: 5000, //每段时间发送一次心跳包 这里设置为20s
+	timeoutObj: null, //延时发送消息对象（启动心跳新建这个对象，收到消息后重置对象）
+	start: function() {
+		if (isConnect) {
+			console.log('发送WebSocket心跳')
+			let heartBeat = {
+				cmd: 1,
+				data: {}
+			};
+			websock.send(JSON.stringify(heartBeat))
+		}
+	},
+
+	reset: function() {
+		clearTimeout(this.timeoutObj);
+		this.timeoutObj = setTimeout(function() {
+			heartCheck.start();
+		}, this.timeout);
+
+	}
+};
+
+
+
+// 实际调用的方法
+let sendMessage = (agentData) => {
+	if (websock.readyState === websock.OPEN) {
+		// 若是ws开启状态
+		websock.send(JSON.stringify(agentData))
+	} else if (websock.readyState === websock.CONNECTING) {
+		// 若是 正在开启状态，则等待1s后重新调用
+		setTimeout(function() {
+			sendMessage(agentData)
+		}, 1000)
+	} else {
+		// 若未开启 ，则等待1s后重新调用
+		setTimeout(function() {
+			sendMessage(agentData)
+		}, 1000)
+	}
+}
+
+let onConnect = (callback) => {
+	connectCallBack = callback;
+}
+
+let onMessage = (callback) => {
+	messageCallBack = callback;
+}
+
+
+let onClose = (callback) => {
+	closeCallBack = callback;
+}
+// 将方法暴露出去
+export {
+	connect,
+	reconnect,
+	close,
+	sendMessage,
+	onConnect,
+	onMessage,
+	onClose,
+}

im-ui/src/assets/style/global.css → im-web/src/assets/style/global.css

@@ -1,43 +1,43 @@
-@charset "UTF-8";
-
-html {
-  height: 100%;
-  overflow: hidden;
-       
-}
-
-body {
-  height: 100%;
-  margin: 0;
-  overflow: hidden;
-
-}
-
-section {
-	  height: 100%;
-}
-
-.el-dialog__body{
-	padding: 10px 15px !important;
-}
-
-::-webkit-scrollbar {
-  width: 6px;
-  height: 1px;
-}
-
-::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
-  border-radius: 2px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-  background: #535353;
-}
-
-::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
-  -webkit-box-shadow: inset 0 0 5px transparent;
-  border-radius: 2px;
-  background: #ededed;
-}
-
-/*# sourceMappingURL=v-im.cssss.map */
+@charset "UTF-8";
+
+html {
+  height: 100%;
+  overflow: hidden;
+       
+}
+
+body {
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+
+}
+
+section {
+	  height: 100%;
+}
+
+.el-dialog__body{
+	padding: 10px 15px !important;
+}
+
+::-webkit-scrollbar {
+  width: 6px;
+  height: 1px;
+}
+
+::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background: #535353;
+}
+
+::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  -webkit-box-shadow: inset 0 0 5px transparent;
+  border-radius: 2px;
+  background: #ededed;
+}
+
+/*# sourceMappingURL=v-im.cssss.map */