Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
TDLCloud
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
WitCloud
TDLCloud
Commits
77d2e65f
Commit
77d2e65f
authored
Sep 06, 2019
by
zhuangzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改配置
parent
beeef87e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
26 deletions
+11
-26
application-docker.properties
src/main/resources/application-docker.properties
+8
-18
application.properties
src/main/resources/application.properties
+1
-5
AlarmMapper.xml
src/main/resources/mapper/AlarmMapper.xml
+2
-3
No files found.
src/main/resources/application-docker.properties
View file @
77d2e65f
##abb\u6B63\u5F0F\u73AF\u5883
#\u6B63\u5F0F\u73AF\u5883\uFF08bosch\uFF09
#spring.datasource.url=jdbc:mysql://witcloud-mariadb:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url
=
jdbc:mysql://rm-bp12687cq31d42453.mysql.rds.aliyuncs.com:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.username=root
spring.datasource.username
=
witcloud
#spring.datasource.password=37774020
spring.datasource.password
=
Witcloud37774020
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#
#tdl.redis.password=witium
#
#tdl.core.add =http://abb-herocore:8079/witium/addMount
#tdl.core.delete =http://abb-herocore:8079/witium/delMount
#\u6B63\u5F0F\u73AF\u5883\uFF08logs\uFF09
spring.datasource.url
=
jdbc:mysql://witcloud-mysql:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username
=
root
spring.datasource.password
=
37774020
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
tdl.core.add
=
http://logistics
core-java
:8079/witium/addMount
tdl.core.add
=
http://logistics
-core
:8079/witium/addMount
tdl.core.delete
=
http://logistics
core-java
:8079/witium/delMount
tdl.core.delete
=
http://logistics
-core
:8079/witium/delMount
tdl.redis.host
=
witcloud-redis
tdl.redis.host
=
witcloud-redis
...
@@ -33,4 +22,5 @@ tdl.mqtt.username = logistics
...
@@ -33,4 +22,5 @@ tdl.mqtt.username = logistics
tdl.mqtt.password
=
logistics37774020
tdl.mqtt.password
=
logistics37774020
mqtt.userName
=
wtlogistics
mqtt.userName
=
wtlogistics
mqtt.password
=
wtlogistics
mqtt.password
=
wtlogistics
\ No newline at end of file
src/main/resources/application.properties
View file @
77d2e65f
spring.datasource.url
=
jdbc:mysql://127.0.0.1:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url
=
jdbc:mysql://127.0.0.1:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.password=37774020
#spring.datasource.url=jdbc:mysql://47.110.153.44:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.url=jdbc:mysql://172.16.1.13:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
root
spring.datasource.password
=
root
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
@@ -12,7 +8,7 @@ threadpool.corepoolsize = 30
...
@@ -12,7 +8,7 @@ threadpool.corepoolsize = 30
threadpool.maxpoolsize
=
50
threadpool.maxpoolsize
=
50
#server.port=9092
server.port
=
8092
server.port
=
8092
management.security.enabled
=
false
management.security.enabled
=
false
...
...
src/main/resources/mapper/AlarmMapper.xml
View file @
77d2e65f
...
@@ -18,15 +18,14 @@
...
@@ -18,15 +18,14 @@
<!--添加预警信息-->
<!--添加预警信息-->
<insert
id=
"addAlarm"
parameterType=
"com.example.tdl.domain.vo.AddAlarmVo"
>
<insert
id=
"addAlarm"
parameterType=
"com.example.tdl.domain.vo.AddAlarmVo"
>
INSERT INTO alarm VALUES (
INSERT INTO alarm(alarmType,temMax,temMin,humidityMax,humidityMin,tilt,shock,company_id,remark) VALUES (
NULL ,
#{alarmType,jdbcType=VARCHAR},
#{alarmType,jdbcType=VARCHAR},
#{temMax,jdbcType=FLOAT},
#{temMax,jdbcType=FLOAT},
#{temMin,jdbcType=FLOAT},
#{temMin,jdbcType=FLOAT},
#{humidityMax,jdbcType=FLOAT},
#{humidityMax,jdbcType=FLOAT},
#{humidityMin,jdbcType=FLOAT},
#{humidityMin,jdbcType=FLOAT},
#{tilt,jdbcType=FLOAT},
#{tilt,jdbcType=FLOAT},
#{shock,jdbcType=
VARCHAR
},
#{shock,jdbcType=
FLOAT
},
(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR}),
(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR}),
#{remark,jdbcType=VARCHAR}
#{remark,jdbcType=VARCHAR}
)
)
...
...
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