ludc
2023-05-06 15fd75c395784afa2cc3e805774e2c8cbc5a3eb7
部署打包时jar中没有主清单属性问题
已修改6个文件
已添加1个文件
47 ■■■■ 文件已修改
Source/UBCS/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-common/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-ddl/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/pom.xml
@@ -19,6 +19,7 @@
        <spring.boot.version>2.7.1</spring.boot.version>
        <spring.cloud.version>2021.0.3</spring.cloud.version>
        <spring.platform.version>Cairo-SR8</spring.platform.version>
        <maven.plugin.version>3.8.1</maven.plugin.version>
        <!-- æŽ¨èä½¿ç”¨Harbor -->
        <docker.registry.url>192.168.0.157</docker.registry.url>
Source/UBCS/ubcs-common/pom.xml
@@ -28,6 +28,12 @@
            <artifactId>blade-core-auto</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-core</artifactId>
            <version>3.5.2</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    <build>
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -40,8 +40,8 @@
    /**
     * nacos dev åœ°å€
     */
    String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    //String NACOS_DEV_ADDR = "192.168.93.185:38848";
    //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    String NACOS_DEV_ADDR = "192.168.93.185:38848";
    /**
     * nacos prod åœ°å€
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
@@ -23,4 +23,8 @@
 */
public class CommonUtil {
}
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.vci.ubcs.common.utils;
import com.baomidou.mybatisplus.core.metadata.IPage;
public class PageDO2PageVO {
    /**
     * pagedo转为pagevo,里面的分页参数需要转换
     * @param doList pageDO对象
     * @param pageList pageVO对象
     * @param <T> DO对象类型
     * @param <R> VO对象类型
     * @return
     */
    public static <T,R> IPage<R> pageDO2PageVO(IPage<T> doList,IPage<R> pageList){
        pageList.setTotal(doList.getTotal());
        pageList.setSize(doList.getSize());
        pageList.setCurrent(doList.getCurrent());
        pageList.setPages(doList.getPages());
        return pageList;
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -16,6 +16,7 @@
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -60,7 +61,6 @@
    @Autowired
    private RevisionModelUtil revisionModelUtil;
    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„分类使用的流程模板
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
@@ -87,10 +87,8 @@
        //DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
        if (!CollectionUtils.isEmpty(doList.getRecords())) {
            pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
            pageList.setTotal(doList.getTotal());
            pageList.setSize(doList.getSize());
            pageList.setCurrent(doList.getCurrent());
            pageList.setPages(doList.getPages());
            //分页参数转到pageVO对象
            pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
        }
        return pageList;
    }
Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
@@ -50,4 +50,5 @@
        </dependency>
    </dependencies>
</project>