From 18c19e5a1cc5bd1bc4388f435d235a4d03b9c96e Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 21 Feb 2023 15:04:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pre.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 2e26f8e7..74f82771 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -8,7 +8,7 @@ spring.redis.port=6379 spring.jpa.hibernate.ddl-auto=update spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base1?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.username=root spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==) From 070964d87cc1106a15e429ade262e43ac82ffd9b Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 21 Feb 2023 15:12:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3name?= =?UTF-8?q?=E5=8F=88=E6=94=B9=E6=88=90realName=E4=BA=86=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/data/outside/OutSideDataServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 71e9c396..561bf800 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -61,7 +61,11 @@ public class OutSideDataServiceImpl implements IOutSideDataService { for(JsonNode node :result) { AudienceUser au=new AudienceUser(); au.setId(node.get("userId").asText()); - au.setName(getNodeText(node.get("name"))); + if(node.get("realName")!=null) { + au.setName(getNodeText(node.get("realName"))); + }else if(node.get("name")!=null){ + au.setName(getNodeText(node.get("name"))); + } au.setCode(getNodeText(node.get("userNo"))); list.add(au); } From bcc066b28f87c2961205870386020dff5d58a04c Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 21 Feb 2023 15:54:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/data/service/impl/DataUserSyncServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index bed7561d..5e729684 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -55,8 +55,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ //新账户 a=new Account(); a.setDeleted(user.getDeleted()); - - a.setSysId(user.getKid()); a.setLoginName(user.getCode()); a.setAvatar(user.getAvatar()); a.setId(user.getId()); From a173c18a23a4d0e836ce130376955fd3af5aa44a Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 21 Feb 2023 16:28:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/data/api/UserDataSyncApi.java | 22 ++++++++++++++++++- .../service/impl/DataUserSyncServiceImpl.java | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java index 44e9f28e..afcedd7b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.xboe.account.entity.Account; import com.xboe.account.service.IAccountService; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; @@ -39,7 +40,7 @@ public class UserDataSyncApi extends ApiBaseController { IDataUserSyncService service; @PostMapping("/user") - public JsonResponse syncUser( @RequestBody UserData user) { + public JsonResponse syncUser(@RequestBody UserData user) { if (StringUtils.isBlank(user.getId())) { return error("无用户的id"); @@ -54,5 +55,24 @@ public class UserDataSyncApi extends ApiBaseController { return error("同步处理用户失败", e.getMessage()); } } + + @PostMapping("/deluser") + public JsonResponse deleteUser(String id) { + + if (StringUtils.isBlank(id)) { + return error("无用户的id"); + } + //清除缓存需要loginName + try { + //先查询是否存在 + Account a=new Account(); + a.setId(id); + accountService.delete(a); + return success(true); + } catch (Exception e) { + log.error("同步删除用户错误", e); + return error("同步删除用户失败", e.getMessage()); + } + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index 5e729684..3acc7f6d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -51,6 +51,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ if(user.getDeleted()!=null) { a.setDeleted(user.getDeleted()); } + + a.setLoginName(user.getCode()); + }else { //新账户 a=new Account();