From b8a3a99dd568d2b41d29433fa2692409ec1acaba Mon Sep 17 00:00:00 2001 From: godotg Date: Fri, 15 Jul 2022 16:30:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix[storage]:=20excel=E7=9A=84=E9=A6=96?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E5=85=83=E6=A0=BC=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zfoo/storage/util/ExcelToJsonUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/storage/src/main/java/com/zfoo/storage/util/ExcelToJsonUtils.java b/storage/src/main/java/com/zfoo/storage/util/ExcelToJsonUtils.java index dab02835..ca051a46 100644 --- a/storage/src/main/java/com/zfoo/storage/util/ExcelToJsonUtils.java +++ b/storage/src/main/java/com/zfoo/storage/util/ExcelToJsonUtils.java @@ -75,6 +75,12 @@ public class ExcelToJsonUtils { List rows = new ArrayList<>(); while (iterator.hasNext()) { var row = iterator.next(); + + var idCell = row.getCell(0); + if (StringUtils.isBlank(CellUtils.getCellStringValue(idCell))) { + continue; + } + var columns = new ArrayList(); for (var header : headers) { var cell = row.getCell(header.getIndex()); From fd26e2120cbb05497d2b30f2cb8a092a8f88ce64 Mon Sep 17 00:00:00 2001 From: godotg Date: Sat, 16 Jul 2022 15:26:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?doc[zfoo]:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8a2a3169..0bb60904 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ ----------- Why is zfoo protocol ? ----------- + - Java二进制序列化速度最快的自定义格式框架，并且为序列化字节最少的框架，更加安全，可前后兼容 - 协议目前原生支持 C++ C# Java Javascript TypeScript GDScript Lua，可以轻易实现跨平台 - 单线程的Benchmark测试中，序列化和反序列化速度比Protobuf快50%，比Kryo快100% @@ -55,12 +56,12 @@ Why is zfoo protocol ? -------------------- - 有问题，先看 [FAQ](./doc/FAQ.md)，每个工程目录的test文件夹下都有标准的demo展示和注释说明，可以直接运行 - - [问题讨论群QQ: 876280300](https://qm.qq.com/cgi-bin/qm/qr?k=uSo2FnXz50i5UZ1LYZS1sPsVWW9A34v-&jump_from=webapi) + - [问题讨论群QQ: 876280300](https://qm.qq.com/cgi-bin/qm/qr?k=uSo2FnXz50i5UZ1LYZS1sPsVWW9A34v-&jump_from=webapi) - [tank-game-server](https://github.com/zfoo-project/tank-game-server) 网络游戏《进击的坦克（The Fight of Tanks）》，新手友好，难度2星 - - 快速体验，tank游戏入口 [tank.zfoo.net](http://tank.zfoo.net) - - 快速体验，tank后台管理 [tank-admin.zfoo.net](http://tank-admin.zfoo.net) + - 快速体验，tank游戏入口 [tank.zfoo.net](http://tank.zfoo.net) + - 快速体验，tank后台管理 [tank-admin.zfoo.net](http://tank-admin.zfoo.net) - [zapp](https://github.com/zfoo-project/zapp) 图片分享聊天网站，标准的https企业级网站，难度5星 @@ -171,7 +172,7 @@ public class StudentResource { - 欢迎喜欢这个项目的人来一起维护这个项目，提交代码的时候注意下面规范 - Java项目格式化代码的方式采用IntelliJ Idea默认的格式化 -- 代码提交的说明(commit message)按照下面给出的些常用格式 +- [代码提交的说明(commit message)](https://github.com/pvdlg/conventional-changelog-metahub#commit-types) 按照下面给出的些常用格式 ``` feat[module]: 新增某一项功能