From 39e52b54fd9d7d50eaad0a3af13cea97b11daf65 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 23 Apr 2025 22:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E6=96=B0=E5=8C=85=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdminAppMarketUpdateService.java | 5 +- .../impl/AdminAppMarketUpdateServiceImpl.java | 75 +++++++++++++++---- .../modules/admin/AdminAppMarketUpdate.java | 7 +- .../lakala/controller/LklTkController.java | 8 +- .../{CommonService.java => LklTkService.java} | 4 +- 5 files changed, 72 insertions(+), 27 deletions(-) rename mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/{CommonService.java => LklTkService.java} (99%) diff --git a/mall-admin/src/main/java/com/suisung/mall/admin/service/AdminAppMarketUpdateService.java b/mall-admin/src/main/java/com/suisung/mall/admin/service/AdminAppMarketUpdateService.java index 62aa04bd..083ac55a 100644 --- a/mall-admin/src/main/java/com/suisung/mall/admin/service/AdminAppMarketUpdateService.java +++ b/mall-admin/src/main/java/com/suisung/mall/admin/service/AdminAppMarketUpdateService.java @@ -62,12 +62,11 @@ public interface AdminAppMarketUpdateService { CommonResult enableOrDisableInAdmin(Long id, Integer status); /** - * 获取一条记录 + * 获取最后一条记录 * * @param marketId * @param packageName - * @param versionKey * @return */ - AdminAppMarketUpdate getAppMarketUpdate(Integer marketId, String packageName, Integer versionKey); + AdminAppMarketUpdate getLastAppMarketUpdate(Integer marketId, String packageName); } diff --git a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminAppMarketUpdateServiceImpl.java b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminAppMarketUpdateServiceImpl.java index a7f38e9a..f2a762ad 100644 --- a/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminAppMarketUpdateServiceImpl.java +++ b/mall-admin/src/main/java/com/suisung/mall/admin/service/impl/AdminAppMarketUpdateServiceImpl.java @@ -22,12 +22,16 @@ import com.suisung.mall.common.modules.admin.AdminAppMarketUpdate; import com.suisung.mall.common.pojo.dto.FileInfoDTO; import com.suisung.mall.common.utils.StringUtils; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; @Service public class AdminAppMarketUpdateServiceImpl extends BaseServiceImpl implements AdminAppMarketUpdateService { + @Value("${spring.profiles.active}") + private String profile; + /** * 获取某个市场的最新 APP 版本 * @@ -42,18 +46,32 @@ public class AdminAppMarketUpdateServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("market_id", marketId).eq("package_name", packageName) - .eq("version_key", versionKey); + queryWrapper.eq("market_id", marketId) + .eq("package_name", packageName).orderByDesc("version_key"); return findOne(queryWrapper); } diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/admin/AdminAppMarketUpdate.java b/mall-common/src/main/java/com/suisung/mall/common/modules/admin/AdminAppMarketUpdate.java index e7c68534..6608505e 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/admin/AdminAppMarketUpdate.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/admin/AdminAppMarketUpdate.java @@ -43,8 +43,11 @@ public class AdminAppMarketUpdate implements Serializable { @ApiModelProperty(value = "热更新包显示的版本号，用于标识不同的热更新版本，遵循一定命名规则，如 1.23.21") private String version_name; - @ApiModelProperty(value = "热更新包的下载链接，用户可通过此链接下载更新包完成应用更新") - private String download_url; + @ApiModelProperty(value = "apk包的下载链接，用户可通过此链接下载更新包完成应用更新") + private String download_apk_url; + + @ApiModelProperty(value = "增量包的下载链接，用户可通过此链接下载更新包完成应用更新") + private String download_wgt_url; @ApiModelProperty(value = "更新包后缀：apk， wgt") private String file_ext; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/LklTkController.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/LklTkController.java index a9f7d7fa..cac3f141 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/LklTkController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/LklTkController.java @@ -9,7 +9,7 @@ package com.suisung.mall.shop.lakala.controller; import com.suisung.mall.common.service.impl.BaseControllerImpl; -import com.suisung.mall.shop.lakala.service.impl.CommonService; +import com.suisung.mall.shop.lakala.service.impl.LklTkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,18 +24,18 @@ import javax.annotation.Resource; public class LklTkController extends BaseControllerImpl { @Resource - private CommonService commonService; + private LklTkService lklTkService; @ApiOperation(value = "请求获取token（商户进件）", notes = "请求获取token（商户进件）") @RequestMapping(value = "/token", method = RequestMethod.POST) public String getLklTkAuthorization() { - return commonService.getLklTkAuthorization(); + return lklTkService.getLklTkAuthorization(); } @ApiOperation(value = "请求获取token（商户进件）", notes = "请求获取token（商户进件）") @RequestMapping(value = "/token1", method = RequestMethod.POST) public String getLklTkAuthorization1() { - return commonService.getLklTkAuthorization(); + return lklTkService.getLklTkAuthorization(); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/CommonService.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkService.java similarity index 99% rename from mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/CommonService.java rename to mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkService.java index 61c3fb8f..ed23b640 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/CommonService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkService.java @@ -36,9 +36,9 @@ import java.util.HashMap; import java.util.Map; @Service -public class CommonService { +public class LklTkService { - private static final Logger log = LoggerFactory.getLogger(CommonService.class); + private static final Logger log = LoggerFactory.getLogger(LklTkService.class); @Value("${lakala.tk.server_url}") private String serverUrl;