Merge remote-tracking branch 'origin/master'

This commit is contained in:
zjf committed 2026-09-11 15:45:36 +08:00
commit ba4a564c85
1 file changed
+4 -2
@@ -1,10 +1,12 @@
package com.bsd.pjcloud.integrated.controller.app;
import com.bsd.pjcloud.common.api.encrypt.annotation.crypto.ApiCryptoAes;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.log.annotation.SysLog;
import com.bsd.pjcloud.common.security.annotation.Inner;
import com.bsd.pjcloud.integrated.dto.app.AppVersionDto;
import com.bsd.pjcloud.integrated.entity.app.AppVersionEntity;
import com.bsd.pjcloud.integrated.service.AppVersionPackageUploadService;
@@ -45,6 +47,7 @@ public class AppVersionController {
/* ************************************* start app start ************************************* */
@Operation(summary = "获取最新版本", description = "获取最新版本")
@ApiCryptoAes
@Inner(value = false)
@GetMapping("/app/last-version")
public R<AppVersionEntity> lastVersion(@ParameterObject AppVersionDto dto) {
return R.ok(appVersionService.lastVersion(dto));
@@ -120,8 +123,7 @@ public class AppVersionController {
try {
return R.ok(appVersionPackageUploadService.uploadBySftp(file, host, port, username, password, remoteDir,
publicBaseUrl));
}
catch (IllegalArgumentException ex) {
} catch (IllegalArgumentException ex) {
return R.failed(ex.getMessage());
}
}