diff --git a/hd-glasses-app/.env.dev b/hd-glasses-app/.env.dev
new file mode 100644
index 0000000..5c99205
--- /dev/null
+++ b/hd-glasses-app/.env.dev
@@ -0,0 +1,4 @@
+VUE_APP_MAP_URL='http://82.157.23.170:8600/geoserver'
+VUE_APP_MAP_AUTHKEY='9b488ac6-5309-4ef4-ab99-2180d2da161d'
+
+VUE_APP_API="http://work.ii999.live:19002/znzq"
diff --git a/hd-glasses-app/.env.prod b/hd-glasses-app/.env.prod
new file mode 100644
index 0000000..03ea369
--- /dev/null
+++ b/hd-glasses-app/.env.prod
@@ -0,0 +1,4 @@
+VUE_APP_MAP_URL='http://172.16.2.2:8600/geoserver'
+VUE_APP_MAP_AUTHKEY='30efbafe-d218-4d77-8200-0207246924be'
+
+VUE_APP_API="http://172.16.2.3:19000/znzq"
diff --git a/hd-glasses-app/package-lock.json b/hd-glasses-app/package-lock.json
index f2bc5f8..82f17dd 100644
--- a/hd-glasses-app/package-lock.json
+++ b/hd-glasses-app/package-lock.json
@@ -6587,6 +6587,11 @@
"find-up": "^4.0.0"
}
},
+ "plot-ol": {
+ "version": "1.0.1",
+ "resolved": "http://nexus.frp.shuhesoft.com:10000/repository/group-npm/plot-ol/-/plot-ol-1.0.1.tgz",
+ "integrity": "sha512-znRQiXm2UQltL4o+O5Lnv/NVSAT+DVgqwB6nnpnhB+uwHyyz6Zh4bNib061k6lXZnpTIUmueyyBEIAX/aNYZ2Q=="
+ },
"portfinder": {
"version": "1.0.32",
"resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
@@ -7087,6 +7092,11 @@
"renderkid": "^3.0.0"
}
},
+ "process": {
+ "version": "0.11.10",
+ "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
+ },
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
diff --git a/hd-glasses-app/package.json b/hd-glasses-app/package.json
index 27135aa..4d30cbe 100644
--- a/hd-glasses-app/package.json
+++ b/hd-glasses-app/package.json
@@ -3,8 +3,8 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "serve": "vue-cli-service serve",
- "build": "vue-cli-service build",
+ "serve": "vue-cli-service serve --mode dev",
+ "build": "vue-cli-service build --mode prod",
"lint": "vue-cli-service lint"
},
"dependencies": {
@@ -15,7 +15,9 @@
"less-loader": "^11.1.3",
"lib-flexible": "^0.3.2",
"ol": "^8.1.0",
+ "plot-ol": "^1.0.1",
"postcss-pxtorem": "^5.1.1",
+ "process": "^0.11.10",
"vant": "^2.13.1",
"vue": "^2.6.14",
"vue-router": "^3.6.5"
diff --git a/hd-glasses-app/public/index.html b/hd-glasses-app/public/index.html
index 4100b53..316278a 100644
--- a/hd-glasses-app/public/index.html
+++ b/hd-glasses-app/public/index.html
@@ -1,11 +1,18 @@
+
+
+
diff --git a/hd-glasses-app/public/vconsole.min.js b/hd-glasses-app/public/vconsole.min.js
new file mode 100644
index 0000000..1337491
--- /dev/null
+++ b/hd-glasses-app/public/vconsole.min.js
@@ -0,0 +1,10 @@
+/*!
+ * vConsole v3.9.0 (https://github.com/Tencent/vConsole)
+ *
+ * Tencent is pleased to support the open source community by making vConsole available.
+ * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("VConsole",[],t):"object"==typeof exports?exports.VConsole=t():e.VConsole=t()}(self,(function(){return function(){var __webpack_modules__={8406:function(e,t,n){"use strict";function o(e,t){for(var n=0;n=0?t:null}(e);return[null==t?"":";path="+t,null==n?"":";domain="+n,null==o?"":";expires="+o.toUTCString(),void 0===r||!1===r?"":";secure",null===i?"":";SameSite="+i].join("")};t.formatCookie=function(e,t,o){return[encodeURIComponent(e),"=",encodeURIComponent(t),n(o)].join("")}},6025:function(e,t,n){"use strict";var o=n(8406);Object.defineProperty(t,"eR",{enumerable:!0,get:function(){return o.CookieStorage}});var r=n(9390);var i=n(4370)},4370:function(e,t){"use strict";function n(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(e)))return;var n=[],o=!0,r=!1,i=void 0;try{for(var c,a=e[Symbol.iterator]();!(o=(c=a.next()).done)&&(n.push(c.value),!t||n.length!==t);o=!0);}catch(e){r=!0,i=e}finally{try{o||null==a.return||a.return()}finally{if(r)throw i}}return n}(e,t)||function(e,t){if(!e)return;if("string"==typeof e)return o(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(e,t)}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n0&&(a=c.getRangeAt(0)),o.append(r),r.select(),r.selectionStart=0,r.selectionEnd=e.length;var s=!1;try{s=document.execCommand("copy")}catch(e){}return r.remove(),a&&(c.removeAllRanges(),c.addRange(a)),i&&i.focus(),s}n.d(t,{Z:function(){return o}})},2582:function(e,t,n){n(1646),n(6394),n(2004),n(462),n(8407),n(2429),n(1172),n(8288),n(1274),n(8201),n(6626),n(3211),n(9952),n(15),n(9831),n(7521),n(2972),n(6956),n(5222),n(2257);var o=n(1287);e.exports=o.Symbol},6163:function(e){e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},2569:function(e,t,n){var o=n(794);e.exports=function(e){if(!o(e))throw TypeError(String(e)+" is not an object");return e}},5766:function(e,t,n){var o=n(2977),r=n(97),i=n(6782),c=function(e){return function(t,n,c){var a,s=o(t),l=r(s.length),d=i(c,l);if(e&&n!=n){for(;l>d;)if((a=s[d++])!=a)return!0}else for(;l>d;d++)if((e||d in s)&&s[d]===n)return e||d||0;return!e&&-1}};e.exports={includes:c(!0),indexOf:c(!1)}},4805:function(e,t,n){var o=n(2938),r=n(5044),i=n(1324),c=n(97),a=n(4822),s=[].push,l=function(e){var t=1==e,n=2==e,l=3==e,d=4==e,u=6==e,v=7==e,f=5==e||u;return function(p,h,m,g){for(var b,_,y=i(p),w=r(y),x=o(h,m,3),C=c(w.length),O=0,E=g||a,k=t?E(p,C):n||v?E(p,0):void 0;C>O;O++)if((f||O in w)&&(_=x(b=w[O],O,y),e))if(t)k[O]=_;else if(_)switch(e){case 3:return!0;case 5:return b;case 6:return O;case 2:s.call(k,b)}else switch(e){case 4:return!1;case 7:s.call(k,b)}return u?-1:l||d?d:k}};e.exports={forEach:l(0),map:l(1),filter:l(2),some:l(3),every:l(4),find:l(5),findIndex:l(6),filterOut:l(7)}},9269:function(e,t,n){var o=n(6544),r=n(3649),i=n(4061),c=r("species");e.exports=function(e){return i>=51||!o((function(){var t=[];return(t.constructor={})[c]=function(){return{foo:1}},1!==t[e](Boolean).foo}))}},4822:function(e,t,n){var o=n(794),r=n(4521),i=n(3649)("species");e.exports=function(e,t){var n;return r(e)&&("function"!=typeof(n=e.constructor)||n!==Array&&!r(n.prototype)?o(n)&&null===(n=n[i])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===t?0:t)}},9624:function(e){var t={}.toString;e.exports=function(e){return t.call(e).slice(8,-1)}},3058:function(e,t,n){var o=n(8191),r=n(9624),i=n(3649)("toStringTag"),c="Arguments"==r(function(){return arguments}());e.exports=o?r:function(e){var t,n,o;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),i))?n:c?r(t):"Object"==(o=r(t))&&"function"==typeof t.callee?"Arguments":o}},3478:function(e,t,n){var o=n(4402),r=n(929),i=n(6683),c=n(4615);e.exports=function(e,t){for(var n=r(t),a=c.f,s=i.f,l=0;l=74)&&(o=c.match(/Chrome\/(\d+)/))&&(r=o[1]),e.exports=r&&+r},5690:function(e){e.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},7263:function(e,t,n){var o=n(7583),r=n(6683).f,i=n(57),c=n(1270),a=n(460),s=n(3478),l=n(4451);e.exports=function(e,t){var n,d,u,v,f,p=e.target,h=e.global,m=e.stat;if(n=h?o:m?o[p]||a(p,{}):(o[p]||{}).prototype)for(d in t){if(v=t[d],u=e.noTargetGet?(f=r(n,d))&&f.value:n[d],!l(h?d:p+(m?".":"#")+d,e.forced)&&void 0!==u){if(typeof v==typeof u)continue;s(v,u)}(e.sham||u&&u.sham)&&i(v,"sham",!0),c(n,d,v,e)}}},6544:function(e){e.exports=function(e){try{return!!e()}catch(e){return!0}}},2938:function(e,t,n){var o=n(6163);e.exports=function(e,t,n){if(o(e),void 0===t)return e;switch(n){case 0:return function(){return e.call(t)};case 1:return function(n){return e.call(t,n)};case 2:return function(n,o){return e.call(t,n,o)};case 3:return function(n,o,r){return e.call(t,n,o,r)}}return function(){return e.apply(t,arguments)}}},5897:function(e,t,n){var o=n(1287),r=n(7583),i=function(e){return"function"==typeof e?e:void 0};e.exports=function(e,t){return arguments.length<2?i(o[e])||i(r[e]):o[e]&&o[e][t]||r[e]&&r[e][t]}},7583:function(e,t,n){var o=function(e){return e&&e.Math==Math&&e};e.exports=o("object"==typeof globalThis&&globalThis)||o("object"==typeof window&&window)||o("object"==typeof self&&self)||o("object"==typeof n.g&&n.g)||function(){return this}()||Function("return this")()},4402:function(e,t,n){var o=n(1324),r={}.hasOwnProperty;e.exports=Object.hasOwn||function(e,t){return r.call(o(e),t)}},4639:function(e){e.exports={}},482:function(e,t,n){var o=n(5897);e.exports=o("document","documentElement")},275:function(e,t,n){var o=n(8494),r=n(6544),i=n(6668);e.exports=!o&&!r((function(){return 7!=Object.defineProperty(i("div"),"a",{get:function(){return 7}}).a}))},5044:function(e,t,n){var o=n(6544),r=n(9624),i="".split;e.exports=o((function(){return!Object("z").propertyIsEnumerable(0)}))?function(e){return"String"==r(e)?i.call(e,""):Object(e)}:Object},9734:function(e,t,n){var o=n(1314),r=Function.toString;"function"!=typeof o.inspectSource&&(o.inspectSource=function(e){return r.call(e)}),e.exports=o.inspectSource},2743:function(e,t,n){var o,r,i,c=n(9491),a=n(7583),s=n(794),l=n(57),d=n(4402),u=n(1314),v=n(9137),f=n(4639),p="Object already initialized",h=a.WeakMap;if(c||u.state){var m=u.state||(u.state=new h),g=m.get,b=m.has,_=m.set;o=function(e,t){if(b.call(m,e))throw new TypeError(p);return t.facade=e,_.call(m,e,t),t},r=function(e){return g.call(m,e)||{}},i=function(e){return b.call(m,e)}}else{var y=v("state");f[y]=!0,o=function(e,t){if(d(e,y))throw new TypeError(p);return t.facade=e,l(e,y,t),t},r=function(e){return d(e,y)?e[y]:{}},i=function(e){return d(e,y)}}e.exports={set:o,get:r,has:i,enforce:function(e){return i(e)?r(e):o(e,{})},getterFor:function(e){return function(t){var n;if(!s(t)||(n=r(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return n}}}},4521:function(e,t,n){var o=n(9624);e.exports=Array.isArray||function(e){return"Array"==o(e)}},4451:function(e,t,n){var o=n(6544),r=/#|\.prototype\./,i=function(e,t){var n=a[c(e)];return n==l||n!=s&&("function"==typeof t?o(t):!!t)},c=i.normalize=function(e){return String(e).replace(r,".").toLowerCase()},a=i.data={},s=i.NATIVE="N",l=i.POLYFILL="P";e.exports=i},794:function(e){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},6268:function(e){e.exports=!1},8640:function(e,t,n){var o=n(4061),r=n(6544);e.exports=!!Object.getOwnPropertySymbols&&!r((function(){var e=Symbol();return!String(e)||!(Object(e)instanceof Symbol)||!Symbol.sham&&o&&o<41}))},9491:function(e,t,n){var o=n(7583),r=n(9734),i=o.WeakMap;e.exports="function"==typeof i&&/native code/.test(r(i))},3590:function(e,t,n){var o,r=n(2569),i=n(8728),c=n(5690),a=n(4639),s=n(482),l=n(6668),d=n(9137),u=d("IE_PROTO"),v=function(){},f=function(e){return"
+
+
+
diff --git a/hd-glasses-app/src/router/index.js b/hd-glasses-app/src/router/index.js
index 4bdd3f0..e543cb1 100644
--- a/hd-glasses-app/src/router/index.js
+++ b/hd-glasses-app/src/router/index.js
@@ -6,21 +6,24 @@ import MyHello from '../components/MyHello.vue'
Vue.use(Router);
//配置路由
-const router = new Router({
+const router = new Router({
routes: [
{
- path:"/hello",
- component:MyHello
+ path: "/hello",
+ component: MyHello
},
- //路由懒加载(按需加载)
{
path: '/map',
name: 'map',
- component: () => import('../pages/map.vue')
- },{
+ component: () => import('../pages/map.vue') //路由懒加载(按需加载)
+ }, {
path: '/call_room',
name: 'call_room',
component: () => import('../pages/call_room.vue')
+ }, {
+ path: '/hd_map',
+ name: 'hd_map',
+ component: () => import('../pages/hd_map.vue')
}
]
});
diff --git a/hd-glasses-app/src/utils/publicFun.js b/hd-glasses-app/src/utils/publicFun.js
new file mode 100644
index 0000000..c4ea3dc
--- /dev/null
+++ b/hd-glasses-app/src/utils/publicFun.js
@@ -0,0 +1,23 @@
+/**
+ * getUrlKey 截取地址栏参数
+ * @param value
+ * @returns {String}
+ */
+const getUrlParam = (name) => {
+ var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+ let url = window.location.href.split('#')[0];
+ let search = url.split('?')[1];
+ console.log(search);
+ if (search) {
+ var r = search.substr(0).match(reg);
+ if (r !== null) {
+ return unescape(r[2]);
+ }
+ return null;
+ } else return null;
+
+}
+
+export default {
+ getUrlParam,
+};
diff --git a/hd-glasses-app/src/utils/service.js b/hd-glasses-app/src/utils/service.js
index 5e3bc7e..b7bc895 100644
--- a/hd-glasses-app/src/utils/service.js
+++ b/hd-glasses-app/src/utils/service.js
@@ -1,7 +1,7 @@
import axios from "axios";
let service = axios.create({
- baseURL:"",//相同绝对路径
+ baseURL:process.env.VUE_APP_API,//相同绝对路径
timeout: 100000,//超过这么多时间，则请求终止
headers: {//请求头携带数据的格式
"Content-Type": "application/json;charset=UTF-8",
@@ -12,10 +12,11 @@ let service = axios.create({
service.interceptors.request.use(function (config) {
// 发送请求之前做写什么
let token = localStorage.getItem("token");
+ token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTc1NDg5NjUsInVzZXJuYW1lIjoiem56cTEifQ.-qgy6DGCWvMTJYE8rDPvABa7S-heeh_rb9Pf4WTxEe0"
// 如果有
if(token){
// 放在请求头（token跟后端沟通，他需要什么该成什么就可以了）
- config.headers.authorization = token;
+ config.headers["X-Access-Token"] = token;
}
return config;
}, function (error) {
diff --git a/hs-im-app-server/pom.xml b/hs-im-app-server/pom.xml
index 9563e1a..48f5ff7 100644
--- a/hs-im-app-server/pom.xml
+++ b/hs-im-app-server/pom.xml
@@ -12,6 +12,7 @@
org.app
app-service
1.0-SNAPSHOT
+ jar
@@ -95,10 +96,14 @@
fastjson
1.2.51
-
-
-
-
-
\ No newline at end of file
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
diff --git a/hs-im-server/build/app-service-1.0-SNAPSHOT.jar b/hs-im-server/build/app-service-1.0-SNAPSHOT.jar
index 6ea0288..9e31311 100644
Binary files a/hs-im-server/build/app-service-1.0-SNAPSHOT.jar and b/hs-im-server/build/app-service-1.0-SNAPSHOT.jar differ
diff --git a/hs-im-server/build/docker-compose.yml b/hs-im-server/build/docker-compose.yml
index 804de1c..639dec4 100644
--- a/hs-im-server/build/docker-compose.yml
+++ b/hs-im-server/build/docker-compose.yml
@@ -3,58 +3,79 @@ services:
im-tcp:
image: 172.16.2.189:8083/java:1.8
restart: always
+ privileged: true
environment:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
TZ: Asia/Shanghai
- container_name: system
+ container_name: im-tcp
volumes:
- - ./hd_1.yml:/hd-znzq/system
- - ./im-service-1.0.0-SNAPSHOT.jar:/hd-znzq/system
- network_mode: host
- command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-service-1.0.0-SNAPSHOT.jar /hd-znzq/system/hd_1.yml
+ - ./:/hd-znzq/config
+ - ./:/hd-znzq/system
+ ports:
+ - 29001:29001
+ - 29000:29000
+ command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-service-1.0.0-SNAPSHOT.jar /hd-znzq/config/hd_1.yml
im-message-store:
image: 172.16.2.189:8083/java:1.8
restart: always
+ privileged: true
environment:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
TZ: Asia/Shanghai
- container_name: system
+ container_name: im-message-store
volumes:
- - ./im-message-store-1.0.0-SNAPSHOT.jar:/hd-znzq/system
- network_mode: host
+ - ./:/hd-znzq/system
+ ports:
+ - 8990:8990
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-message-store-1.0.0-SNAPSHOT.jar
im-service:
image: 172.16.2.189:8083/java:1.8
restart: always
+ privileged: true
environment:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
TZ: Asia/Shanghai
- container_name: system
+ container_name: im-service
volumes:
- - ./im-service-1.0.0-SNAPSHOT.jar:/hd-znzq/system
- network_mode: host
+ - ./:/hd-znzq/system
+ ports:
+ - 28000:28000
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-service-1.0.0-SNAPSHOT.jar
+ app-service:
+ image: 172.16.2.189:8083/java:1.8
+ restart: always
+ privileged: true
+ ports:
+ - 8989:8989
+ environment:
+ LANG: en_US.UTF-8
+ LC_ALL: en_US.UTF-8
+ TZ: Asia/Shanghai
+ container_name: app-service
+ volumes:
+ - ./:/hd-znzq/system
+ command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/app-service-1.0-SNAPSHOT.jar
im-app-web:
image: 172.16.2.189:8083/nginx:1.25
restart: always
- container_name: web
-# ports:
-# - 19000:80
- network_mode: host
+ container_name: im-app-web
+ ports:
+ - 20080:20080
+# network_mode: host
volumes:
- ./im-uniapp/dist/:/usr/share/nginx/html/
- ./im-uniapp/conf/nginx.conf:/etc/nginx/nginx.conf
hd-glasses-app:
image: 172.16.2.189:8083/nginx:1.25
restart: always
- container_name: web
- # ports:
- # - 19000:80
- network_mode: host
+ container_name: hd-glasses-app
+ ports:
+ - 20081:20081
+# network_mode: host
volumes:
- ./hd-glasses-app/dist/:/usr/share/nginx/html/
- - ./hd-glasses-app/conf/nginx.conf:/etc/nginx/nginx.conf -
+ - ./hd-glasses-app/conf/nginx.conf:/etc/nginx/nginx.conf
diff --git a/hs-im-server/build/hd_1.yml b/hs-im-server/build/hd_1.yml
index f9b862c..265ff84 100644
--- a/hs-im-server/build/hd_1.yml
+++ b/hs-im-server/build/hd_1.yml
@@ -1,6 +1,6 @@
lim:
tcpPort: 29000
- webSocketPort: 19000
+ webSocketPort: 29001
bossThreadSize: 1
workThreadSize: 8
heartBeatTime: 20000 #心跳超时时间 单位毫秒
diff --git a/hs-im-server/build/im-tcp-1.0.0-SNAPSHOT.jar b/hs-im-server/build/im-tcp-1.0.0-SNAPSHOT.jar
index 2b441b5..d7312fc 100644
Binary files a/hs-im-server/build/im-tcp-1.0.0-SNAPSHOT.jar and b/hs-im-server/build/im-tcp-1.0.0-SNAPSHOT.jar differ
diff --git a/hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/StarterServer.java b/hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/netty/StarterServer.java
similarity index 98%
rename from hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/StarterServer.java
rename to hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/netty/StarterServer.java
index b37936d..5d71675 100644
--- a/hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/StarterServer.java
+++ b/hs-im-server/im-tcp/src/main/java/com/lld/im/tcp/netty/StarterServer.java
@@ -1,4 +1,4 @@
-package com.lld.im.tcp;
+package com.lld.im.tcp.netty;
import com.alibaba.fastjson.JSONArray;
import com.lld.im.codec.config.BootstrapConfig;
diff --git a/hs-im-server/im-tcp/src/main/resources/application.yml b/hs-im-server/im-tcp/src/main/resources/application.yml
index 3d7808a..f75b36d 100644
--- a/hs-im-server/im-tcp/src/main/resources/application.yml
+++ b/hs-im-server/im-tcp/src/main/resources/application.yml
@@ -1,3 +1,5 @@
spring:
profiles:
active: dev
+server:
+ port: 38000
diff --git a/hs-im-server/im-tcp/src/main/resources/hd_1.yml b/hs-im-server/im-tcp/src/main/resources/hd_1.yml
index f9b862c..265ff84 100644
--- a/hs-im-server/im-tcp/src/main/resources/hd_1.yml
+++ b/hs-im-server/im-tcp/src/main/resources/hd_1.yml
@@ -1,6 +1,6 @@
lim:
tcpPort: 29000
- webSocketPort: 19000
+ webSocketPort: 29001
bossThreadSize: 1
workThreadSize: 8
heartBeatTime: 20000 #心跳超时时间 单位毫秒