Explorar el Código

部署中心后端修改

xujie hace 1 año
padre
commit
7e0980bcb9

+ 7 - 8
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/AppPackageController.java

@@ -10,12 +10,11 @@ import com.xunmei.deploy.domain.UploadAppInfo;
 import com.xunmei.deploy.domain.ZipPackInfo;
 import com.xunmei.deploy.service.UploadAppInfoService;
 import com.xunmei.deploy.service.ZipPackInfoService;
+import org.apache.ibatis.annotations.Delete;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -37,7 +36,7 @@ public class AppPackageController extends BaseController{
     /**
      * 升级包管理-列表
      */
-    @PostMapping("/list")
+    @GetMapping("/list")
     public TableDataInfo list(Page<ZipPackInfo> page, ZipPackInfo info){
         IPage<ZipPackInfo> result = zipPackInfoService.selectPage(page,info);
         return getDataTable(result);
@@ -65,8 +64,8 @@ public class AppPackageController extends BaseController{
     /**
      * 升级包管理-详情页(升级包内应用列表)
      */
-    @RequestMapping("/detail")
-    public AjaxResult detail(String id){
+    @GetMapping("/detail/{id}")
+    public AjaxResult detail(@PathVariable String id){
         List<UploadAppInfo> list = uploadAppInfoService.getListByZipId(id);
         return AjaxResult.success(list);
     }
@@ -90,8 +89,8 @@ public class AppPackageController extends BaseController{
     /**
      * 升级包管理-删除
      */
-    @RequestMapping("/delete")
-    public AjaxResult delete(String id){
+    @DeleteMapping("/delete/{id}")
+    public AjaxResult delete(@PathVariable String id){
         return zipPackInfoService.delZip(id);
     }
 }

+ 2 - 1
soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/domain/ZipPackInfo.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,7 +38,7 @@ public class ZipPackInfo {
 
 
     @ApiModelProperty(value = "zip上传时间")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadDate;