From 423c770ac8691d07cece54510ca2646fe11a3218 Mon Sep 17 00:00:00 2001 From: David Wang Date: Fri, 8 Jul 2022 10:05:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(pojo):=20=E2=99=BB=EF=B8=8F=20?= =?UTF-8?q?=E9=87=8D=E6=9E=84pojo=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构pojo的toString方法逻辑,使其返回JSON格式的字符串 (cherry picked from commit a005e060de736afd8d72b9361838184677ac5a70) --- src/main/java/org/netunion/manager/pojo/Device.java | 2 +- src/main/java/org/netunion/manager/pojo/Member.java | 2 +- src/main/java/org/netunion/manager/pojo/User.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/netunion/manager/pojo/Device.java b/src/main/java/org/netunion/manager/pojo/Device.java index d7a21e4..2116dba 100644 --- a/src/main/java/org/netunion/manager/pojo/Device.java +++ b/src/main/java/org/netunion/manager/pojo/Device.java @@ -56,7 +56,7 @@ public void setRackNo(int rackNo) { @Override public String toString() { - return "Device{" + + return "{" + "id=" + id + ", deviceType='" + deviceType + '\'' + ", manageIp='" + manageIp + '\'' + diff --git a/src/main/java/org/netunion/manager/pojo/Member.java b/src/main/java/org/netunion/manager/pojo/Member.java index 50c2443..cecac4e 100644 --- a/src/main/java/org/netunion/manager/pojo/Member.java +++ b/src/main/java/org/netunion/manager/pojo/Member.java @@ -58,7 +58,7 @@ public void setPhoneNum(String phoneNum) { @Override public String toString() { - return "Member{" + + return "{" + "id=" + id + ", name='" + name + '\'' + ", studentId='" + studentId + '\'' + diff --git a/src/main/java/org/netunion/manager/pojo/User.java b/src/main/java/org/netunion/manager/pojo/User.java index b7899f1..7f87595 100644 --- a/src/main/java/org/netunion/manager/pojo/User.java +++ b/src/main/java/org/netunion/manager/pojo/User.java @@ -34,7 +34,7 @@ public int getId() { @Override public String toString() { - return "User{" + + return "{" + "userName='" + userName + '\'' + ", hashedPasswd='" + hashedPassword + '\'' + ", id'" + id + '\'' + From 0baa0d6dd6f8aad8b642933f34a38b27b46934a6 Mon Sep 17 00:00:00 2001 From: David Wang Date: Fri, 8 Jul 2022 10:25:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore(controller):=20=F0=9F=94=A9=20?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E4=B8=BAJSON=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cdb48f4e0a3bc87c74db533349826654f44b06fc) --- .../netunion/manager/controller/DeviceController.java | 10 +++++----- .../netunion/manager/controller/MemberController.java | 6 +++--- .../netunion/manager/controller/UserController.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/netunion/manager/controller/DeviceController.java b/src/main/java/org/netunion/manager/controller/DeviceController.java index aaf4954..62372f2 100644 --- a/src/main/java/org/netunion/manager/controller/DeviceController.java +++ b/src/main/java/org/netunion/manager/controller/DeviceController.java @@ -44,7 +44,7 @@ public String deleteDevice(@PathVariable("id") int id) { return device.toString(); } else { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } } //通过 POST 方式更新设备类型 @@ -52,7 +52,7 @@ public String deleteDevice(@PathVariable("id") int id) { public String updateDeviceType(@RequestParam int id, @RequestParam String type) { Device device = deviceMapper.getById(id); if (device == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { deviceMapper.updateDeviceTypeById(id, type); @@ -64,7 +64,7 @@ public String updateDeviceType(@RequestParam int id, @RequestParam String type) public String updateDeviceManageIp(@RequestParam int id, @RequestParam String manageIp) { Device device = deviceMapper.getById(id); if (device == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { deviceMapper.updateManageIpById(id, manageIp); @@ -76,7 +76,7 @@ public String updateDeviceManageIp(@RequestParam int id, @RequestParam String ma public String updateDeviceName(@RequestParam int id, @RequestParam String name) { Device device = deviceMapper.getById(id); if (device == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { deviceMapper.updateNameById(id, name); @@ -88,7 +88,7 @@ public String updateDeviceName(@RequestParam int id, @RequestParam String name) public String updateDeviceRackNo(@RequestParam int id, @RequestParam int rackNo) { Device device = deviceMapper.getById(id); if (device == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { deviceMapper.updateRackNoById(id, rackNo); diff --git a/src/main/java/org/netunion/manager/controller/MemberController.java b/src/main/java/org/netunion/manager/controller/MemberController.java index 8376d97..b684514 100644 --- a/src/main/java/org/netunion/manager/controller/MemberController.java +++ b/src/main/java/org/netunion/manager/controller/MemberController.java @@ -44,7 +44,7 @@ public String deleteMember(@PathVariable("id") int id) { return member.toString(); } else { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } } //通过 POST 方式更新成员银行卡号 @@ -52,7 +52,7 @@ public String deleteMember(@PathVariable("id") int id) { public String updateMemberBankNum(@RequestParam int id, @RequestParam String bankNum) { Member member = memberMapper.getById(id); if (member == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { memberMapper.updateBankNumById(id, bankNum); @@ -65,7 +65,7 @@ public String updateMemberPhoneNum(@RequestParam int id, @RequestParam String ph Member member = memberMapper.getById(id); //判空 if (member == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { memberMapper.updatePhoneNumById(id, phoneNum); diff --git a/src/main/java/org/netunion/manager/controller/UserController.java b/src/main/java/org/netunion/manager/controller/UserController.java index 6212109..fde3093 100644 --- a/src/main/java/org/netunion/manager/controller/UserController.java +++ b/src/main/java/org/netunion/manager/controller/UserController.java @@ -52,7 +52,7 @@ public String deleteUser(@PathVariable("id") int id) { return user.toString(); } else { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } } //通过 POST 方式更新用户密码 @@ -60,13 +60,13 @@ public String deleteUser(@PathVariable("id") int id) { public String updateUserPassword(@RequestParam int id, @RequestParam String oldPassWord, @RequestParam String newPassWord) { User user = userMapper.getById(id); if (user == null) { - return "EMPTY ID"; + return "{\"error\": \"EMPTY ID\"}"; } else { if (user.getHashedPassword().equals(oldPassWord)) { userMapper.updatePasswordById(id, oldPassWord, newPassWord); return user.toString(); } else { - return "WRONG PASSWORD"; + return "{\"error\": \"EMPTY ID\"}"; } } }

AltStyle によって変換されたページ (->オリジナル) /