diff --git a/hd-glasses-app/src/assets/map/Group 190514@2x.png b/hd-glasses-app/src/assets/map/Group 190514@2x.png new file mode 100644 index 0000000..95b4b2d Binary files /dev/null and b/hd-glasses-app/src/assets/map/Group 190514@2x.png differ diff --git a/hd-glasses-app/src/assets/map/Group 29@2x.png b/hd-glasses-app/src/assets/map/Group 29@2x.png new file mode 100644 index 0000000..05cbf02 Binary files /dev/null and b/hd-glasses-app/src/assets/map/Group 29@2x.png differ diff --git a/hd-glasses-app/src/assets/map/Group 30@2x.png b/hd-glasses-app/src/assets/map/Group 30@2x.png new file mode 100644 index 0000000..dddffe0 Binary files /dev/null and b/hd-glasses-app/src/assets/map/Group 30@2x.png differ diff --git a/hd-glasses-app/vue.config.js b/hd-glasses-app/vue.config.js index fef7856..d3329fa 100644 --- a/hd-glasses-app/vue.config.js +++ b/hd-glasses-app/vue.config.js @@ -1,5 +1,6 @@ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ + publicPath: "/hd-glasses-app", transpileDependencies: true, lintOnSave:false //添加该行代码 }) diff --git a/hs-im-app-server/src/main/resources/application-dev.yml b/hs-im-app-server/src/main/resources/application-dev.yml index d551616..8e7fe47 100644 --- a/hs-im-app-server/src/main/resources/application-dev.yml +++ b/hs-im-app-server/src/main/resources/application-dev.yml @@ -2,10 +2,10 @@ spring: profiles: active: dev datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - password: beAs0LHX2GyTxMw4 - url: jdbc:mysql://192.168.2.201:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8 + url: jdbc:mysql://43.139.191.204:3306/im-core?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root + password: beAs0LHX2GyTxMw4 + driver-class-name: com.mysql.cj.jdbc.Driver hikari: max-lifetime: 50000 @@ -32,7 +32,7 @@ mybatis: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl appConfig: - imUrl: http://192.168.1.117:28000 + imUrl: http://119.45.242.222:28000 imVersion: v1 appId: 10000 adminId: admin diff --git a/hs-im-server/.gitignore b/hs-im-server/.gitignore index 1a4e99b..88bc42e 100644 --- a/hs-im-server/.gitignore +++ b/hs-im-server/.gitignore @@ -3,3 +3,4 @@ /im-service/target /im-common/target /build +/dev diff --git a/hs-im-server/build/hd-glasses-app/conf/nginx.conf b/hs-im-server/build/hd-glasses-app/conf/nginx.conf index 5e74a54..b817a6e 100644 --- a/hs-im-server/build/hd-glasses-app/conf/nginx.conf +++ b/hs-im-server/build/hd-glasses-app/conf/nginx.conf @@ -33,37 +33,76 @@ http { gzip_vary on; gzip_disable "MSIE [1-6]."; - server { - listen 20081; - server_name localhost; - location ^~/znzq { - proxy_pass http://127.0.0.1:8080/znzq; - proxy_set_header Host 127.0.0.1; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } - - location /znzq/websocket { - proxy_pass http://127.0.0.1:8080/znzq/websocket; - proxy_http_version 1.1; - proxy_connect_timeout 3600s; - - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; } - location / { - root /usr/share/nginx/html/; - index index.html index.htm; - if (!-e $request_filename) { - rewrite ^(.*)$ /index.html?s=$1last; - break; - } - } - } + + server + { + listen 80; + listen 443 ssl http2; + server_name localhost; + ssl_certificate /usr/share/nginx/html/cert.pem; + ssl_certificate_key /usr/share/nginx/html/key.pem; + + + + + location /uniapp_im/ { + alias /usr/share/nginx/html/im-uniapp/dist/; + } + + location /hd-glasses-app/ { + alias /usr/share/nginx/html/hd-glasses-app/dist/; + } + + + + # For SRS homepage, console and players + # http://r.ossrs.net/console/ + # http://r.ossrs.net/players/ + location ~ ^/(console|players)/ { + proxy_pass http://127.0.0.1:8080/$request_uri; + } + + # For SRS streaming, for example: + # http://r.ossrs.net/live/livestream.flv + # http://r.ossrs.net/live/livestream.m3u8 + location ~ ^/.+/.*\.(flv|m3u8|ts|aac|mp3)$ { + proxy_pass http://127.0.0.1:8080$request_uri; + } + # For SRS backend API for console. + # For SRS WebRTC publish/play API. + location ~ ^/(api|rtc)/ { + proxy_pass http://127.0.0.1:1985$request_uri; + } + + + # For SRS streaming, for example: + # http://r.ossrs.net/live/livestream.flv + # http://r.ossrs.net/live/livestream.m3u8 + location ~ /.+/.*\.(flv|m3u8|ts|aac|mp3)$ { + proxy_pass http://127.0.0.1:8080$request_uri; + } + + location /demos/ { + proxy_pass http://127.0.0.1:1989/demos/; + } + + location /sig/ { + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_pass http://127.0.0.1:1989/sig/; + } + + access_log /home/wwwlogs/srslog; + } + + include /etc/nginx/conf.d/*.conf; } diff --git a/hs-im-server/im-message-store/src/main/resources/application-dev.yml b/hs-im-server/im-message-store/src/main/resources/application-dev.yml index e6f9b0f..4275234 100644 --- a/hs-im-server/im-message-store/src/main/resources/application-dev.yml +++ b/hs-im-server/im-message-store/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver password: beAs0LHX2GyTxMw4 - url: jdbc:mysql://192.168.2.201:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8 + url: jdbc:mysql://43.139.191.204:3306:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8 username: root redis: @@ -19,9 +19,9 @@ spring: min-idle: 10 password: dSMIXBQrCBXiHHjk123 rabbitmq: - host: 192.168.2.180 + host: 119.45.242.222 port: 5672 - addresses: 192.168.2.180 + addresses: 119.45.242.222 username: guest password: guest # virtual-host: diff --git a/hs-im-server/im-service/src/main/resources/application-dev.yml b/hs-im-server/im-service/src/main/resources/application-dev.yml index e7149df..964128e 100644 --- a/hs-im-server/im-service/src/main/resources/application-dev.yml +++ b/hs-im-server/im-service/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver password: beAs0LHX2GyTxMw4 - url: jdbc:mysql://192.168.2.201:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8 + url: jdbc:mysql://43.139.191.204:3306:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8 username: root redis: diff --git a/hs-im-server/im-tcp/src/main/resources/internet_1.yml b/hs-im-server/im-tcp/src/main/resources/internet_1.yml new file mode 100644 index 0000000..d73eccf --- /dev/null +++ b/hs-im-server/im-tcp/src/main/resources/internet_1.yml @@ -0,0 +1,34 @@ +lim: + tcpPort: 29000 + webSocketPort: 29001 + bossThreadSize: 1 + workThreadSize: 8 + heartBeatTime: 20000 #心跳超时时间 单位毫秒 + brokerId: 1000 + loginModel: 3 + logicUrl: http://119.45.242.222:28000/v1 + # * 多端同步模式：1 只允许一端在线，手机/电脑/web 踢掉除了本client+imel的设备 + # * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备 + # * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备 + # * 4 允许所有端多设备登录 不踢任何设备 + + redis: + mode: single # 单机模式：single 哨兵模式：sentinel 集群模式：cluster + database: 8 + password: dSMIXBQrCBXiHHjk123 + timeout: 3000 # 超时时间 + poolMinIdle: 8 #最小空闲数 + poolConnTimeout: 3000 # 连接超时时间(毫秒) + poolSize: 10 # 连接池大小 + single: #redis单机配置 + address: 43.139.191.204:6379 + rabbitmq: + host: 119.45.242.222 + port: 5672 + addresses: 119.45.242.222 + username: guest + password: guest + + zkConfig: + zkAddr: 119.45.242.222:2181 + zkConnectTimeOut: 5000 diff --git a/im-uniapp/common/config.js b/im-uniapp/common/config.js index bf26b0d..a6495e5 100644 --- a/im-uniapp/common/config.js +++ b/im-uniapp/common/config.js @@ -1,9 +1,11 @@ export default class config{ static getBaseApiUrl(){ - return process.env.NODE_ENV === 'development' ? 'http://192.168.1.117:8989' :'http://172.16.2.3:8989'; + //return process.env.NODE_ENV === 'development' ? 'http://119.45.242.222:8989' :'http://172.16.2.3:8989'; + return process.env.NODE_ENV === 'development' ? 'http://119.45.242.222:8989' :'/base_api'; } static getImApiUrl(){ - return process.env.NODE_ENV === 'development' ? 'http://192.168.1.117:28000/v1' :'http://172.16.2.3:28000/v1'; + //return process.env.NODE_ENV === 'development' ? 'http://119.45.242.222:28000/v1' :'http://172.16.2.3:28000/v1'; + return process.env.NODE_ENV === 'development' ? 'http://119.45.242.222:28000/v1' :'/im_api/v1'; } static getImAppId(){ return 10000; diff --git a/im-uniapp/manifest.json b/im-uniapp/manifest.json index 7957eab..88544d6 100644 --- a/im-uniapp/manifest.json +++ b/im-uniapp/manifest.json @@ -182,6 +182,13 @@ "key" : "3U7BZ-AZZKD-IXC4C-HZA7T-2PGKT-EZFER" } } + }, + "router" : { + "base" : "/im-uniapp/", + "mode" : "history" + }, + "devServer" : { + "https" : false } }, "mp-alipay" : {