diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java index c42431f..3e5ea91 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java @@ -353,6 +353,11 @@ public class DeviceApiServiceImpl implements DeviceApiService { puser.setFace_pic_base64(""); + //--------------------------------------一码通设备添加 + puser.setIdNumber(p.getIdCard()); + puser.setPersonClass(p.getPersonType()); + + //-----------------------------------------3d数据-------------------------------------- /* "rgb":"url" diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/vo/TenUserVo.java b/shapelight-admin/src/main/java/net/shapelight/modules/vo/TenUserVo.java index 0468d19..610acaa 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/vo/TenUserVo.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/vo/TenUserVo.java @@ -31,5 +31,8 @@ public class TenUserVo { private String sourceFile; private String cameraParam; + private String idNumber; + private Integer personClass; + } diff --git a/shapelight-admin/src/main/resources/application-dev.yml b/shapelight-admin/src/main/resources/application-dev.yml index a5680a1..b56a808 100644 --- a/shapelight-admin/src/main/resources/application-dev.yml +++ b/shapelight-admin/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.50.20:3306/cell_db_v4.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.10.20:3306/cell_db_v4.0_fengdong?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true username: user password: user@server001 initial-size: 10 diff --git a/shapelight-admin/src/main/resources/application.yml b/shapelight-admin/src/main/resources/application.yml index 77fded9..80285ea 100644 --- a/shapelight-admin/src/main/resources/application.yml +++ b/shapelight-admin/src/main/resources/application.yml @@ -32,7 +32,7 @@ spring: file-size-threshold: 1000MB redis: database: 0 - host: 192.168.50.20 + host: 192.168.10.20 port: 6379 password: 123456 # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) @@ -84,7 +84,7 @@ global: db_host: localhost db_port: 3306 minio: - endpoint: http://192.168.50.20:9000 + endpoint: http://192.168.10.20:9000 port: 9000 accessKey: admin secretKey: admin@C501