Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
e4f73881
Commit
e4f73881
authored
Dec 21, 2022
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
web模块改名
parent
888be65d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
Jenkinsfile
Jenkinsfile
+4
-4
pom.xml
signal-control-service/pom.xml
+3
-3
signal-web-service-1.0.0.sh
...-control-service/src/main/bin/signal-web-service-1.0.0.sh
+2
-2
MybatisPlusGenerator.java
...ice/src/main/java/net/wanji/web/MybatisPlusGenerator.java
+2
-2
application.yml
signal-control-service/src/main/resources/application.yml
+1
-1
No files found.
Jenkinsfile
View file @
e4f73881
...
...
@@ -21,7 +21,7 @@ pipeline {
sh
'mvn -pl signal-utc-service clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true'
}
}
stage
(
'编译构建
web
模块'
)
{
stage
(
'编译构建
control
模块'
)
{
steps
{
sh
'mvn -pl signal-control-service clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true'
}
...
...
@@ -44,7 +44,7 @@ pipeline {
'''
}
}
stage
(
'删除
web
模块镜像和容器'
)
{
stage
(
'删除
control
模块镜像和容器'
)
{
steps
{
sh
'''
echo \'检查容器是否存在\'
...
...
@@ -67,7 +67,7 @@ pipeline {
sh
'docker pull 10.100.1.87:5000/xinkong/signal-utc-service:0.2.1'
}
}
stage
(
'拉取
web
模块镜像'
)
{
stage
(
'拉取
control
模块镜像'
)
{
steps
{
sh
'docker pull 10.100.1.87:5000/xinkong/signal-control-service:0.2.1'
}
...
...
@@ -77,7 +77,7 @@ pipeline {
sh
'docker run -p 32000:32000 -p 15115:15115 -itd --name signal-utc-service 10.100.1.87:5000/xinkong/signal-utc-service:0.2.1'
}
}
stage
(
'运行
web
模块容器'
)
{
stage
(
'运行
control
模块容器'
)
{
steps
{
sh
'docker run -p 32001:32001 -p 15116:15116 -itd --name signal-control-service 10.100.1.87:5000/xinkong/signal-control-service:0.2.1'
}
...
...
signal-control-service/pom.xml
View file @
e4f73881
...
...
@@ -13,10 +13,10 @@
<artifactId>
signal-control-service
</artifactId>
<name>
signal-
web
-service
</name>
<name>
signal-
control
-service
</name>
<description>
signal-
web
-service
signal-
control
-service
</description>
<properties>
...
...
@@ -165,7 +165,7 @@
<artifactId>
maven-assembly-plugin
</artifactId>
<!-- 主类 -->
<configuration>
<finalName>
signal-
web
-service
</finalName>
<finalName>
signal-
control
-service
</finalName>
<descriptors>
<descriptor>
src/main/assembly/package.xml
</descriptor>
</descriptors>
...
...
signal-control-service/src/main/bin/signal-web-service-1.0.0.sh
View file @
e4f73881
#!/bin/bash
jarName
=
"signal-
web
-service-1.0.0.jar"
jarName
=
"signal-
control
-service-1.0.0.jar"
NR
=
$(
ps
-ef
|
grep
"
${
jarName
}
"
|
grep
-v
grep
|
wc
-l
)
if
[
${
NR
}
!=
0
]
...
...
@@ -16,4 +16,4 @@ sleep 2
echo
"重启Java程序进程..."
nohup
java
-Xms2048m
-Xmx2048m
-jar
-XX
:+HeapDumpOnOutOfMemoryError
-XX
:HeapDumpPath
=
/home/javaApp/heapdump.hprof
-agentlib
:jdwp
=
transport
=
dt_socket,server
=
y,suspend
=
n,address
=
15115
-Djava
.rmi.server.hostname
=
10.100.1.87
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.port
=
12345
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.authenticate
=
false
signal-
web
-service-1.0.0.jar
--spring
.profiles.active
=
dev
>
/dev/null 2>&1 &
nohup
java
-Xms2048m
-Xmx2048m
-jar
-XX
:+HeapDumpOnOutOfMemoryError
-XX
:HeapDumpPath
=
/home/javaApp/heapdump.hprof
-agentlib
:jdwp
=
transport
=
dt_socket,server
=
y,suspend
=
n,address
=
15115
-Djava
.rmi.server.hostname
=
10.100.1.87
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.port
=
12345
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.authenticate
=
false
signal-
control
-service-1.0.0.jar
--spring
.profiles.active
=
dev
>
/dev/null 2>&1 &
signal-control-service/src/main/java/net/wanji/web/MybatisPlusGenerator.java
View file @
e4f73881
...
...
@@ -14,7 +14,7 @@ import java.util.Collections;
public
class
MybatisPlusGenerator
{
private
static
final
String
PROJECT_PATH
=
System
.
getProperty
(
"user.dir"
);
private
static
final
String
OUTPUT_DIR
=
"signal-
web
-service/src/main/java"
;
private
static
final
String
OUTPUT_DIR
=
"signal-
control
-service/src/main/java"
;
private
static
final
String
AUTHOR
=
"wj"
;
private
static
final
String
URL
=
"jdbc:mysql://10.100.1.74:3306/t_signal_control?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&useSSL=false&useCursorFetch=true"
;
private
static
final
String
DRIVER_NAME
=
"com.mysql.cj.jdbc.Driver"
;
...
...
@@ -24,7 +24,7 @@ public class MybatisPlusGenerator {
"t_base_area_info"
};
private
static
final
String
TEMPLATE_PATH
=
"/templates/mapper.xml.ftl"
;
private
static
final
String
MAPPER_PATH
=
"signal-
web
-service/src/main/resources/mapper/"
;
private
static
final
String
MAPPER_PATH
=
"signal-
control
-service/src/main/resources/mapper/"
;
private
static
final
String
PARENT
=
"net.wanji.web"
;
...
...
signal-control-service/src/main/resources/application.yml
View file @
e4f73881
...
...
@@ -10,7 +10,7 @@ spring:
pathmatch
:
matching-strategy
:
ant_path_matcher
service
:
name
:
signal-
web
-service
name
:
signal-
control
-service
mybatis
:
type-aliases-package
:
net.wanji.*.model
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment