增加人脸、卡号信息

eladmin-common/src/main/java/me/zhengjie/base/QueryPageParams.java

@@ -1,10 +1,5 @@
 package me.zhengjie.base;
 
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-import java.util.Optional;
-
 public class QueryPageParams<T> {
     private String timestamp;
     private String nonce;

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/domain/DmUser.java

@@ -69,6 +69,14 @@ public class DmUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "邮箱")
     private String email;
 
+    @Column(name = "faceid")
+    @ApiModelProperty(value = "人脸信息")
+    private String faceid;
+
+    @Column(name = "cardid")
+    @ApiModelProperty(value = "卡号")
+    private String cardid;
+
     @ManyToMany(fetch=FetchType.EAGER)
     @ApiModelProperty(value = "用户角色")
     @JoinTable(name = "dm_users_roles",

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -72,7 +72,7 @@ public class UserApiController {
     @Log("获取用户数据")
     @ApiOperation("获取用户数据")
     @AnonymousPostMapping(value = "/getzkusers")
-    public BaseResponse<Object> getzkusers(@RequestBody QueryPageParams<DmUserQueryCriteria> params, Pageable pageable) throws IOException {
+    public BaseResponse<Object> getzkusers(@RequestBody QueryPageParams<DmUserQueryCriteria> params, Pageable pageable)  {
         SecurityUtils.CheckApiAuth(params);
         Map<String, Object> list = dmUserService.queryAll(params.getQuery(), pageable);
 
@@ -82,7 +82,7 @@ public class UserApiController {
     @Log("获取部门数据")
     @ApiOperation("获取部门数据")
     @AnonymousPostMapping(value = "/getzkdeps")
-    public BaseResponse<Object> getzkdeps(@RequestBody QueryPageParams<DeptQueryNoAuthCriteria> params, Pageable pageable) throws Exception {
+    public BaseResponse<Object> getzkdeps(@RequestBody QueryPageParams<DeptQueryNoAuthCriteria> params, Pageable pageable) {
         SecurityUtils.CheckApiAuth(params);
         Map<String, Object> list = deptService.queryAll(params.getQuery(), pageable);
 

eladmin-system/src/main/resources/config/application-dev.yml

@@ -7,9 +7,9 @@ spring:
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
 #      username: ${DB_USER:root}
 #      password: ${DB_PWD:123456}
-      url: jdbc:log4jdbc:mysql://47.101.34.182:3306/dm_restaurant?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-      username: dev
-      password: root
+      url: jdbc:log4jdbc:mysql://114.55.24.6:3308/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      username: root
+      password: shimao@123
       # 初始连接数
       initial-size: 5
       # 最小连接数