From 2389517e70ee1ee78b0a8405cc7f6367e0327204 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Apr 2023 14:15:32 +0800 Subject: [PATCH] //prod --- .../src/main/resources/application-dev.yml | 11 +++++------ .../src/main/resources/application-prod.yml | 10 +++++----- .../controller/MaterialMouldController.java | 19 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 10 +++++----- .../src/main/resources/application-prod.yml | 10 +++++----- .../src/main/resources/application-dev.yml | 10 +++++----- .../src/main/resources/application-prod.yml | 10 +++++----- .../src/main/resources/application-dev.yml | 10 +++++----- .../src/main/resources/application-prod.yml | 10 +++++----- .../src/main/resources/application-dev.yml | 10 +++++----- .../src/main/resources/application-prod.yml | 10 +++++----- 11 files changed, 69 insertions(+), 51 deletions(-) diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index 1b347a4..da7e8ae 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -51,14 +51,13 @@ spring: regionId: cn-hangzhou dateFormat: yyyyMMdd endpointName: cn-hangzhou - oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: admin + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index e54e446..88c851a 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -50,11 +50,11 @@ spring: endpointName: cn-hangzhou oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: admin + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java index bf736b3..3b2062c 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java @@ -113,5 +113,24 @@ public class MaterialMouldController extends BaseController { return new ResultData(materialMould); } + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData del(Long id) { + logger.debug("[" + getIpAddr() + "] MaterialMouldController::del"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"参数为空"); + } + MaterialMould materialMould = materialMouldService.getById(id); + if(materialMould == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到数据"); + } + if(!materialMould.getUserId().equals(getMemberId())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); + } + materialMouldService.deleteById(id); + return new ResultData(); + } + } diff --git a/suimangCApi/src/main/resources/application-dev.yml b/suimangCApi/src/main/resources/application-dev.yml index 8fe028f..b538cdb 100644 --- a/suimangCApi/src/main/resources/application-dev.yml +++ b/suimangCApi/src/main/resources/application-dev.yml @@ -53,11 +53,11 @@ spring: oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkcapi - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: capi + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangCApi/src/main/resources/application-prod.yml b/suimangCApi/src/main/resources/application-prod.yml index 9774301..6bda92f 100644 --- a/suimangCApi/src/main/resources/application-prod.yml +++ b/suimangCApi/src/main/resources/application-prod.yml @@ -48,11 +48,11 @@ spring: endpointName: cn-hangzhou oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: capi + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangCallback/src/main/resources/application-dev.yml b/suimangCallback/src/main/resources/application-dev.yml index eaa89f4..817e960 100644 --- a/suimangCallback/src/main/resources/application-dev.yml +++ b/suimangCallback/src/main/resources/application-dev.yml @@ -54,11 +54,11 @@ spring: oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkcallback - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: callback + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangCallback/src/main/resources/application-prod.yml b/suimangCallback/src/main/resources/application-prod.yml index 8e28bc7..ec37fc2 100644 --- a/suimangCallback/src/main/resources/application-prod.yml +++ b/suimangCallback/src/main/resources/application-prod.yml @@ -49,11 +49,11 @@ spring: endpointName: cn-hangzhou oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: callback + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangMQConsumer/src/main/resources/application-dev.yml b/suimangMQConsumer/src/main/resources/application-dev.yml index 149d81e..e38dc40 100644 --- a/suimangMQConsumer/src/main/resources/application-dev.yml +++ b/suimangMQConsumer/src/main/resources/application-dev.yml @@ -55,11 +55,11 @@ spring: oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkmqconsumer - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: mqconsumer + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangMQConsumer/src/main/resources/application-prod.yml b/suimangMQConsumer/src/main/resources/application-prod.yml index ba11211..e3c9b9b 100644 --- a/suimangMQConsumer/src/main/resources/application-prod.yml +++ b/suimangMQConsumer/src/main/resources/application-prod.yml @@ -49,11 +49,11 @@ spring: endpointName: cn-hangzhou oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: mqconsumer + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/suimangSchedule/src/main/resources/application-dev.yml b/suimangSchedule/src/main/resources/application-dev.yml index e38593b..1fb03c4 100644 --- a/suimangSchedule/src/main/resources/application-dev.yml +++ b/suimangSchedule/src/main/resources/application-dev.yml @@ -55,11 +55,11 @@ spring: oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkschedule - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: schedule + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/suimangSchedule/src/main/resources/application-prod.yml b/suimangSchedule/src/main/resources/application-prod.yml index 2490f30..7080f81 100644 --- a/suimangSchedule/src/main/resources/application-prod.yml +++ b/suimangSchedule/src/main/resources/application-prod.yml @@ -49,11 +49,11 @@ spring: endpointName: cn-hangzhou oss: endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI4G7ixY4AhvM35F8o3W3V - keysecret: VfWqGb83qIQrS9us45utskl8itd7ry - bucketname: formall - filehost: malinkadmin - filedomain: https://formall.oss-accelerate.aliyuncs.com + keyid: LTAI5tQs4MBjzLFbiQLjsMYy + keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 + bucketname: suimang + filehost: schedule + filedomain: https://suimang.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com