Skip to content

T
traffic-signal-platform
Commit 4ce9e837 authored by zhouleilei's avatar zhouleilei
Browse files
Options

opt/control 国产化 - 中创中间件inforsuite V10.0.2.3替换springboot内置tomcat

parent 75550b09
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 65 deletions
signal-control-service/pom.xml
View file @ 4ce9e837
...@@ -102,10 +102,37 @@ ...@@ -102,10 +102,37 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
<!-- 中创中间件inforsuite ,排除tomcat-->
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 中创中间件inforsuite-->
<dependency>
<groupId>com.cvicse.embedded</groupId>
<artifactId>spring-boot-starter-inforsuite</artifactId>
<version>10.0.2.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-tomcat</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-embed-core</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-embed-websocket</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
signal-control-service/src/main/resources/bootstrap-docker.yaml
View file @ 4ce9e837
...@@ -18,4 +18,7 @@ feign: ...@@ -18,4 +18,7 @@ feign:
config: config:
default: default:
connectTimeout: 500000 connectTimeout: 500000
readTimeout: 500000 readTimeout: 500000
\ No newline at end of file
inforsuite:
license-path: D:\\license
\ No newline at end of file
signal-optimize-service/pom.xml
View file @ 4ce9e837
...@@ -84,6 +84,24 @@ ...@@ -84,6 +84,24 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-tomcat</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-embed-core</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-embed-el</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
<exclusion>
<artifactId>tomcat-embed-websocket</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
...@@ -248,101 +266,63 @@ ...@@ -248,101 +266,63 @@
<!-- mvn clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true --> <!-- mvn clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true -->
<!-- 使用jib 无需深入学习docker, 无需编写Dockerfile --> <!-- 使用jib 无需深入学习docker, 无需编写Dockerfile -->
<!--<plugin> <plugin>
<groupId>com.google.cloud.tools</groupId> <groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId> <artifactId>jib-maven-plugin</artifactId>
<version>2.5.2</version> <version>2.5.2</version>
<!-- 将jib与mvn构建的生命周期绑定 -->
<executions>
<execution>
<id>build-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
&lt;!&ndash;from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字&ndash;&gt; <!--from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字-->
<from> <from>
&lt;!&ndash;使用harbor上的openjdk镜像&ndash;&gt; <!--使用harbor上的openjdk镜像-->
&lt;!&ndash;<image>${harbor.ip.port}/xinkong/openjdk:8-alpine3.9</image>&ndash;&gt; <image>${harbor.ip.port}/xinkong/openjdk:8-alpine3.9</image>
<image>${harbor.ip.port}/xinkong/centos7-jdk8-rpm:1.0</image> <!--harbor服务器的登录信息-->
&lt;!&ndash;harbor服务器的登录信息&ndash;&gt;
<auth> <auth>
<username>admin</username> <username>admin</username>
<password>Wanji300552</password> <password>Wanji300552</password>
</auth> </auth>
</from> </from>
<to> <to>
<image>${harbor.ip.port}/xinkong/${artifactId}:${version}</image> <image>${harbor.ip.port}/xinkong/${artifactId}:${version}${maven.build.timestamp}</image>
<auth> <auth>
<username>admin</username> <username>admin</username>
<password>Wanji300552</password> <password>Wanji300552</password>
</auth> </auth>
</to> </to>
<container> <container>
&lt;!&ndash;配置jvm虚拟机参数&ndash;&gt; <!--配置jvm虚拟机参数-->
<jvmFlags> <jvmFlags>
<jvmFlag>-Xms512m</jvmFlag> <jvmFlag>-Xms512m</jvmFlag>
<jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15117</jvmFlag> <jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15119</jvmFlag>
</jvmFlags> </jvmFlags>
<!--配置使用的时区-->
&lt;!&ndash;添加RPM包&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-common-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nspr-4.35.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-util-3.90.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-2.17-326.el7_9.3.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-headers-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-devel-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/zlib-1.2.7-21.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/libpng-1.5.13-8.el7.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/bzip2-libs-1.0.6-13.el7.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/libuuid-2.23.2-65.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/expat-2.1.0-15.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/freetype-2.8-14.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;<entrypoint>&ndash;&gt;
&lt;!&ndash;<shell>sh</shell>&ndash;&gt;
&lt;!&ndash;<option>-c</option>&ndash;&gt;
&lt;!&ndash;<arg>&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.i686.rpm &#45;&#45;nogpgcheck &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.x86_64.rpm &#45;&#45;nogpgcheck &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/dejavu-sans-fonts-2.33-6.el7.noarch.rpm &#45;&#45;nogpgcheck&ndash;&gt;
&lt;!&ndash;</arg>&ndash;&gt;
&lt;!&ndash;</entrypoint>&ndash;&gt;
&lt;!&ndash;配置使用的时区&ndash;&gt;
<environment> <environment>
<TZ>Asia/Shanghai</TZ> <TZ>Asia/Shanghai</TZ>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<LANG>en_US.UTF-8</LANG>
</environment> </environment>
&lt;!&ndash;要暴露的端口&ndash;&gt; <!--要暴露的端口-->
<ports> <ports>
<port>39001</port> <port>39001</port>
<port>15117</port> <port>15117</port>
</ports> </ports>
&lt;!&ndash; <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>&ndash;&gt; <!-- <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>-->
<creationTime>${maven.build.timestamp}</creationTime> <creationTime>${maven.build.timestamp}</creationTime>
<mainClass>net.wanji.opt.SignalOptimizeApplication</mainClass> <mainClass>net.wanji.opt.SignalOptimizeApplication</mainClass>
</container> </container>
<extraDirectories> <!--可以进行HTTP-->
<paths>
<path>
<from>src/main/resources/rpms/</from>
<into>/rpms/</into>
</path>
</paths>
</extraDirectories>
&lt;!&ndash;可以进行HTTP&ndash;&gt;
<allowInsecureRegistries>true</allowInsecureRegistries> <allowInsecureRegistries>true</allowInsecureRegistries>
</configuration> </configuration>
<executions> </plugin>
<execution>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>-->
<!-- maven 打包方式--> <!-- maven 打包方式-->
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
...@@ -359,7 +339,7 @@ ...@@ -359,7 +339,7 @@
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/bin</outputDirectory> <outputDirectory>${project.parent.basedir}/assembly/${project.name}/bin</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources/bin</directory> <directory>src/main/bin</directory>
<filtering>false</filtering> <filtering>false</filtering>
</resource> </resource>
</resources> </resources>
...@@ -423,14 +403,14 @@ ...@@ -423,14 +403,14 @@
</archive> </archive>
<excludes> <excludes>
<exclude>*.**</exclude> <exclude>*.**</exclude>
<exclude>*/**/*.xml</exclude> <exclude>*/*.xml</exclude>
<!--<exclude>configs/**/**</exclude>-->
</excludes> </excludes>
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/lib</outputDirectory> <outputDirectory>${project.parent.basedir}/assembly/${project.name}/lib</outputDirectory>
<classesDirectory> <classesDirectory>
</classesDirectory> </classesDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment