diff --git a/im-platform/src/main/resources/application.yml b/im-platform/src/main/resources/application.yml index 07678d0..a700272 100644 --- a/im-platform/src/main/resources/application.yml +++ b/im-platform/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/box-im?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true username: root - password: root + password: root123456 redis: host: 127.0.0.1 @@ -29,11 +29,11 @@ mybatis-plus: # *.xml的具体路径 - classpath*:mapper/*.xml minio: - endpoint: http://127.0.0.1:9001 #内网地址 - public: http://127.0.0.1:9001 #外网访问地址 + endpoint: http://42.194.187.243:9001 #内网地址 + public: http://42.194.187.243:9001 #外网访问地址 accessKey: admin - secretKey: 12345678 - bucketName: box-im + secretKey: admin123456 + bucketName: box-im2 imagePath: image filePath: file @@ -43,7 +43,7 @@ webrtc: jwt: accessToken: - expireIn: 1800 #半个小时 + expireIn: 1800 #半个小时 secret: MIIBIjANBgkq refreshToken: expireIn: 604800 #7天 diff --git a/im-server/src/main/resources/application.yml b/im-server/src/main/resources/application.yml index e3110a4..3ab53c4 100644 --- a/im-server/src/main/resources/application.yml +++ b/im-server/src/main/resources/application.yml @@ -12,7 +12,7 @@ websocket: port: 8878 tcpsocket: - enable: false # 暂时不开启 + enable: true # 暂时不开启 port: 8879 jwt: diff --git a/im-ui/src/store/index.js b/im-ui/src/store/index.js index 997c3d0..ba185be 100644 --- a/im-ui/src/store/index.js +++ b/im-ui/src/store/index.js @@ -25,7 +25,6 @@ export default new Vuex.Store({ this.commit("initGroupStore"); this.commit("initChatStore"); } - }, strict: process.env.NODE_ENV !== 'production' }) diff --git a/im-uniapp/package.json b/im-uniapp/package.json index da18df0..440479f 100644 --- a/im-uniapp/package.json +++ b/im-uniapp/package.json @@ -6,16 +6,16 @@ "browser":"chrome", "env": { "UNI_PLATFORM": "h5", - "BASE_URL": "http://192.168.1.5:8888", - "WS_URL": "ws://192.168.1.5:8878/im" + "BASE_URL": "http://192.168.43.6:8888", + "WS_URL": "ws://192.168.43.6:8878/im" } }, "dev-wx-mini": { "title": "开发环境-微信小程序", "env": { "UNI_PLATFORM": "mp-weixin", - "BASE_URL": "http://192.168.1.5:8888", - "WS_URL": "ws://192.168.1.5:8878/im" + "BASE_URL": "http://192.168.43.6:8888", + "WS_URL": "ws://192.168.43.6:8878/im" } }, "prod-h5": { diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue index 65c535b..ed9dc99 100644 --- a/im-uniapp/pages/login/login.vue +++ b/im-uniapp/pages/login/login.vue @@ -20,8 +20,8 @@ return { loginForm: { terminal: 1, // APP终端 - userName: 'blue', - password: '123456' + userName: '', + password: '' }, rules: { userName: { @@ -48,6 +48,9 @@ }).then(data => { console.log("登录成功,自动跳转到聊天页面...") uni.setStorageSync("loginInfo", data); + uni.setStorageSync("userName", this.loginForm.userName); + uni.setStorageSync("password", this.loginForm.password); + // 调用App.vue的初始化方法 getApp().init() // 跳转到聊天页面 @@ -58,6 +61,8 @@ } }, onLoad() { + this.loginForm.userName = uni.getStorageSync("userName"); + this.loginForm.password = uni.getStorageSync("password"); let loginInfo = uni.getStorageSync("loginInfo"); if (loginInfo) { // 跳转到聊天页面