From 8d07e55b4b8d95491700d8a5d07e15a571a0fe3d Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 13 Mar 2026 17:28:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AE=97=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/project/service/impl/ProjectServiceImpl.java | 2 +- .../com/sdm/project/service/impl/SimulationRunServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 49eee7de..1ab1bb2c 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -1340,7 +1340,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { if (CollectionUtils.isNotEmpty(runList)) { List runIdList = runList.stream().map(SpdmDeleteProjectDetailReq::getUuid).toList(); log.info("删除算例：{}",runIdList); - simulationRunService.removeBatchByIds(runIdList); + simulationRunService.lambdaUpdate().in(SimulationRun::getUuid, runIdList).remove(); for (String uuid : runIdList) { deleteDirNew(uuid); } diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index aa4af0e6..6880189a 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -1319,6 +1319,9 @@ public class SimulationRunServiceImpl extends ServiceImpl fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq); if (fileBaseInfoResp.getData() != null && fileBaseInfoResp.getData().getTagReq() != null) { TagReq tagReq = fileBaseInfoResp.getData().getTagReq(); + if (StringUtils.isNotBlank(uuid)) { + tagReq.setTaskId(uuid); + } req.setTagReq(tagReq); } } From 664138caef41990f169f00c7b71a5f81d33f7c7d Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 13 Mar 2026 17:29:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AE=97=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/feign/inter/project/ISimulationNodeFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java index 94ad5bac..f5418b34 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java @@ -49,7 +49,7 @@ public interface ISimulationNodeFeignClient { @GetMapping("/node/getNodeTaskRunList") SdmResponse> getTaskRunList(@RequestParam(value = "uuids") List uuids); - @PostMapping("node/delteNode") + @PostMapping("/node/delteNode") SdmResponse delteNode(@RequestBody DelNodeReq req); // 项目列表 From 6d11078d0dea975e727660ed5573182b97a41bbb Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 13 Mar 2026 18:11:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E9=9C=80=E6=B1=82=E5=85=B3=E8=81=94?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E5=87=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/model/vo/SpdmTaskDetailVo.java | 12 ++++++++++++ .../sdm/project/service/impl/TaskServiceImpl.java | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java index 679db773..6e017624 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java @@ -1,5 +1,6 @@ package com.sdm.project.model.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; import com.sdm.common.entity.resp.system.CIDUserResp; @@ -178,4 +179,15 @@ public class SpdmTaskDetailVo extends BaseEntity { private String tag8Code; private String tag9Code; private String tag10Code; + + /** + * 关联的需求提出人 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long submitter; + + /** + * 关联的需求提出人名称 + */ + private String submitterName; } diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 75406c21..d8eecac2 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -3594,20 +3594,6 @@ public class TaskServiceImpl implements ITaskService { spdmNewTaskVo::setTag5, spdmNewTaskVo::setTag5Code); } - - taskVoList.forEach(task -> { - SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getNewTag2()); - - if (phaseNode != null) { - task.setPhaseName(phaseNode.getNodeName()); - task.setTag2(phaseNode.getNodeName()); - } - SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getNewTag1()); - if (projectNode != null) { - task.setProjectName(projectNode.getNodeName()); - task.setTag1(projectNode.getNodeName()); - } - }); List taskIdList = taskVoList.stream().map(SpdmNewTaskVo::getUuid).toList(); List memberList = mapper.getMemberList(taskIdList, null); List spdmTaskDetailVoList = new ArrayList<>(); From e5ff13dbd9000d281fc07b2706f2263d7af142f3 Mon Sep 17 00:00:00 2001 From: yangyang Date: Fri, 13 Mar 2026 18:14:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=88=E8=A7=84=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/common/log/annotation/SysLog.java | 19 ---- .../sdm/common/log/aspect/SysLogAspect.java | 106 ++++++++---------- .../common/log/config/SysLogProperties.java | 16 --- .../common/log/event/SpringContextHolder.java | 19 ---- .../com/sdm/common/log/event/SysLogEvent.java | 16 --- .../sdm/common/log/event/SysLogListener.java | 17 --- .../com/sdm/common/log/utils/SysLogUtils.java | 23 ---- flowable/mvnw | 29 ----- flowable/mvnw.cmd | 27 ----- gateway2/mvnw | 29 ----- gateway2/mvnw.cmd | 27 ----- 11 files changed, 49 insertions(+), 279 deletions(-) diff --git a/common/src/main/java/com/sdm/common/log/annotation/SysLog.java b/common/src/main/java/com/sdm/common/log/annotation/SysLog.java index a26c77be..d9e467d8 100644 --- a/common/src/main/java/com/sdm/common/log/annotation/SysLog.java +++ b/common/src/main/java/com/sdm/common/log/annotation/SysLog.java @@ -1,22 +1,3 @@ -/* - * - * Copyright (c) 2018-2025, honeycom All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: honeycom - * - */ - package com.sdm.common.log.annotation; import java.lang.annotation.*; diff --git a/common/src/main/java/com/sdm/common/log/aspect/SysLogAspect.java b/common/src/main/java/com/sdm/common/log/aspect/SysLogAspect.java index ac55c236..c40addb5 100644 --- a/common/src/main/java/com/sdm/common/log/aspect/SysLogAspect.java +++ b/common/src/main/java/com/sdm/common/log/aspect/SysLogAspect.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package com.sdm.common.log.aspect; import cn.hutool.core.util.StrUtil; @@ -42,51 +26,59 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class SysLogAspect { - @Around("@annotation(sysLog)") - @SneakyThrows - public Object around(ProceedingJoinPoint point, SysLog sysLog) { - String strClassName = point.getTarget().getClass().getName(); - String strMethodName = point.getSignature().getName(); - log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName); + @Around("@annotation(sysLog)") + @SneakyThrows + public Object around(ProceedingJoinPoint point, SysLog sysLog) { + // 1. 获取目标类名和方法名 (重命名变量) + String targetClazzName = point.getTarget().getClass().getName(); + String execMethodName = point.getSignature().getName(); + // 修改日志描述 + log.debug("捕获切点 -> 类：{} | 方法：{}", targetClazzName, execMethodName); - // 日志描述 - String title = sysLog.value(); - // 所属模块 - String module = sysLog.module(); - // 操作类型 - String operateType = sysLog.operateType(); - // 业务id - String businessId = sysLog.businessId(); + // 2. 解析注解属性 (重命名变量) + String logTitle = sysLog.value(); + String logModule = sysLog.module(); + String actionType = sysLog.operateType(); + String bizIdentifier = sysLog.businessId(); - SysLogDTO logVo = SysLogUtils.getSysLog(); - logVo.setTitle(title); - logVo.setModule(module); - logVo.setOperateType(operateType); - logVo.setBusinessId(businessId); + // 3. 构建日志对象 (重命名变量) + SysLogDTO logRecord = SysLogUtils.getSysLog(); + logRecord.setTitle(logTitle); + logRecord.setModule(logModule); + logRecord.setOperateType(actionType); + logRecord.setBusinessId(bizIdentifier); - if (StrUtil.isBlank(logVo.getParams())) { - logVo.setBody(point.getArgs()); - } + // 4. 设置请求参数 + if (StrUtil.isBlank(logRecord.getParams())) { + logRecord.setBody(point.getArgs()); + } - Long startTime = System.currentTimeMillis(); - Object obj; + // 5. 记录开始时间 + Long beginTimestamp = System.currentTimeMillis(); + Object proceedResult; - try { - obj = point.proceed(); - } - catch (Exception e) { - logVo.setLogType(LogTypeEnum.ERROR.getType()); - logVo.setException(e.getMessage()); - throw e; - } - finally { - Long endTime = System.currentTimeMillis(); - logVo.setTime(endTime - startTime); - logVo.setTenantId(ThreadLocalContext.getTenantId()); - log.info("[SysLogAspect] logVo:{}", JSON.toJSONString(logVo)); - SpringContextHolder.publishEvent(new SysLogEvent(logVo)); - } - return obj; - } + try { + // 执行目标方法 + proceedResult = point.proceed(); + } catch (Exception caughtException) { + // 异常处理 (重命名变量) + logRecord.setLogType(LogTypeEnum.ERROR.getType()); + logRecord.setException(caughtException.getMessage()); + throw caughtException; + } finally { + // 6. 计算耗时并补充上下文信息 + Long finishTimestamp = System.currentTimeMillis(); + logRecord.setTime(finishTimestamp - beginTimestamp); + logRecord.setTenantId(ThreadLocalContext.getTenantId()); + + // 修改最终日志描述 + log.info("操作审计完成 -> 详情：{}", JSON.toJSONString(logRecord)); + + // 发布事件 + SpringContextHolder.publishEvent(new SysLogEvent(logRecord)); + } + + return proceedResult; + } } diff --git a/common/src/main/java/com/sdm/common/log/config/SysLogProperties.java b/common/src/main/java/com/sdm/common/log/config/SysLogProperties.java index 5c16e333..a90c9507 100644 --- a/common/src/main/java/com/sdm/common/log/config/SysLogProperties.java +++ b/common/src/main/java/com/sdm/common/log/config/SysLogProperties.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2019-2029, Dreamlu 卢春梦 (596392912@qq.com & www.dreamlu.net). - *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.gnu.org/licenses/lgpl.html - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package com.sdm.common.log.config; import lombok.Data; diff --git a/common/src/main/java/com/sdm/common/log/event/SpringContextHolder.java b/common/src/main/java/com/sdm/common/log/event/SpringContextHolder.java index 6b22081c..54911262 100644 --- a/common/src/main/java/com/sdm/common/log/event/SpringContextHolder.java +++ b/common/src/main/java/com/sdm/common/log/event/SpringContextHolder.java @@ -1,22 +1,3 @@ -/* - * - * Copyright (c) 2018-2025, honeycom All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: honeycom - * - */ - package com.sdm.common.log.event; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/sdm/common/log/event/SysLogEvent.java b/common/src/main/java/com/sdm/common/log/event/SysLogEvent.java index 69a31671..111a3eec 100644 --- a/common/src/main/java/com/sdm/common/log/event/SysLogEvent.java +++ b/common/src/main/java/com/sdm/common/log/event/SysLogEvent.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package com.sdm.common.log.event; import com.sdm.common.log.dto.SysLogDTO; diff --git a/common/src/main/java/com/sdm/common/log/event/SysLogListener.java b/common/src/main/java/com/sdm/common/log/event/SysLogListener.java index 1e25986e..a54b8a3f 100644 --- a/common/src/main/java/com/sdm/common/log/event/SysLogListener.java +++ b/common/src/main/java/com/sdm/common/log/event/SysLogListener.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package com.sdm.common.log.event; import cn.hutool.core.collection.CollUtil; @@ -25,7 +9,6 @@ import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import com.sdm.common.feign.impl.system.SysLogFeignClientImpl; -import com.sdm.common.feign.inter.system.ISysLogFeignClient; import com.sdm.common.log.config.SysLogProperties; import com.sdm.common.log.dto.SysLogDTO; import com.sdm.common.log.utils.JavaTimeModule; diff --git a/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java b/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java index d6f99ee2..5ebceabc 100644 --- a/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java +++ b/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java @@ -1,45 +1,22 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package com.sdm.common.log.utils; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.URLUtil; -import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpUtil; import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.log.config.SysLogProperties; import com.sdm.common.log.dto.SysLogDTO; -import com.sdm.common.utils.DateUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.http.HttpHeaders; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/flowable/mvnw b/flowable/mvnw index bd8896bf..992e89df 100644 --- a/flowable/mvnw +++ b/flowable/mvnw @@ -1,33 +1,4 @@ #!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.4 -# -# Optional ENV vars -# ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output -# ---------------------------------------------------------------------------- set -euf [ "${MVNW_VERBOSE-}" != debug ] || set -x diff --git a/flowable/mvnw.cmd b/flowable/mvnw.cmd index 92450f93..66a2d3bb 100644 --- a/flowable/mvnw.cmd +++ b/flowable/mvnw.cmd @@ -1,31 +1,4 @@ <# : batch portion -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.4 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- @IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) @SET __MVNW_CMD__= diff --git a/gateway2/mvnw b/gateway2/mvnw index bd8896bf..992e89df 100644 --- a/gateway2/mvnw +++ b/gateway2/mvnw @@ -1,33 +1,4 @@ #!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.4 -# -# Optional ENV vars -# ----------------- -# JAVA_HOME - location of a JDK home dir, required when download maven via java source -# MVNW_REPOURL - repo url base for downloading maven distribution -# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output -# ---------------------------------------------------------------------------- set -euf [ "${MVNW_VERBOSE-}" != debug ] || set -x diff --git a/gateway2/mvnw.cmd b/gateway2/mvnw.cmd index 92450f93..66a2d3bb 100644 --- a/gateway2/mvnw.cmd +++ b/gateway2/mvnw.cmd @@ -1,31 +1,4 @@ <# : batch portion -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.4 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- @IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) @SET __MVNW_CMD__=