Pu Zhibing
8 天以前 b8dd269fc4a0824db2dbf8ab1b6fffbcfc9ba199
refs
用户 Pu Zhibing <393733352@qq.com>
星期二, 八月 12, 2025 10:44 +0800
提交者 Pu Zhibing <393733352@qq.com>
星期二, 八月 12, 2025 10:44 +0800
提交b8dd269fc4a0824db2dbf8ab1b6fffbcfc9ba199
目录 efb9b70f41c253ffaa1f37576ef8cef5d2dc83de 目录 | zip | gz
parent 4231cb0417322b6b974210d31ff4cbd8a842da96 查看 | 对比
04eb306aee2ffa4c06860d5935aac3360463f73b 查看 | 对比
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

 Conflicts:
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
6个文件已修改
38 ■■■■ 已修改文件
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史