diff --git a/.gitignore b/.gitignore index 10f5a2f..4c041af 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,12 @@ /im-server/im-server.iml /im-platform/im-platform.iml /im-client/im-client.iml -/im-platform/src/main/resources/application-prod.yml -/im-platform/src/main/resources/logback-prod.xml -/im-server/src/main/resources/application-prod.yml -/im-server/src/main/resources/logback-prod.xml /im-common/im-common.iml +/im-server/target/ +/im-platform/target/ +/im-client/target/ +/im-common/itarget/ +/im-web/node_modules/ /im-uniapp/node_modules/ -/im-web/package-lock.json -/im-uniapp/unpackage/ -/im-uniapp/hybrid/ /im-uniapp/package-lock.json -/im-web/src/components/rtc/LocalVideo.vue -/im-web/src/components/rtc/RemoteVideo.vue -/im-web/src/components/rtc/RtcGroupAcceptor.vue +/im-uniapp/unpackage/ diff --git a/im-uniapp/.env.js b/im-uniapp/.env.js index b6b9ff4..9c7c778 100644 --- a/im-uniapp/.env.js +++ b/im-uniapp/.env.js @@ -2,8 +2,8 @@ const ENV = "DEV"; const UNI_APP = {} if(ENV=="DEV"){ - UNI_APP.BASE_URL = "http://127.0.0.1:8888"; - UNI_APP.WS_URL = "ws://127.0.0.1:8878/im"; + UNI_APP.BASE_URL = "http://192.168.43.199:8888"; + UNI_APP.WS_URL = "ws://192.168.43.199:8878/im"; // H5 走本地代理解决跨域问题 // #ifdef H5 UNI_APP.BASE_URL = "/api"; diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index a30cd85..1fc215b 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -1,5 +1,5 @@