diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java index cbb2856..b3ab4b5 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java @@ -60,24 +60,17 @@ public class LoginUser implements Serializable */ private SysUser sysUser; - - @ApiModelProperty("人员id") - @JsonFormat(shape = JsonFormat.Shape.STRING) private Long custId; - @ApiModelProperty("人员姓名") - private String custName; - @ApiModelProperty("人员编号") - private String custNum; - @ApiModelProperty("人脸照片地址") - private String custPhotoUrl; - @ApiModelProperty("电话号码") - private String mobile; - @ApiModelProperty("登录密码") - private String pwd; - @ApiModelProperty("") - private Long expireIn; - @ApiModelProperty("是否登录") - private boolean isLogin; + + private String openId; + + private String nickName; + + private String photoUrl; + + private String phonenumber; + + private String password; public String getToken() { @@ -177,59 +170,43 @@ public class LoginUser implements Serializable this.custId = custId; } - public String getCustName() { - return custName; + public String getOpenId() { + return openId; } - public void setCustName(String custName) { - this.custName = custName; + public void setOpenId(String openId) { + this.openId = openId; } - public String getCustNum() { - return custNum; + public String getNickName() { + return nickName; } - public void setCustNum(String custNum) { - this.custNum = custNum; + public void setNickName(String nickName) { + this.nickName = nickName; } - public String getCustPhotoUrl() { - return custPhotoUrl; + public String getPhotoUrl() { + return photoUrl; } - public void setCustPhotoUrl(String custPhotoUrl) { - this.custPhotoUrl = custPhotoUrl; + public void setPhotoUrl(String photoUrl) { + this.photoUrl = photoUrl; } - public String getMobile() { - return mobile; + public String getPhonenumber() { + return phonenumber; } - public void setMobile(String mobile) { - this.mobile = mobile; + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; } - public String getPwd() { - return pwd; + public String getPassword() { + return password; } - public void setPwd(String pwd) { - this.pwd = pwd; - } - - public Long getExpireIn() { - return expireIn; - } - - public void setExpireIn(Long expireIn) { - this.expireIn = expireIn; - } - - public boolean isLogin() { - return isLogin; - } - - public void setLogin(boolean login) { - isLogin = login; + public void setPassword(String password) { + this.password = password; } } diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml index 7051969..303ea0f 100644 --- a/bonus-auth/src/main/resources/bootstrap.yml +++ b/bonus-auth/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-auth profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 1766a04..c23f027 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-gateway profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: diff --git a/bonus-modules/bonus-face/src/main/resources/bootstrap.yml b/bonus-modules/bonus-face/src/main/resources/bootstrap.yml index 4cb61e3..9b36687 100644 --- a/bonus-modules/bonus-face/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-face/src/main/resources/bootstrap.yml @@ -13,7 +13,7 @@ spring: name: bonus-face profiles: # 环境配置 - active: dev + active: smart_canteen_local cloud: nacos: discovery: diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml index 371813f..5db6e57 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: diff --git a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml index d7da0c3..b9d09f6 100644 --- a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-gen profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml index 5c661c7..4e3d027 100644 --- a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-job profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 790dc0d..b1e8a47 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-system profiles: # 环境配置 - active: dev + active: smart_canteen_local task: scheduling: pool: diff --git a/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml b/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml index ffa5e8a..7ffbca4 100644 --- a/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml +++ b/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-monitor profiles: # 环境配置 - active: dev + active: smart_canteen_local #加密组件 jasypt: