Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo #4

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
# InChat(当前版本1.6.0)

### [在线咨询与留言](https://gitter.im/In-Chat/Lobby)

> 当前主要更新分支,master将会再所有分支开放一定阶段后整改为maven包,提供给大家使用

> 每周六日下午更新项目或分支,项目尚未结束,欢迎加入与提供建议

## 分支介绍 im-api

腾讯IM(云通信)后端模仿项目,均以API形式对接,如果有前端想要对接的可以运行本分支,本分支预计终版为一个单服务并发30万用户的IM后台项目

## 分支介绍 paho-mqtt

基于小程序端或移动web端的paho.js与[java MQTT 客户端模拟](https://github.com/eclipse/paho.mqtt.java)的消息订阅与通信,小程序Iot的Demo,目前支持ws格式

## 分支介绍 tcp-wechat

基于小程序端与单片机等硬件的TCP/IP的主要通信,Iot中心作为中转,本demo将完全实现具体功能,详情请看分支主页
# InChat-Demo(当前版本1.6.0)

## 简介

Expand All @@ -33,18 +15,28 @@
## 功能

>实时聊天

>异步CRUD处理消息日志

>获取聊天历史

>用户登录、记录登录用户聊天历史

>防止二次登录

>SUI Mobile仿微信样式

>TCP/IP软硬件通信(8092)

>MQTT协议下的Iot物联网通信(8094)

>图片发送聊天功能

>API调用Netty长链接执行发送消息(在线用户数、用户列表)

>下版(1.7.0):好友功能等

## 版本迭代介绍
## 版本迭代介绍(tag包下载)

* 1.0.0版本

Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
username: root
password: root
url: jdbc:mysql://localhost:3306/nettychat?characterEncoding=utf-8&useSSL=false
password: 123456
url: jdbc:mysql://192.168.1.207:3306/nettychat?characterEncoding=utf-8&useSSL=false
jpa:
show-sql: true
# database: oracle
Expand All @@ -13,6 +13,7 @@ spring:
server:
servlet:
context-path: /susu
port: 8888
netty:
webport: 8090 #web聊天室端口
tcpport: 8092 #tcp协议端口
Expand Down