From 3a24815bed52fa0200171238b3890698c5853f25 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 10 Mar 2025 15:39:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20.sh=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/sh/app-pre.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/sh/app-pre.sh b/bin/sh/app-pre.sh index 82c3afe98..46457dbb6 100644 --- a/bin/sh/app-pre.sh +++ b/bin/sh/app-pre.sh @@ -32,7 +32,9 @@ start(){ else # 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件 # 注意：nohup 应该是 nohup 的拼写错误 + echo "jsowell-admin.jar 正在启动..." nohup java -Xms512m -Xmx512m -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=pre >/dev/null 2>&1 & + echo "jsowell-admin.jar 启动完成..." fi } @@ -45,6 +47,7 @@ stop(){ kill -9 $pid # 输出停止应用的提示信息 echo "Stopped ${APP_NAME} running on port $PORT." + echo "jsowell-admin.jar已停止..." else # 如果应用没有运行，则输出提示信息 echo "${APP_NAME} is not running on port $PORT." From b891951a67d769b610443f0b13410923519065af Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Mar 2025 08:53:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20.sh=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/sh/app-prd.sh | 3 +++ bin/sh/app-pre.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/sh/app-prd.sh b/bin/sh/app-prd.sh index 79a9de8be..8874bc153 100644 --- a/bin/sh/app-prd.sh +++ b/bin/sh/app-prd.sh @@ -32,7 +32,9 @@ start(){ else # 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件 # 注意：nohup 应该是 nohup 的拼写错误 + echo "jsowell-admin.jar 正在启动..." nohup java -Xms12g -Xmx12g -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=prd >/dev/null 2>&1 & + echo "jsowell-admin.jar 启动完成..." fi } @@ -45,6 +47,7 @@ stop(){ kill -9 $pid # 输出停止应用的提示信息 echo "Stopped ${APP_NAME} running on port $PORT." + echo "jsowell-admin.jar已停止..." else # 如果应用没有运行，则输出提示信息 echo "${APP_NAME} is not running on port $PORT." diff --git a/bin/sh/app-pre.sh b/bin/sh/app-pre.sh index 46457dbb6..65a24ca97 100644 --- a/bin/sh/app-pre.sh +++ b/bin/sh/app-pre.sh @@ -1,13 +1,13 @@ #!/bin/bash # 声明应用的名称和使用的端口号 -APP_NAME=jsowell-admin.jar -PORT=8080 # 假设应用绑定到这个端口 - +APP_NAME=jsowell-admin.jar +PORT=8080 # 假设应用绑定到这个端口 + # 使用函数来显示脚本的使用方式，并退出脚本 usage() { echo "Usage: sh app.sh [start|stop|restart|status]" exit 1 -} +} # 检查应用是否已经在运行 is_exist(){ From 8f1b8cb52770e736e3aa0d138757a403c83cbf9d Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 12 Mar 2025 16:21:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E5=95=86=E9=85=8D=E7=BD=AE=E7=9A=84=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PileMerchantInfoServiceImpl.java | 2 +- .../mapper/pile/PileMerchantInfoMapper.xml | 58 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 2fe11aa91..fd3d27801 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -647,7 +647,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { if (pileMerchantInfo != null) { MerchantWithdrawalTypeVO merchantWithdrawalTypeVO = new MerchantWithdrawalTypeVO(); merchantWithdrawalTypeVO.setMerchantId(pileMerchantInfo.getId() + ""); - merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getDelayMode()); + merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getWithdrawalType()); merchantWithdrawalTypeVO.setReservedAmount(pileMerchantInfo.getReservedAmount()); return merchantWithdrawalTypeVO; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index f1477202e..aa4985322 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -29,14 +29,14 @@ - id, merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode, - organization_code, manager_name, manager_phone, service_phone, logo_url, app_id, - alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, + id, merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode, + organization_code, manager_name, manager_phone, service_phone, logo_url, app_id, + alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, update_time, del_flag + - where id = #{id} - select from pile_merchant_info - where id in + where id in #{merchantId,jdbcType=VARCHAR} @@ -1125,7 +1125,7 @@ - select from pile_merchant_info @@ -1149,7 +1149,7 @@ - select from pile_merchant_info @@ -1157,7 +1157,7 @@ and dept_id = #{deptId,jdbcType=VARCHAR} - select from @@ -1171,7 +1171,7 @@ - select from @@ -1180,7 +1180,7 @@ and merchant_level = '1' - select from @@ -1190,7 +1190,7 @@ and app_id = #{wxAppId,jdbcType=VARCHAR} - select from @@ -1248,7 +1248,7 @@ - select from pile_merchant_info where del_flag = '0' @@ -1269,4 +1269,4 @@ AND t1.id = #{stationId,jdbcType=VARCHAR} - \ No newline at end of file + From f471d353623e72234a071f872c164f3603e73423 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 12 Mar 2025 16:31:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/web/controller/pile/PileMerchantInfoController.java | 2 +- .../jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index 00e832705..c1aebbc0a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -151,7 +151,7 @@ public class PileMerchantInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('pile:merchant:edit')") @Log(title = "修改提现方式", businessType = BusinessType.UPDATE) - @PutMapping("/updateWithdrawalType") + @PostMapping("/updateWithdrawalType") public AjaxResult updateWithdrawalType(@RequestBody MerchantWithdrawalTypeVO dto) { return toAjax(pileMerchantInfoService.updateWithdrawalType(dto)); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index fd3d27801..5685300b0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -667,7 +667,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { } merchantInfo.setUpdateBy(SecurityUtils.getUsername()); merchantInfo.setUpdateTime(DateUtils.getNowDate()); - return pileMerchantInfoMapper.updatePileMerchantInfo(merchantInfo); + return pileMerchantInfoMapper.updateByPrimaryKeySelective(merchantInfo); } }