228 Commits

Author SHA1 Message Date
ccfish 0ec0cbbba3 Merge remote-tracking branch 'remotes/origin/develop'
# Conflicts:
#	server/talk-common/pom.xml
2023-06-09 15:21:06 +08:00
ccfish 46be2eb0f2 改依赖工具为gradle,升级SpringBoot至2.7.x 2023-06-09 15:16:29 +08:00
snyk-bot d638261754 fix: server/talk-common/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKHTTP3-2958044
2023-04-07 19:34:56 +08:00
ccfish 4049044125 Merge branch 'master' into develop 2023-02-17 14:45:41 +08:00
snyk-bot 6758fbd3e6 fix: server/admin/talk-grpc/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-3040284
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-3167772
2023-02-17 14:38:36 +08:00
snyk-bot f8ceb3d262 fix: upgrade org.springframework:spring-core from 4.3.24 to 4.3.30.RELEASE
Snyk has created this PR to upgrade org.springframework:spring-core from 4.3.24 to 4.3.30.RELEASE.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.springframework/spring-core/

See this project in Snyk:
https://app.snyk.io/org/ccfish86/project/ceb32eae-ab56-4893-bfd8-81f32558f740?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-06-23 08:58:27 +08:00
ccfish f8559a5169 Merge branch 'master' into develop 2022-06-23 08:56:10 +08:00
dependabot[bot] 8b2a2f2589 Bump mysql-connector-java in /server/admin/talk-grpc
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.16 to 8.0.28.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.16...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 08:52:58 +08:00
snyk-bot ad4676fb9c fix: upgrade com.alibaba:fastjson from 1.2.29 to 1.2.83
Snyk has created this PR to upgrade com.alibaba:fastjson from 1.2.29 to 1.2.83.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.alibaba/fastjson/

See this project in Snyk:
https://app.snyk.io/org/ccfish86/project/ceb32eae-ab56-4893-bfd8-81f32558f740?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-06-23 08:49:58 +08:00
snyk-bot ac51e05d6c fix: upgrade com.google.protobuf:protobuf-java from 3.4.0 to 3.21.1
Snyk has created this PR to upgrade com.google.protobuf:protobuf-java from 3.4.0 to 3.21.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/

See this project in Snyk:
https://app.snyk.io/org/ccfish86/project/ceb32eae-ab56-4893-bfd8-81f32558f740?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-06-23 08:49:38 +08:00
snyk-bot 247c4e300e fix: upgrade com.fasterxml.jackson.core:jackson-annotations from 2.8.0 to 2.13.3
Snyk has created this PR to upgrade com.fasterxml.jackson.core:jackson-annotations from 2.8.0 to 2.13.3.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/

See this project in Snyk:
https://app.snyk.io/org/ccfish86/project/ceb32eae-ab56-4893-bfd8-81f32558f740?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-06-23 08:49:27 +08:00
ccfish 79c6d101b1 Merge branch 'master' into develop 2022-06-23 08:48:00 +08:00
dependabot[bot] ec4e50c7c3 Bump commons-io from 2.6 to 2.7 in /server/talk-common
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 08:46:37 +08:00
dependabot[bot] 2935f9b755 Bump commons-io from 2.6 to 2.7 in /server/talk-db-proxy
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 08:46:16 +08:00
dependabot[bot] 3b9ad1a9a8 Bump mybatis from 3.2.8 to 3.5.6 in /server/admin/talk-grpc
Bumps [mybatis](https://github.com/mybatis/mybatis-3) from 3.2.8 to 3.5.6.
- [Release notes](https://github.com/mybatis/mybatis-3/releases)
- [Commits](https://github.com/mybatis/mybatis-3/compare/mybatis-3.2.8...mybatis-3.5.6)

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 08:45:51 +08:00
yuangui 0d5e347551 fix jpa hsql 2021-01-28 15:29:26 +08:00
yuangui fe8d2941e9 升级shardingphere版本 调通~ 2021-01-28 15:26:14 +08:00
yuangui 41cf35f92b 升级spring boot & protobuf & consul 2021-01-28 13:32:31 +08:00
yuangui 16552c95e7 update dependencies 2021-01-28 09:20:33 +08:00
yuangui 75be6b6b69 upgrade 2021-01-27 20:03:03 +08:00
yuangui 40e922975a Merge branch 'master' of https://github.com/ccfish86/sctalk
# Conflicts:
#	server/talk-db-proxy/src/main/java/com/blt/talk/service/remote/rest/MessageServiceController.java
2021-01-27 19:04:40 +08:00
dependabot[bot] aa5b8d185d Bump junit from 4.12 to 4.13.1 in /server/talk-common
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-12 08:24:38 +08:00
dependabot[bot] 1ad6640499 Bump showdown from 1.7.1 to 1.9.1 in /server/admin/vue
Bumps [showdown](https://github.com/showdownjs/showdown) from 1.7.1 to 1.9.1.
- [Release notes](https://github.com/showdownjs/showdown/releases)
- [Changelog](https://github.com/showdownjs/showdown/blob/1.9.1/CHANGELOG.md)
- [Commits](https://github.com/showdownjs/showdown/compare/1.7.1...1.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-12 08:24:24 +08:00
dependabot[bot] dab9d6c85b Bump electron from 1.8.8 to 9.1.0 in /clients/tt-rapido
Bumps [electron](https://github.com/electron/electron) from 1.8.8 to 9.1.0.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v1.8.8...v9.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-12 08:24:07 +08:00
袁贵 eab75215e2 Merge branch 'master' of https://github.com/ccfish86/sctalk.git 2020-07-20 11:56:19 +08:00
袁贵 6de5f1d239 修复客户端重连后删除一个超时连接时,把整个Client信息从在线Clients删除的问题 2020-07-20 11:55:46 +08:00
dependabot[bot] 2c55244120 Bump mysql-connector-java in /server/admin/talk-grpc
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.44 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.44...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-02 08:26:16 +08:00
dependabot[bot] 86660ae583 Bump webpack-bundle-analyzer from 2.8.2 to 3.6.0 in /server/admin/vue
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 2.8.2 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v2.8.2...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-14 17:30:45 +08:00
dependabot[bot] 39448dcac6 Bump axios from 0.17.1 to 0.19.0 in /server/admin/vue
Bumps [axios](https://github.com/axios/axios) from 0.17.1 to 0.19.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.17.1...v0.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-14 17:30:18 +08:00
袁贵 51d760bcd7 improve rm fastdfs dependency 2020-01-06 15:29:21 +08:00
袁贵 75cd3550e2 [file store] change fastdfs to minio 2020-01-06 14:45:28 +08:00
dependabot[bot] dc1d5eb5a6 Bump netty-all from 4.0.27.Final to 4.1.42.Final in /server/talk-common
Bumps [netty-all](https://github.com/netty/netty) from 4.0.27.Final to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.0.27.Final...netty-4.1.42.Final)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-05 18:28:46 +08:00
yuangui 08a7e9df1a 处理取消息ID时lastMsgId没有正常处理的BUG 2019-07-10 17:39:20 +08:00
yuangui ab37274815 处理BUG 2019-07-10 17:36:59 +08:00
yuangui b6644dfe70 修复消息发送后对方无法在最近联系人看到 2019-07-10 08:32:56 +08:00
yuangui a979f76be0 修复对方无法看到最近联系人 2019-07-09 22:08:26 +08:00
ccfish 6154a9d165 修复BUG 2019-05-31 15:11:57 +08:00
ccfish b9aa5bbc32 修复BUG 2019-05-31 12:11:49 +08:00
ccfish86 823dbd6b2d 修复用户未加入群组时的SQL执行异常 2019-03-14 12:00:24 +08:00
闷B神 941c35ef06 Update README.md 2018-06-11 08:55:30 +08:00
ccfish86 3ba0586da7 追加csharp下的protobuf定义 2018-05-25 13:15:37 +08:00
ccfish86 3f3df7f163 修正 2018-05-25 10:07:19 +08:00
ccfish86 f661020deb 更新打赏信息 2018-05-25 10:06:20 +08:00
ccfish86 1d965d7c9b 删除多余的web层annotation 2018-05-23 18:01:50 +08:00
ccfish86 88ca705454 修改identity配置 2018-04-17 19:02:03 +08:00
ccfish86 409f423540 修复JPA-in表达式查询(之前为or条件组件而成),因sharding不支持or条件 2018-04-17 18:49:57 +08:00
ccfish86 aec6b6ee5b 更新分表库 2018-04-17 17:15:14 +08:00
ccfish86 d69c55b858 细化 2018-03-16 19:13:14 +08:00
ccfish86 f0bc1e43ea 追加说明 2018-03-16 18:47:25 +08:00
ccfish86 6882712014 离线文件表 2018-03-13 11:18:18 +08:00