From d3fadf8bbef20f2c6c89393ae71b5cc593bef7f0 Mon Sep 17 00:00:00 2001 From: easonzhu Date: Tue, 4 Mar 2025 10:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy_prod_without_package.bat | 30 +++++++++++++++++++ .../group/query/ListGroupCustomerQuery.java | 10 +++---- .../admin/AdminGroupCollectService.java | 8 ++--- .../admin/AdminGroupMessageService.java | 4 +-- .../com/syzb/group/vo/GroupCustomerVO.java | 20 ++++++------- 5 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 deploy_prod_without_package.bat diff --git a/deploy_prod_without_package.bat b/deploy_prod_without_package.bat new file mode 100644 index 0000000..dbf9c20 --- /dev/null +++ b/deploy_prod_without_package.bat @@ -0,0 +1,30 @@ +@echo off + +:: 1. 设置动态参数 +set REMOTE_IP=119.29.151.152 +set REMOTE_PORT=22101 +set REMOTE_PATH=/tmp +set REMOTE_USER=ubuntu +set DEPLOY_SCRIPT=/home/ubuntu/deploy_advisor.sh + +:: 2. 将 JAR 包传输到 Linux 服务器 +echo Copying JAR file to Linux server... +call scp -P %REMOTE_PORT% target\AdvisorServer-2.6.7.jar %REMOTE_USER%@%REMOTE_IP%:%REMOTE_PATH% + +:: 检查 SCP 命令是否成功 +IF %ERRORLEVEL% NEQ 0 ( + echo File transfer failed, exiting... + exit /b %ERRORLEVEL% +) + +:: 3. 通过 SSH 运行 deploy.sh 脚本 +echo Running deploy_advisor.sh script on Linux server... +call ssh -p %REMOTE_PORT% %REMOTE_USER%@%REMOTE_IP% "bash %DEPLOY_SCRIPT%" + +:: 检查 SSH 命令是否成功 +IF %ERRORLEVEL% NEQ 0 ( + echo Failed to start the application, exiting... + exit /b %ERRORLEVEL% +) + +echo Deployment successful! \ No newline at end of file diff --git a/src/main/java/com/syzb/group/query/ListGroupCustomerQuery.java b/src/main/java/com/syzb/group/query/ListGroupCustomerQuery.java index 3cfc6a1..409e033 100644 --- a/src/main/java/com/syzb/group/query/ListGroupCustomerQuery.java +++ b/src/main/java/com/syzb/group/query/ListGroupCustomerQuery.java @@ -24,7 +24,7 @@ public class ListGroupCustomerQuery extends PageQuery { private Integer customerStatus; @ApiModelProperty("禁言状态 1:已禁言 2:未禁言") - private Integer commentBlackStatus; + private Integer isForbidden; public Integer getGroupId() { return groupId; @@ -66,11 +66,11 @@ public class ListGroupCustomerQuery extends PageQuery { this.customerStatus = customerStatus; } - public Integer getCommentBlackStatus() { - return commentBlackStatus; + public Integer getIsForbidden() { + return isForbidden; } - public void setCommentBlackStatus(Integer commentBlackStatus) { - this.commentBlackStatus = commentBlackStatus; + public void setIsForbidden(Integer isForbidden) { + this.isForbidden = isForbidden; } } diff --git a/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java b/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java index 91e334a..6ec4dc7 100644 --- a/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java +++ b/src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java @@ -226,7 +226,7 @@ public class AdminGroupCollectService { String nickName = query.getNickName(); Integer isOnline = query.getIsOnline(); Integer customerStatus = query.getCustomerStatus(); - Integer commentBlackStatus = query.getCommentBlackStatus(); + Integer commentBlackStatus = query.getIsForbidden(); Set moduleIdSet = groupCommonService.getModuleIds(groupId); if (CollUtil.isEmpty(moduleIdSet)) { return Pager.emptyPager(); @@ -254,10 +254,10 @@ public class AdminGroupCollectService { WxUser wxUser = wxUserMap.get(moduleUser.getUserId()); if (wxUser != null) { vo.setNickName(wxUser.getNickName()); - vo.setHeadPicUrl(wxUser.getImgUrl()); + vo.setUserHeadPicUrl(wxUser.getImgUrl()); } vo.setIsOnline(onlineUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value); - vo.setCommentBlackStatus(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value); + vo.setIsForbidden(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value); vo.setCustomerStatus(calCustomerStatus(moduleUser).value); vo.setLastVisitTime(lastVisitTimeMap.get(moduleUser.getUserId())); vo.setLastChatTime(lastChatTimeMap.get(moduleUser.getUserId())); @@ -274,7 +274,7 @@ public class AdminGroupCollectService { voStream = voStream.filter(vo -> customerStatus.equals(vo.getCustomerStatus())); } if (commentBlackStatus != null) { - voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getCommentBlackStatus())); + voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getIsForbidden())); } List voList = voStream.collect(Collectors.toList()); List pageList = CollUtil.page(query.getCurrent() - 1, query.getSize(), voList); diff --git a/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java b/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java index d6127ee..faf91d7 100644 --- a/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java +++ b/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java @@ -302,9 +302,9 @@ public class AdminGroupMessageService { WxUser wxUser = wxUserMap.get(moduleUser.getUserId()); if (wxUser != null) { vo.setNickName(wxUser.getNickName()); - vo.setHeadPicUrl(wxUser.getImgUrl()); + vo.setUserHeadPicUrl(wxUser.getImgUrl()); } - vo.setCommentBlackStatus(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value); + vo.setIsForbidden(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value); return vo; }).collect(Collectors.toList()); return new AppPager<>(list, hasNext); diff --git a/src/main/java/com/syzb/group/vo/GroupCustomerVO.java b/src/main/java/com/syzb/group/vo/GroupCustomerVO.java index da18791..2991440 100644 --- a/src/main/java/com/syzb/group/vo/GroupCustomerVO.java +++ b/src/main/java/com/syzb/group/vo/GroupCustomerVO.java @@ -17,7 +17,7 @@ public class GroupCustomerVO { private String nickName; @ApiModelProperty("头像") - private String headPicUrl; + private String userHeadPicUrl; @ApiModelProperty("加入时间") private LocalDateTime joinTime; @@ -32,7 +32,7 @@ public class GroupCustomerVO { private Integer customerStatus; @ApiModelProperty("禁言状态 1:已禁言 2:未禁言") - private Integer commentBlackStatus; + private Integer isForbidden; @ApiModelProperty("最近一次访问时间") private LocalDateTime lastVisitTime; @@ -71,12 +71,12 @@ public class GroupCustomerVO { this.nickName = nickName; } - public String getHeadPicUrl() { - return headPicUrl; + public String getUserHeadPicUrl() { + return userHeadPicUrl; } - public void setHeadPicUrl(String headPicUrl) { - this.headPicUrl = headPicUrl; + public void setUserHeadPicUrl(String userHeadPicUrl) { + this.userHeadPicUrl = userHeadPicUrl; } public LocalDateTime getJoinTime() { @@ -111,12 +111,12 @@ public class GroupCustomerVO { this.customerStatus = customerStatus; } - public Integer getCommentBlackStatus() { - return commentBlackStatus; + public Integer getIsForbidden() { + return isForbidden; } - public void setCommentBlackStatus(Integer commentBlackStatus) { - this.commentBlackStatus = commentBlackStatus; + public void setIsForbidden(Integer isForbidden) { + this.isForbidden = isForbidden; } public LocalDateTime getLastVisitTime() {