CZT
2023-07-31 7ad4b3cb3848a8a3ee18f117f453060b9530bfba
新增贝博粮情协议--整体框架提交
已修改5个文件
已添加8个文件
602 ■■■■■ 文件已修改
igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/pom.xml 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/BeiboClientEngine.java 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/package-info.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/util/BeiboGrainServerUtils.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/pom.xml 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/application-pro5327.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java
@@ -31,6 +31,7 @@
    TCP_BHZH_GRAIN_V2("TCP_BHZH_GRAIN_V2", "邦海智能有线版V2"),
    TCP_BHZH_VERB_V2("TCP_BHZH_VERB_V2", "邦海控制柜智能有线版V2"),
    TCP_BHZH_INOUT_V1("TCP_BHZH_INOUT_V1", "邦海智能出入库控制器协议"),
    TCP_BEIBO_GRAIN_V1("TCP_BEIBO_GRAIN_V1", "贝博粮情分机服务端协议"),
    FZZY_OPENAPI_HTTP("FZZY_OPENAPI_HTTP", "风正致远API-HTTP协议");
igds-protocol-beibo/pom.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.ld.igds</groupId>
    <artifactId>igds-protocol-beibo</artifactId>
    <version>4.0.0-RELEASE</version>
    <packaging>jar</packaging>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <java.version>1.8</java.version>
        <igds.version>4.0.0-RELEASE</igds.version>
    </properties>
    <dependencies>
        <!-- å¼•入义务核心包 -->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-core</artifactId>
            <version>${igds.version}</version>
        </dependency>
        <!-- å¼•å…¥IO包 -->
        <dependency>
            <groupId>com.ld.base.io</groupId>
            <artifactId>base-io-netty</artifactId>
            <version>1.0.0-SNAPSHOT</version>
        </dependency>
    </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                     <compilerArguments>
                         <extdirs>src\main\webapp\WEB-INF\lib</extdirs>
                     </compilerArguments>
                 </configuration>
             </plugin>
         </plugins>
     </build>
</project>
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.ld.igds.protocol.beibo.grain;
import com.ld.igds.io.RemoteGrainService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.CheckGrainRequest;
import com.ld.igds.io.response.GrainResponse;
import com.ld.igds.protocol.beibo.grain.builder.CommandBuild;
import com.ld.igds.protocol.beibo.grain.client.BeiboClientEngine;
import com.ld.igds.util.BytesUtil;
import com.ld.io.api.InvokeResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
 * è´åšç²®æƒ…分机协议
 *
 * @author czt
 */
@Slf4j
@Component(RemoteGrainServiceImpl.BEAN_ID)
public class RemoteGrainServiceImpl implements RemoteGrainService {
    public static final String BEAN_ID = "beiboGrain.remoteGrainService";
    @Override
    public String getProtocol() {
        return ProtocolEnum.TCP_BEIBO_GRAIN_V1.getCode();
    }
    @Override
    public GrainResponse checkGrain(CheckGrainRequest request) {
        try {
            log.info("贝博粮情分机开始检测,分机{}的IP={},端口={}",request.getSerId(),request.getIp(),request.getPort());
            BeiboClientEngine beibo = new BeiboClientEngine(request.getIp(),request.getPort());
            beibo.start();
            Thread.sleep(3000);
            //生成粮情命令
            String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
            InvokeResult result = beibo.send(BytesUtil.hexStrToBytes(hexStr));
            log.info("result=" +result.getMessage());
            // å°è£…返回信息
            if (InvokeResult.SUCCESS == result) {
                return new GrainResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
                        "粮情粮情发送成功!");
            } else {
                log.error("平台------>>>>贝博粮情分机:粮情检测-失败{}", result.getMessage());
                return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(),
                        "命令发送异常:" + result.getMessage());
            }
        } catch (Exception e) {
            log.error("粮情检测异常:{}", e);
            return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "后端异常:" + e.getMessage());
        }
    }
}
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
package com.ld.igds.protocol.beibo.grain.analysis;
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.common.CoreSerService;
import com.ld.igds.common.dto.THDto;
import com.ld.igds.constant.BizType;
import com.ld.igds.grain.GrainUtil;
import com.ld.igds.io.notify.NotifyGrainInvoker;
import com.ld.igds.models.DepotConf;
import com.ld.igds.models.DeviceSer;
import com.ld.igds.models.DicSysConf;
import com.ld.igds.order.ExeOrderService;
import com.ld.igds.order.data.ExeRequest;
import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.warn.WarnUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
/**
 * åè®®è§£æž
 *
 * @author vince
 */
@Slf4j
@Component(AnalysisService.BEAN_ID)
public class AnalysisService {
    /**
     * é’ˆå¯¹åˆ†åŒ…粮情报文进行封装
     */
    public static Map<String, String> contextMapGrain = new HashMap<>();
    /**
     * ç”¨äºŽå­˜æ”¾è¿”回的仓温仓湿信息
     */
    public static Map<String, THDto> contextMapTH = new HashMap<>();
    public static final String BEAN_ID = "beiboGrain.analysisService";
    @Autowired
    private CoreSerService coreSerService;
    @Autowired
    private CoreCommonService commonService;
    @Autowired
    private NotifyGrainInvoker notifyGrainInvoker;
    @Autowired
    private GrainUtil grainUtil;
    @Autowired
    private WarnUtils warnUtils;
    @Autowired
    private ExeOrderService exeOrderService;
    /**
     *
     * @param result
     */
    public void analysis(String result){
        log.info("贝博分机------->>平台:信息报文={}", result);
        if(!result.startsWith(BeiboGrainServerUtils.MSG_START)){
            log.error("贝博分机------->>平台,解析粮情失败:报文起始符错误,不解析");
        }
        //去除起始符
        result = result.substring(9*2-1);
        analysisGrain(result);
    }
    private void analysisGrain(String result) {
        try {
            //截取分机地址
            String serId = result.substring(0, 2);
            //根据分机地址获取分机信息
            DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(),serId);
            if (ser == null) {
                log.error("贝博分机-------->>平台,解析粮情失败,未获取到系统粮情主机配置:" + serId);
                return;
            }
            // é¦–先获取到系统参数,判断是否需要批次自动优化
            DicSysConf sysConf = commonService.getCacheSysConf(ser.getCompanyId());
            List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
            if (null == list || list.isEmpty()) {
                String info = "粮情解析失败:分机=" + ser.getName() + "没有获取到所属仓库信息。";
                log.error("贝博分机------>>>平台:" + info);
                return;
            }
            //获取针对当前仓库的命令
            ExeRequest exeRequest = list.get(0);
            if (null == exeRequest) {
                String info = "粮情解析失败:分机=" + ser.getName() + "没有获取历史命令。";
                log.error("贝博分机------>>>平台:" + info);
                return;
            }
            DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
            if (null == depotConf) {
                String info = "粮情解析失败:分机=" + ser.getName() + "没有获取到粮情参数配置信息。";
                log.error("贝博分机------>>>平台:" + info);
                return;
            }
            // ç²®æƒ…的批次号重新根据频率调整
            String batchId = ContextUtil.getBatchIdByFireq(depotConf.getGrainFreq());
            //TODO æ ¹æ®å®žé™…报文,待实现
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
    }
}
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.ld.igds.protocol.beibo.grain.builder;
import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
import com.ld.igds.util.BytesUtil;
/**
 * å‘½ä»¤ç”Ÿæˆ
 *
 * @author czt
 */
public class CommandBuild {
    private final static CommandBuild instance = new CommandBuild();
    private CommandBuild() {
    }
    public static CommandBuild getInstance() {
        return instance;
    }
    /**
     * ç²®æƒ…采集命令
     *
     * @param grainAddr ç²®æƒ…分机地址
     * @param deptId    ä»“库编号地址
     * @return
     */
    public static String getMsgCheck(String grainAddr, String deptId) {
        StringBuffer sb = new StringBuffer();
        //起始符
        sb.append(BeiboGrainServerUtils.MSG_START);
        //分机地址
        int i = Integer.parseInt(grainAddr);
        sb.append(BytesUtil.intToHexStr1(i));
        //控制命令
        sb.append("82");
        //分机地址
        sb.append(BytesUtil.intToHexStr1(i));
        //测温电缆层数,不知道电缆采集层数时,默认00或者FF
        sb.append("00");
        //结尾符
        sb.append(BeiboGrainServerUtils.MSG_END);
        return sb.toString();
    }
}
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/BeiboClientEngine.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,117 @@
package com.ld.igds.protocol.beibo.grain.client;
import com.ld.igds.util.BytesUtil;
import com.ld.io.api.InvokeResult;
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.Unpooled;
import io.netty.channel.*;
import io.netty.channel.oio.OioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.oio.OioSocketChannel;
import io.netty.handler.codec.bytes.ByteArrayDecoder;
import io.netty.handler.codec.bytes.ByteArrayEncoder;
/**
 * è´åšç²®æƒ…协议,分机为服务端,平台为客户端主动连接
 *
 * @author czt
 */
public class BeiboClientEngine implements Runnable {
    private String host;
    private int port;
    // public ChannelFuture channelFuture;
    public Channel channel;
    public BeiboClientEngine(String host, int port) {
        this.host = host;
        this.port = port;
    }
    public void start() {
        Thread thread = new Thread(this);
        thread.start();
    }
    @Override
    public void run() {
        try {
            startRun();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    public void startRun() throws Exception {
        EventLoopGroup group = new OioEventLoopGroup();
        Bootstrap b = new Bootstrap();
        // b.option(ChannelOption.SO_KEEPALIVE, true);
        b.group(group).channel(OioSocketChannel.class)
                .handler(new ChannelInitializer<SocketChannel>() {
                    @Override
                    protected void initChannel(SocketChannel ch)
                            throws Exception {
                        ChannelPipeline p = ch.pipeline();
                        // å­—符串解码 å’Œ ç¼–码
                        p.addLast("decoder", new ByteArrayDecoder());
                        p.addLast("encoder", new ByteArrayEncoder());
                        // è‡ªå·±çš„逻辑Handler
                        p.addLast("handler", new ClientHandler());
                    }
                });
        // å‘起异步连接请求,绑定连接端口和host信息
        ChannelFuture channelFuture = b.connect(host, port);
        this.channel = channelFuture.channel();
        // channelFuture.channel().closeFuture().sync();
        channelFuture.addListener(new ChannelFutureListener() {
            @Override
            public void operationComplete(ChannelFuture arg0) throws Exception {
                if (channelFuture.isSuccess()) {
                    System.out.println("连接服务器成功");
                } else {
                    System.out.println("连接服务器失败");
                    channelFuture.cause().printStackTrace();
                    group.shutdownGracefully(); // å…³é—­çº¿ç¨‹ç»„
                }
            }
        });
    }
    public InvokeResult send(byte[] array) throws InterruptedException {
        if (null == channel) {
            return InvokeResult.SOCKET_NOT_CREATE;
        }
        if (!channel.isActive()) {
            return InvokeResult.CHANNEL_CLOSED;
        }
        channel.writeAndFlush(Unpooled.copiedBuffer(array)).sync();
        return InvokeResult.SUCCESS;
    }
    public static void main(String[] args) {
        try {
            String msg = "000000000006010600070012";
            BeiboClientEngine test = new BeiboClientEngine(
                    "192.168.1.95", 9999);
            test.start();
            msg = "BB BB BB BB";
            // Thread.sleep(3000L);
            test.send(BytesUtil.hexStrToBytes(msg));
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
    }
    public Channel getChannel() {
        return channel;
    }
}
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package com.ld.igds.protocol.beibo.grain.client;
import com.ld.igds.protocol.beibo.grain.analysis.AnalysisService;
import com.ld.igds.util.BytesUtil;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.net.InetSocketAddress;
/**
 * Handles a client-side channel.
 */
public class ClientHandler extends SimpleChannelInboundHandler<Object> {
    @Autowired
    private AnalysisService analysisService;
    private final InternalLogger log = InternalLoggerFactory.getInstance(this
            .getClass());
    @Override
    public void channelActive(ChannelHandlerContext ctx) {
        InetSocketAddress insocket = (InetSocketAddress) ctx.channel()
                .remoteAddress();
        log.info("贝博粮情分机成功连接,IP={},port={}", insocket.getAddress()
                .getHostAddress(), insocket.getPort());
    }
    @Override
    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
        super.channelInactive(ctx);
        InetSocketAddress insocket = (InetSocketAddress) ctx.channel()
                .remoteAddress();
        log.info("贝博粮情分机断开连接,IP={},port={}", insocket.getAddress(),insocket.getPort());
    }
    @Override
    public void channelRead0(ChannelHandlerContext ctx, Object msg)
            throws Exception {
        byte[] bytes = (byte[]) msg;
        String result = BytesUtil.bytesToString(bytes);
        log.info("贝博粮情分机返回信息=" + result);
        InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
        //解析
        analysisService.analysis(result);
    }
    @Override
    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
        ctx.close();
    }
}
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/package-info.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
/**
 * è´åšç²®æƒ…协议-分机为服务端
 */
package com.ld.igds.protocol.beibo.grain;
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/util/BeiboGrainServerUtils.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.ld.igds.protocol.beibo.grain.util;
/**
 * å·¥å…·ç±»
 *
 * @author czt
 */
public class BeiboGrainServerUtils {
    public static String MSG_START = "00000000FFEB90FEAA"; //起始符
    public static String MSG_END = "00000000000000000000000000"; //结尾符
}
igds-web/pom.xml
@@ -168,6 +168,23 @@
            </exclusions>
        </dependency>
        <!--  ç§æœ‰åè®®-贝博粮情
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-beibo</artifactId>
            <version>${igds.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>slf4j-log4j12</artifactId>
                    <groupId>org.slf4j</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>log4j</artifactId>
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        <!--  ç§æœ‰åè®®-邦海智能
        <dependency>
            <groupId>com.ld.igds</groupId>
@@ -252,54 +269,54 @@
            </plugin>
            <!-- YUI Compressor Maven压缩插件 å¼€å‘包不实用-->
            <plugin>
                <groupId>net.alchim31.maven</groupId>
                <artifactId>yuicompressor-maven-plugin</artifactId>
                <version>1.5.1</version>
                <executions>
                    <execution>
                        <goals>
                            <goal>compress</goal>
                        </goals>
                    </execution>
                </executions>
                <configuration>
                    <encoding>UTF-8</encoding>
                    <!--不显示js可能的错误 -->
                    <jswarn>false</jswarn>
                    <!--是否混淆 -->
                    <nomunge>true</nomunge>
                    <!--若存在已压缩的文件,会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© -->
                    <force>false</force>
                    <!--在指定的列号后插入新行 -->
                    <linebreakpos>-1</linebreakpos>
                    <!--压缩之前先执行聚合文件操作 -->
                    <preProcessAggregates>true</preProcessAggregates>
                    <!--压缩后保存文件后缀 æ— åŽç¼€ -->
                    <nosuffix>true</nosuffix>
                    <!--源目录,即需压缩的根目录 -->
                    <sourceDirectory>src/main/resources</sourceDirectory>
                    <!--输出目录,即压缩后的目录 -->
                    <outputDirectory>target/classes</outputDirectory>
                    <force>true</force>
                    <!--压缩js和css文件 -->
                    <includes>
                        <include>**/*.js</include>
                        <include>**/*.css</include>
                    </includes>
                    <!-- ä»¥ä¸‹ç›®å½•和文件不会被压缩 -->
                    <excludes>
                        <exclude>**/*.min.js</exclude>
                        <exclude>**/*.min.css</exclude>
                        <exclude>**/d7/**</exclude>
                        <exclude>**/dorado-home/**</exclude>
                        <exclude>**/bdf2/**</exclude>
                        <exclude>**/css/**</exclude>
                        <exclude>**/js/**</exclude>
                        <exclude>**/plugins/**</exclude>
                    </excludes>
                </configuration>
            </plugin>
<!--            <plugin>-->
<!--                <groupId>net.alchim31.maven</groupId>-->
<!--                <artifactId>yuicompressor-maven-plugin</artifactId>-->
<!--                <version>1.5.1</version>-->
<!--                <executions>-->
<!--                    <execution>-->
<!--                        <goals>-->
<!--                            <goal>compress</goal>-->
<!--                        </goals>-->
<!--                    </execution>-->
<!--                </executions>-->
<!--                <configuration>-->
<!--                    <encoding>UTF-8</encoding>-->
<!--                    &lt;!&ndash;不显示js可能的错误 &ndash;&gt;-->
<!--                    <jswarn>false</jswarn>-->
<!--                    &lt;!&ndash;是否混淆 &ndash;&gt;-->
<!--                    <nomunge>true</nomunge>-->
<!--                    &lt;!&ndash;若存在已压缩的文件,会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© &ndash;&gt;-->
<!--                    <force>false</force>-->
<!--                    &lt;!&ndash;在指定的列号后插入新行 &ndash;&gt;-->
<!--                    <linebreakpos>-1</linebreakpos>-->
<!--                    &lt;!&ndash;压缩之前先执行聚合文件操作 &ndash;&gt;-->
<!--                    <preProcessAggregates>true</preProcessAggregates>-->
<!--                    &lt;!&ndash;压缩后保存文件后缀 æ— åŽç¼€ &ndash;&gt;-->
<!--                    <nosuffix>true</nosuffix>-->
<!--                    &lt;!&ndash;源目录,即需压缩的根目录 &ndash;&gt;-->
<!--                    <sourceDirectory>src/main/resources</sourceDirectory>-->
<!--                    &lt;!&ndash;输出目录,即压缩后的目录 &ndash;&gt;-->
<!--                    <outputDirectory>target/classes</outputDirectory>-->
<!--                    <force>true</force>-->
<!--                    &lt;!&ndash;压缩js和css文件 &ndash;&gt;-->
<!--                    <includes>-->
<!--                        <include>**/*.js</include>-->
<!--                        <include>**/*.css</include>-->
<!--                    </includes>-->
<!--                    &lt;!&ndash; ä»¥ä¸‹ç›®å½•和文件不会被压缩 &ndash;&gt;-->
<!--                    <excludes>-->
<!--                        <exclude>**/*.min.js</exclude>-->
<!--                        <exclude>**/*.min.css</exclude>-->
<!--                        <exclude>**/d7/**</exclude>-->
<!--                        <exclude>**/dorado-home/**</exclude>-->
<!--                        <exclude>**/bdf2/**</exclude>-->
<!--                        <exclude>**/css/**</exclude>-->
<!--                        <exclude>**/js/**</exclude>-->
<!--                        <exclude>**/plugins/**</exclude>-->
<!--                    </excludes>-->
<!--                </configuration>-->
<!--            </plugin>-->
        </plugins>
igds-web/src/main/resources/application-pro5327.yml
@@ -51,7 +51,7 @@
    database: 2
    host: 127.0.0.1
    port: 6379
    password:
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
igds-web/src/main/resources/application.yml
@@ -1,7 +1,7 @@
##########################  Server   ########################## ä¸¹æ£±åŸŽå…³çœç²®é£Ÿå‚¨å¤‡åº“
spring:
  profiles:
    active: linux
    active: dev
  application:
    name: igds
  main:
pom.xml
@@ -39,6 +39,8 @@
        <module>igds-protocol-fzzy3</module>
        <!--邦海智能-->
        <module>igds-protocol-bhzn</module>
        <!--贝博粮情协议-->
        <module>igds-protocol-beibo</module>
        <!--物联网拓展设备包-->
        <module>igds-protocol-iot</module>