From 77b07dd0953d2296bffbc989678bb7f4fe1527df Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 16:53:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 36 +++++++++---------- .../com/xboe/system/user/api/UserApi.java | 4 +++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index e0406c88..1b805548 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - 2.2.0 + - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - ${spring-cloud-alibaba.version} - - - com.alibaba.nacos - nacos-client - - - - - com.alibaba.nacos - nacos-client - ${nacos-client.version} - + + + + + + + + + + + + + + + + + org.apache.poi diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 4181413b..3ae8e1d7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -176,7 +177,10 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); + user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 + account.setEmail(DesensitizedUtil.email(account.getEmail())); + account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From 653f3bc80393fb5c79252c5791b18d3223fb6e01 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:16:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E4=BF=A1=E6=81=AF=E8=84=B1?= =?UTF-8?q?=E6=95=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/system/user/api/UserApi.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 3ae8e1d7..4181413b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.annotation.Resource; -import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -177,10 +176,7 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); - user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 - account.setEmail(DesensitizedUtil.email(account.getEmail())); - account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From 72f2ea6164c5f4aef9473190984aae1d797b7a91 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:19:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/system/user/api/UserApi.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 4181413b..3ae8e1d7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -176,7 +177,10 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); + user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 + account.setEmail(DesensitizedUtil.email(account.getEmail())); + account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From cc6251d479e64eb46c4431b04e2b51acb892e7a3 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:24:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 37247eb9..e0406c88 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - + 2.2.0 - - - - - - - - - - - - - - - - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + org.apache.poi From 85c87d4c3df0728adf72ad62ba3a28ad130a3660 Mon Sep 17 00:00:00 2001 From: lu Date: Thu, 26 Oct 2023 09:48:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?upd=20=E6=A1=88=E4=BE=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index f1e4f87e..c546e399 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -858,8 +858,8 @@ public class CasesServiceImpl implements ICasesService { } @Override + @Transactional public void save(Cases cases) { - cases.setId(IDGenerator.generate()); cases.setIsTop(false); cases.setComments(0); @@ -887,6 +887,7 @@ public class CasesServiceImpl implements ICasesService { } @Override + @Transactional public void update(Cases cases) { List majorIds = cases.getMajorIds(); List caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId()));