Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
29f1024d
Commit
29f1024d
authored
Jan 04, 2022
by
chenhao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_ccs' of
http://172.16.10.76/moa/amos-boot-biz
into develop_ccs
parents
eda2c3e4
7d8b65c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
BuildingServiceImpl.java
...yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
+1
-1
application.properties
...ot-system-equip/src/main/resources/application.properties
+4
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @
29f1024d
...
@@ -121,7 +121,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
...
@@ -121,7 +121,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
@Value
(
"${systemctl.sync.switch}"
)
@Value
(
"${systemctl.sync.switch}"
)
private
Boolean
syncSwitch
;
private
Boolean
syncSwitch
;
@Value
(
"${auth-key-fire-
video:fire_build_video
_info}"
)
@Value
(
"${auth-key-fire-
building:fire_building
_info}"
)
private
String
authKey
;
private
String
authKey
;
@Autowired
@Autowired
...
...
amos-boot-system-equip/src/main/resources/application.properties
View file @
29f1024d
...
@@ -94,10 +94,12 @@ auth-key-fire-system=fire_system_info
...
@@ -94,10 +94,12 @@ auth-key-fire-system=fire_system_info
auth-key-fire-equip
=
fire_equip_info
auth-key-fire-equip
=
fire_equip_info
# 权限标识-消防视频
# 权限标识-消防视频
auth-key-fire-video
=
fire_video_info
auth-key-fire-video
=
fire_video_info
# 权限标识-消防视频
# 权限标识-消防
建筑
视频
auth-key-fire-build-video
=
fire_build_video_info
auth-key-fire-build-video
=
fire_build_video_info
# 权限标识-消防车辆
auth-key-fire-car
=
fire_car_info
auth-key-fire-car
=
fire_car_info
# 权限标识-消防建筑
auth-key-fire-building
=
fire_building_info
redis_car_type_count
=
carTypeAndCount
redis_car_type_count
=
carTypeAndCount
...
...
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