代码提交

 Source/UBCS-WEB/src/const/code/mdmrule.js

@@ -2,7 +2,7 @@
  tip: false,
  searchShow: true,
  searchMenuSpan: 6,
  height:327,
  height:265,
  border: true,
  index: true,
  viewBtn: false,

 Source/UBCS-WEB/src/views/code/code.vue

@@ -2,7 +2,7 @@
  <basic-container class="code-total" style=" height: 100%">
    <!-- 编码规则信息展示区域 -->
    <basic-container class="code-rule-container">
      <div style="height: 55vh;overflow: auto;">
      <div style="height: 50vh;overflow: auto;">
        <p
          style="
          margin-top: -5px;
@@ -142,7 +142,6 @@
          </template>
        </avue-crud>
      </div>

    </basic-container>

    <!-- 高级查询对话框 -->
@@ -220,7 +219,7 @@

    <!-- 基础码段展示区域 -->
    <basic-container class="code-basicsec-container">
      <div style="height: 23.5vh;overflow: auto">
      <div style="height: 35vh;overflow: auto">
        <p
          style="margin-top: -5px;
          margin-bottom: 4px;

 Source/UBCS-WEB/src/views/system/deploy.vue

@@ -55,6 +55,7 @@
<script>
import { getApplications,saveOrGetServiceConfInfo,saveOrUpdateServiceInfo,addSave,executeCmd } from "@/api/system/deploy";
import moment from "moment";
import {mapGetters} from "vuex";
export default {
    data() {
        return {
@@ -69,7 +70,7 @@
      
    },
    computed: {
        ...mapGetters(["userInfo", "permission"]),
        ...mapGetters(["permission"]),
        permissionList() {
            return {
                upload: this.vaildData(this.permission.deploy.deploy_upload, false),

 Source/UBCS/pom.xml

@@ -108,11 +108,11 @@
            <resource>
                <directory>src/main/resources</directory>
                <excludes>
                    <exclude>bootstrap.yml</exclude>
                    <!--<exclude>bootstrap.yml</exclude>
                    <exclude>application.yml</exclude>
                    <exclude>application-dev.yml</exclude>
                    <exclude>application-test.yml</exclude>
                    <exclude>application-prop.yml</exclude>
                    <exclude>application-prop.yml</exclude>-->
                </excludes>
            </resource>
            <resource>

 Source/UBCS/ubcs-service/ubcs-code/pom.xml

@@ -153,6 +153,10 @@
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
        </dependency>
    </dependencies>

    <build>

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java

@@ -72,11 +72,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;

import javax.annotation.Resource;
import javax.jws.WebMethod;
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;

 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java

@@ -179,12 +179,12 @@
        }
        // 未从库中查询到，需要生成服务信息保存默认信息到库中
        DeployApps defaultDeployApps = new DeployApps();
        defaultDeployApps.setLogPath(PARENTPATH + deployAppsVO.getName().replace("-","_") + LOGPATH);
        defaultDeployApps.setLogPath(PARENTPATH + SEPARATOR + deployAppsVO.getName().replace("-","_") + LOGPATH);
        defaultDeployApps.setServerName(deployAppsVO.getName());
        defaultDeployApps.setStartCmd(CmdConfigEnum.START_CMD.getValue() + deployAppsVO.getName());
        defaultDeployApps.setStopCmd(CmdConfigEnum.STOP_CMD.getValue() + deployAppsVO.getName());
        defaultDeployApps.setRestartCmd(CmdConfigEnum.RESTART_CMD.getValue() + deployAppsVO.getName());
        defaultDeployApps.setServerPath(PARENTPATH + deployAppsVO.getName().replace("-","_"));
        defaultDeployApps.setServerPath(PARENTPATH + SEPARATOR + deployAppsVO.getName().replace("-","_"));
        int eft = deployAppsMapper.insert(defaultDeployApps);
        if (!SqlHelper.retBool(eft)) {
            throw new ServiceException("生成默认服务信息到库中时失败！");
@@ -357,6 +357,15 @@
            }
            // 等待命令执行完成
            int exitCode = process.waitFor();
            // 读取命令执行的错误输出流
            BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
            StringBuilder errorOutput = new StringBuilder();
            String errorLine;
            while ((errorLine = errorReader.readLine()) != null) {
                errorOutput.append(errorLine).append("\n");
            }
            String errorOutputString = errorOutput.toString();
            log.info("错误输出：" + errorOutputString);
            log.info("命令执行结果：" + output.toString()+":"+exitCode);
            return output.toString();
        }catch (IOException | InterruptedException e){