统一业务系统系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Ludc
6 小时以前 9bb1ee8d456d1a6c1149963eeb9c8285844466ef 
 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java


@@ -8,20 +8,16 @@


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;


import com.vci.ubcs.deploy.entity.CmdConfig;


import com.vci.ubcs.deploy.entity.DeployApps;


import com.vci.ubcs.deploy.enumpack.CmdConfigEnum;


import com.vci.ubcs.deploy.mapper.DeployAppsMapper;


import com.vci.ubcs.deploy.service.IDeployAppsService;


import com.vci.ubcs.deploy.vo.DeployAppsVO;


import com.vci.ubcs.starter.util.HttpUtils;


import jodd.io.StreamGobbler;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.springblade.core.secure.utils.AuthUtil;


import org.springblade.core.tool.api.R;


import org.springblade.core.tool.utils.Func;


import org.springblade.core.tool.utils.WebUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.cloud.client.ServiceInstance;


@@ -29,20 +25,14 @@


import org.springframework.context.EnvironmentAware;


import org.springframework.core.env.Environment;


import org.springframework.http.HttpHeaders;


import org.springframework.http.HttpStatus;


import org.springframework.http.MediaType;


import org.springframework.http.ResponseEntity;


import org.springframework.stereotype.Service;


import org.springframework.util.LinkedMultiValueMap;


import org.springframework.util.MultiValueMap;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.ServletRequest;


import javax.servlet.http.HttpServletRequest;


import java.io.*;


import java.net.InetAddress;


import java.net.URL;


import java.nio.charset.StandardCharsets;


import java.nio.file.Files;


import java.nio.file.Path;


import java.nio.file.Paths;


@@ -51,10 +41,8 @@


import java.time.format.DateTimeFormatter;


import java.util.*;


import java.util.stream.Collectors;


import java.util.stream.Stream;


import java.util.zip.ZipEntry;


import java.util.zip.ZipFile;


import java.util.zip.ZipInputStream;




/**


 * @author ludc


@@ -114,15 +102,21 @@


      String cookie = request.getHeaders("Cookie").nextElement();


      // 免密登录接口地址


      String loginUrl = "http://"+pwdFreeAddr+":"+this.getGatewayPort("ubcs-gateway")+"/ubcs-admin/applications";


      log.debug("获取服务信息调用地址："+loginUrl);


      log.info("获取服务信息调用地址："+loginUrl);


      System.out.println("=================获取服务信息调用地址："+loginUrl);




      // 请求ubcs-admin获取服务信息


      HttpHeaders headers = new HttpHeaders();


      ArrayList<MediaType> mediaTypes = new ArrayList<>();


      mediaTypes.add(MediaType.APPLICATION_JSON);


      headers.set("Authorization","Basic c2FiZXI6c2FiZXJfc2VjcmV0");


      headers.set("Blade-Auth",baldeAuth);


      System.out.println("============Blade-Auth:"+baldeAuth);


      headers.set("Cookie",cookie);


      System.out.println("============Cookie:"+cookie);




      headers.setAccept(mediaTypes);




      List<DeployAppsVO> deployAppsVOList = new ArrayList<>();


      try {


         // 发送GET请求


@@ -205,7 +199,7 @@


   public R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {


      boolean checkBoolean = checkCmdVer(deployAppsVO.getStartCmd()) && checkCmdVer(deployAppsVO.getStopCmd()) && checkCmdVer(deployAppsVO.getRestartCmd());


      if(checkBoolean){


         return R.fail("配置的命令中包含危险命令，如：rm、mv、rm -rf、chmod等命令和关键词！ ");


         return R.fail("配置的命令中包含危险命令，如：rm、mv、rm -rf、chmod等命令和关键字！ ");


      }


      return R.status(this.saveOrUpdate(deployAppsVO));


   }