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
4b6762eb
Commit
4b6762eb
authored
Jan 19, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
springboot不应该引用log4j-slf4j-impl,增加local环境配置文件
parent
fa24fd29
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
74 additions
and
18 deletions
+74
-18
pom.xml
pom.xml
+6
-5
pom.xml
signal-control-service/pom.xml
+0
-1
application-local.yml
...-control-service/src/main/resources/application-local.yml
+58
-0
application-dev.properties
...ign-service/src/main/resources/application-dev.properties
+0
-1
application-local.properties
...n-service/src/main/resources/application-local.properties
+1
-0
application-pro.properties
...ign-service/src/main/resources/application-pro.properties
+1
-2
application.properties
...l-feign-service/src/main/resources/application.properties
+0
-2
pom.xml
signal-optimize-service/pom.xml
+0
-1
pom.xml
signal-utc-service/pom.xml
+0
-1
ControlCommandStrategyServiceImpl.java
...rvice/control/impl/ControlCommandStrategyServiceImpl.java
+5
-1
application.yml
signal-utc-service/src/main/resources/application.yml
+3
-0
pom.xml
wj-common/pom.xml
+0
-4
No files found.
pom.xml
View file @
4b6762eb
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
<!-- 依赖版本 -->
<!-- 依赖版本 -->
<properties>
<properties>
<druid-spring-version>
1.1.24
</druid-spring-version>
<el.version>
3.0.0
</el.version>
<el.version>
3.0.0
</el.version>
<spring-cloud.version>
2021.0.0
</spring-cloud.version>
<spring-cloud.version>
2021.0.0
</spring-cloud.version>
<openfeign-version>
3.1.0
</openfeign-version>
<openfeign-version>
3.1.0
</openfeign-version>
...
@@ -93,11 +94,11 @@
...
@@ -93,11 +94,11 @@
<artifactId>
javax.el
</artifactId>
<artifactId>
javax.el
</artifactId>
<version>
${el.version}
</version>
<version>
${el.version}
</version>
</dependency>
</dependency>
<!-- <dependency>--
>
<dependency
>
<!-- <groupId>javax.validation</groupId>--
>
<groupId>
com.alibaba
</groupId
>
<!-- <artifactId>validation-api</artifactId>--
>
<artifactId>
druid-spring-boot-starter
</artifactId
>
<!-- <version>2.0.1.Final</version>--
>
<version>
${druid-spring-version}
</version
>
<!-- </dependency>--
>
</dependency
>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
...
...
signal-control-service/pom.xml
View file @
4b6762eb
...
@@ -74,7 +74,6 @@
...
@@ -74,7 +74,6 @@
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<version>
1.1.24
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
mysql
</groupId>
<groupId>
mysql
</groupId>
...
...
signal-control-service/src/main/resources/application-local.yml
0 → 100644
View file @
4b6762eb
server
:
port
:
32001
servlet
:
display-name
:
Wanji
context-path
:
/web
multipart
:
max-file-size
:
50MB
max-request-size
:
50MB
tomcat
:
threads
:
max
:
10000
#线程池配置
threadPool
:
corePoolSize
:
5
maxPoolSize
:
200
queueCapacity
:
5
keepAliveTime
:
60000
spring
:
datasource
:
dynamic
:
primary
:
master
datasource
:
master
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://10.100.1.59: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
# url: jdbc:mysql://10.102.1.112:53306/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
username
:
root
password
:
Wanji300552
driverClassName
:
com.mysql.cj.jdbc.Driver
slave
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://10.100.1.59: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
username
:
root
password
:
Wanji300552
driverClassName
:
com.mysql.cj.jdbc.Driver
webService
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://10.100.1.59:3306/t_signal?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
username
:
root
password
:
Wanji300552
type
:
com.alibaba.druid.pool.DruidDataSource
redis
:
host
:
10.100.1.59
port
:
6379
password
:
Wanji300552
jedis
:
pool
:
max-active
:
200
max-wait
:
5000
max-idle
:
20
min-idle
:
10
timeout
:
5000
database
:
3
# 信号平台
signal
:
\ No newline at end of file
signal-feign-service/src/main/resources/application-dev.properties
View file @
4b6762eb
#utc.service.url=http://10.100.1.59:32000/utc
utc.service.url
=
http://10.100.1.59:32000/utc
utc.service.url
=
http://10.100.1.59:32000/utc
\ No newline at end of file
signal-feign-service/src/main/resources/application-local.properties
0 → 100644
View file @
4b6762eb
utc.service.url
=
http://localhost:32000/utc
\ No newline at end of file
signal-feign-service/src/main/resources/application-pro.properties
View file @
4b6762eb
#utc.service.url=http://10.100.1.59:32000/utc
#
utc.service.url
=
http://10.100.1.59:32000/utc
utc.service.url
=
http://localhost:32000/utc
\ No newline at end of file
\ No newline at end of file
signal-feign-service/src/main/resources/application.properties
View file @
4b6762eb
utc.service.url
=
http://10.100.1.59:32000/utc
#
utc.service.url
=
http://localhost:32000/utc
\ No newline at end of file
signal-optimize-service/pom.xml
View file @
4b6762eb
...
@@ -62,7 +62,6 @@
...
@@ -62,7 +62,6 @@
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<version>
1.1.24
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
mysql
</groupId>
<groupId>
mysql
</groupId>
...
...
signal-utc-service/pom.xml
View file @
4b6762eb
...
@@ -79,7 +79,6 @@
...
@@ -79,7 +79,6 @@
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<artifactId>
druid-spring-boot-starter
</artifactId>
<version>
1.1.24
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
mysql
</groupId>
<groupId>
mysql
</groupId>
...
...
signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java
View file @
4b6762eb
...
@@ -18,6 +18,7 @@ import java.text.ParseException;
...
@@ -18,6 +18,7 @@ import java.text.ParseException;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
/**
/**
* @author duanruiming
* @author duanruiming
...
@@ -46,9 +47,12 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
...
@@ -46,9 +47,12 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
* @param crossId
* @param crossId
* @return
* @return
*/
*/
public
String
getManufacturerCodeByCrossId
(
String
crossId
)
{
public
String
getManufacturerCodeByCrossId
(
String
crossId
)
throws
Exception
{
// 获取厂商ID和信号机ID
// 获取厂商ID和信号机ID
CrossInfoPO
crossInfoPO
=
crossInfoMapper
.
selectByPrimaryKey
(
crossId
);
CrossInfoPO
crossInfoPO
=
crossInfoMapper
.
selectByPrimaryKey
(
crossId
);
if
(
Objects
.
isNull
(
crossInfoPO
))
{
throw
new
Exception
(
"当前路口编号不存在!"
);
}
String
signalId
=
crossInfoPO
.
getCode
();
String
signalId
=
crossInfoPO
.
getCode
();
Integer
manufacturerId
=
crossInfoPO
.
getManufacturerId
();
Integer
manufacturerId
=
crossInfoPO
.
getManufacturerId
();
// 获取厂商代码
// 获取厂商代码
...
...
signal-utc-service/src/main/resources/application.yml
View file @
4b6762eb
spring
:
spring
:
# dubbo启动需要程序名称
application
:
name
:
utc
profiles
:
profiles
:
active
:
dev
active
:
dev
mvc
:
mvc
:
...
...
wj-common/pom.xml
View file @
4b6762eb
...
@@ -176,10 +176,6 @@
...
@@ -176,10 +176,6 @@
<groupId>
org.apache.logging.log4j
</groupId>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-jul
</artifactId>
<artifactId>
log4j-jul
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-slf4j-impl
</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
...
...
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