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
bfd82e53
Commit
bfd82e53
authored
Sep 20, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改agencyCode获取
parent
879cae13
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+1
-1
application-dev.properties
...-system-jcs/src/main/resources/application-dev.properties
+14
-12
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
bfd82e53
...
...
@@ -165,7 +165,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Autowired
DataDictionaryMapper
dataDictionaryMapper
;
@Value
(
"${
agencyCode:station
}"
)
@Value
(
"${
personAgencyCode
}"
)
private
String
agencyCode
;
public
static
List
<
OrgMenuDto
>
buildTreeParallel
(
List
<
OrgUsr
>
list
)
{
...
...
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @
bfd82e53
## DB properties:
spring.datasource.url
=
jdbc:mysql://172.16.1
0.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729
?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url
=
jdbc:mysql://172.16.1
1.201:3306/dl_amos_common_biz
?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username
=
root
spring.datasource.password
=
Yeejoin@2020
## eureka properties:
eureka.client.serviceUrl.defaultZone
=
http://172.16.1
0.21
1:10001/eureka/
eureka.client.serviceUrl.defaultZone
=
http://172.16.1
1.20
1:10001/eureka/
## redis properties:danger/list
spring.redis.database
=
1
spring.redis.host
=
172.16.1
0.21
1
spring.redis.host
=
172.16.1
1.20
1
spring.redis.port
=
6379
spring.redis.password
=
yeejoin@202
0
spring.redis.password
=
123456
0
## ES properties:
biz.elasticsearch.address
=
172.16.1
0.21
1
biz.elasticsearch.address
=
172.16.1
1.20
1
spring.data.elasticsearch.cluster-name
=
elasticsearch
spring.data.elasticsearch.cluster-nodes
=
${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris
=
http://${biz.elasticsearch.address}:9200
...
...
@@ -26,15 +26,15 @@ elasticsearch.password= 123456
## emqx properties:
emqx.clean-session
=
true
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}
emqx.broker
=
tcp://172.16.1
0.21
1:2883
emqx.user-name
=
super
emqx.password
=
a123456
emqx.broker
=
tcp://172.16.1
1.20
1:2883
emqx.user-name
=
admin
emqx.password
=
public
##
规则配置
properties:
##
????
properties:
rule.definition.load
=
false
rule.definition.model-package
=
com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency
=
jcs
#rule.definition.local-ip=172.16.1
0.21
1
#rule.definition.local-ip=172.16.1
1.20
1
## mongodb properties:
#spring.data.mongodb.uri=mongodb://172.16.6.60:27017/command_db
...
...
@@ -44,4 +44,6 @@ file.url=http://39.98.45.134:9000/
video.url
=
https://11.11.16.4:443/
ifc.url
=
http://11.11.16.17/IFCInterface
ifc.call-back.localIp
=
11.11.16.1
\ No newline at end of file
ifc.call-back.localIp
=
11.11.16.1
personAgencyCode
=
STATE_GRID
\ No newline at end of file
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