Skip to content

C
civil-bigdata
Commit 47301529 by 袁伟铭
Options

修改配置

parent 2a52f6d2
Showing with 79 additions and 70 deletions
api-server/src/main/resources/application.yml
...@@ -28,7 +28,7 @@ spring: ...@@ -28,7 +28,7 @@ spring:
driverClassName: ${jdbc.driver-class-name} driverClassName: ${jdbc.driver-class-name}
username: ${jdbc.username} username: ${jdbc.username}
password: ${jdbc.password} password: ${jdbc.password}
url: ${jdbc.url} url: ${jdbc.master.url}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
# 最小连接数 # 最小连接数
......
config-server/src/main/resources/properties/config-dev.yml
...@@ -26,14 +26,20 @@ redis.url: 127.0.0.1 ...@@ -26,14 +26,20 @@ redis.url: 127.0.0.1
redis.port: 6379 redis.port: 6379
#数据库源配置 #数据库源配置
#jdbc.driver-class-name: com.mysql.cj.jdbc.Driver
#jdbc.username: root
#jdbc.password: rooT123!321
#jdbc.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.driver-class-name: com.mysql.cj.jdbc.Driver jdbc.driver-class-name: com.mysql.cj.jdbc.Driver
jdbc.username: root jdbc.username: root
jdbc.password: Dk2019!23456 jdbc.password: Dk2019!23456
jdbc.url: jdbc:mysql://47.107.148.253:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.master.url: jdbc:mysql://47.107.148.253:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxbz.url: jdbc:mysql://47.107.148.253:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxcj.url: jdbc:mysql://47.107.148.253:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxdb.url: jdbc:mysql://47.107.148.253:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxhy.url: jdbc:mysql://47.107.148.253:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshzz.url: jdbc:mysql://47.107.148.253:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxet.url: jdbc:mysql://47.107.148.253:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxyl.url: jdbc:mysql://47.107.148.253:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshjz.url: jdbc:mysql://47.107.148.253:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.resource.url: jdbc:mysql://47.107.148.253:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jwt #jwt
jwt: jwt:
header: Authorization header: Authorization
......
config-server/src/main/resources/properties/config-product.yml
...@@ -29,7 +29,16 @@ redis.port: 6379 ...@@ -29,7 +29,16 @@ redis.port: 6379
jdbc.driver-class-name: com.mysql.cj.jdbc.Driver jdbc.driver-class-name: com.mysql.cj.jdbc.Driver
jdbc.username: root jdbc.username: root
jdbc.password: rooT123!321 jdbc.password: rooT123!321
jdbc.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.master.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxbz.url: jdbc:mysql://192.168.0.193:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxcj.url: jdbc:mysql://192.168.0.193:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxdb.url: jdbc:mysql://192.168.0.193:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxhy.url: jdbc:mysql://192.168.0.193:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshzz.url: jdbc:mysql://192.168.0.193:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxet.url: jdbc:mysql://192.168.0.193:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxyl.url: jdbc:mysql://192.168.0.193:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshjz.url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.resource.url: jdbc:mysql://192.168.0.193:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jwt #jwt
jwt: jwt:
......
config-server/src/main/resources/properties/config-test.yml
...@@ -29,7 +29,7 @@ redis.port: 6379 ...@@ -29,7 +29,7 @@ redis.port: 6379
jdbc.driver-class-name: com.mysql.cj.jdbc.Driver jdbc.driver-class-name: com.mysql.cj.jdbc.Driver
jdbc.username: root jdbc.username: root
jdbc.password: rooT123!321 jdbc.password: rooT123!321
jdbc.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.master.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jwt #jwt
jwt: jwt:
......
portal-server/src/main/resources/application.yml
...@@ -31,58 +31,58 @@ spring: ...@@ -31,58 +31,58 @@ spring:
datasource: datasource:
master: master:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: ${jdbc.url} url: ${jdbc.master.url}
username: ${jdbc.username} username: ${jdbc.username}
password: ${jdbc.password} password: ${jdbc.password}
driver-class-name: ${jdbc.driver-class-name} driver-class-name: ${jdbc.driver-class-name}
gxbz: gxbz:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxbz.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxcj: gxcj:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxcj.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxdb: gxdb:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxdb.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxhy: gxhy:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxhy.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxshzz: gxshzz:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxshzz.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxet: gxet:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxet.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxyl: gxyl:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxyl.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
gxshjz: gxshjz:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.gxshjz.url}
username: root username: ${jdbc.username}
password: rooT123!321 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
druid: druid:
# 初始连接数 # 初始连接数
initial-size: 10 initial-size: 10
......
resource-server/src/main/java/com/zq/resource/service/AreaService.java
...@@ -25,10 +25,10 @@ public class AreaService { ...@@ -25,10 +25,10 @@ public class AreaService {
public List<DataTreeVo> areaTree() { public List<DataTreeVo> areaTree() {
List<SystemArea> areaList = systemAreaDao.selectList(Wrappers.lambdaQuery(SystemArea.class).in(SystemArea::getType, "2", "3", "4")); List<SystemArea> areaList = systemAreaDao.selectList(Wrappers.lambdaQuery(SystemArea.class).in(SystemArea::getType, "2", "3", "4"));
List<DataTreeVo> collect = areaList.stream().map(systemArea -> DataTreeVo.builder() List<DataTreeVo> collect = areaList.stream().map(systemArea -> DataTreeVo.builder()
.id(systemArea.getId()) .value(systemArea.getId())
.parentId(systemArea.getParentId()) .parentId(systemArea.getParentId())
.name(systemArea.getName()) .label(systemArea.getName())
.childList(new ArrayList<>()) .children(new ArrayList<>())
.build()).collect(Collectors.toList()); .build()).collect(Collectors.toList());
return TreeUtils.buildTree(collect, "450000000000"); return TreeUtils.buildTree(collect, "450000000000");
......
resource-server/src/main/java/com/zq/resource/service/DeptService.java
...@@ -96,10 +96,10 @@ public class DeptService { ...@@ -96,10 +96,10 @@ public class DeptService {
public Object getDeptTree() { public Object getDeptTree() {
List<OrgDept> deptList = orgDeptDao.selectList(null); List<OrgDept> deptList = orgDeptDao.selectList(null);
List<DataTreeVo> collect = deptList.stream().map(dept -> DataTreeVo.builder() List<DataTreeVo> collect = deptList.stream().map(dept -> DataTreeVo.builder()
.id(String.valueOf(dept.getId())) .value(String.valueOf(dept.getId()))
.name(dept.getDeptName())
.parentId(String.valueOf(dept.getParentId())) .parentId(String.valueOf(dept.getParentId()))
.childList(new ArrayList<>()) .label(dept.getDeptName())
.children(new ArrayList<>())
.build()).collect(Collectors.toList()); .build()).collect(Collectors.toList());
return TreeUtils.buildTree(collect, "0"); return TreeUtils.buildTree(collect, "0");
......
resource-server/src/main/java/com/zq/resource/utils/TreeUtils.java
...@@ -23,17 +23,17 @@ public class TreeUtils { ...@@ -23,17 +23,17 @@ public class TreeUtils {
treeList.add(treeData); treeList.add(treeData);
} }
for (DataTreeVo it : treeDataList) { for (DataTreeVo it : treeDataList) {
if (treeData.getId().equals(it.getParentId())) { if (treeData.getValue().equals(it.getParentId())) {
if (treeData.getChildList() == null) { if (treeData.getChildren() == null) {
treeData.setChildList(new ArrayList<>()); treeData.setChildren(new ArrayList<>());
} }
treeData.getChildList().add(it); treeData.getChildren().add(it);
ids.add(it.getId()); ids.add(it.getValue());
} }
} }
} }
if (treeList.size() == 0) { if (treeList.size() == 0) {
treeList = treeDataList.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); treeList = treeDataList.stream().filter(s -> !ids.contains(s.getValue())).collect(Collectors.toList());
} }
return treeList; return treeList;
......
resource-server/src/main/java/com/zq/resource/vo/DataTreeVo.java
...@@ -19,14 +19,14 @@ import java.util.List; ...@@ -19,14 +19,14 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
public class DataTreeVo { public class DataTreeVo {
private String id; private String value;
private String parentId; private String parentId;
private String name; private String label;
private Integer childNum; private Integer childNum;
private List<DataTreeVo> childList; private List<DataTreeVo> children;
} }
resource-server/src/main/resources/application.yml
...@@ -29,16 +29,16 @@ spring: ...@@ -29,16 +29,16 @@ spring:
datasource: datasource:
master: master:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: ${jdbc.url} url: ${jdbc.master.url}
username: ${jdbc.username} username: ${jdbc.username}
password: ${jdbc.password} password: ${jdbc.password}
driver-class-name: ${jdbc.driver-class-name} driver-class-name: ${jdbc.driver-class-name}
resource: resource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://47.107.148.253:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai url: ${jdbc.resource.url}
username: root username: ${jdbc.username}
password: Dk2019!23456 password: ${jdbc.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: ${jdbc.driver-class-name}
druid: druid:
# 初始连接数 # 初始连接数
initial-size: 10 initial-size: 10
......
sys-server/src/main/resources/application.yml
...@@ -21,7 +21,7 @@ spring: ...@@ -21,7 +21,7 @@ spring:
datasource: datasource:
master: master:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: ${jdbc.url} url: ${jdbc.master.url}
username: ${jdbc.username} username: ${jdbc.username}
password: ${jdbc.password} password: ${jdbc.password}
driver-class-name: ${jdbc.driver-class-name} driver-class-name: ${jdbc.driver-class-name}
...@@ -61,7 +61,7 @@ spring: ...@@ -61,7 +61,7 @@ spring:
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# username: ${jdbc.username} # username: ${jdbc.username}
# password: ${jdbc.password} # password: ${jdbc.password}
# url: ${jdbc.url} # url: ${jdbc.master.url}
# # 初始连接数 # # 初始连接数
# initial-size: 5 # initial-size: 5
# # 最小连接数 # # 最小连接数
......
user-server/src/main/resources/application.yml
...@@ -29,16 +29,10 @@ spring: ...@@ -29,16 +29,10 @@ spring:
datasource: datasource:
master: master:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: ${jdbc.url} url: ${jdbc.master.url}
username: ${jdbc.username} username: ${jdbc.username}
password: ${jdbc.password} password: ${jdbc.password}
driver-class-name: ${jdbc.driver-class-name} driver-class-name: ${jdbc.driver-class-name}
gxshzz:
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: rooT123!321
driver-class-name: com.mysql.cj.jdbc.Driver
druid: druid:
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment