diff --git a/api/api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/api/api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index dbe7e9d..bca0ba6 100644 --- a/api/api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/api/api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -5,6 +5,8 @@ import com.bonus.common.core.annotation.Excel.ColumnType; import com.bonus.common.core.annotation.Excel.Type; import com.bonus.common.core.annotation.Excels; import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -54,6 +56,8 @@ public class SysUser extends BaseEntity private String avatar; /** 密码 */ + @JsonIgnore + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String password; /** 帐号状态(1正常 0停用) */ @@ -134,7 +138,7 @@ public class SysUser extends BaseEntity .append("phonenumber", getPhonenumber()) .append("sex", getSex()) .append("avatar", getAvatar()) - .append("password", getPassword()) +// .append("password", getPassword()) .append("status", getStatus()) .append("delFlag", getDelFlag()) .append("loginIp", getLoginIp()) diff --git a/api/api-system/src/main/java/com/bonus/system/api/model/LoginUser.java b/api/api-system/src/main/java/com/bonus/system/api/model/LoginUser.java index 3a29d68..9a9a389 100644 --- a/api/api-system/src/main/java/com/bonus/system/api/model/LoginUser.java +++ b/api/api-system/src/main/java/com/bonus/system/api/model/LoginUser.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.List; import java.util.Set; import com.bonus.system.api.domain.SysUser; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; /** @@ -19,6 +21,8 @@ public class LoginUser implements Serializable /** * 用户唯一标识 */ + @JsonIgnore + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String token; /** diff --git a/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java index 9116a0d..c560ebe 100644 --- a/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java +++ b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java @@ -10,6 +10,7 @@ public class AuthWriteUtils { public static boolean endWith(String url){ + url = url.toLowerCase(); if(url.endsWith(".js")){ return true; }else if(url.endsWith(".ttf")){ @@ -44,7 +45,9 @@ public class AuthWriteUtils { return true; }else if(url.endsWith(".docx") || url.endsWith(".doc")){ return true; - }else { + }else if(url.endsWith(".apk")){ + return true; + } else { return url.endsWith(".jpeg"); } } diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml index 3b367f3..99e67bd 100644 --- a/gateway/src/main/resources/bootstrap.yml +++ b/gateway/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: # 本地、测试 port: 39100 # 线上 -# port: 9100 +# port: 19100 # servlet: # context-path: lpRealName diff --git a/modules/app/src/main/resources/bootstrap.yml b/modules/app/src/main/resources/bootstrap.yml index 295914e..cc30ff7 100644 --- a/modules/app/src/main/resources/bootstrap.yml +++ b/modules/app/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 31913 + port: 1913 # servlet: # context-path: /app diff --git a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java index 1617fdc..d705277 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java @@ -30,7 +30,7 @@ public class IpAndPathConfig { */ public static String faceDevUrl = "http://127.0.0.1:39100/file/"; public static String faceTestUrl = "http://192.168.0.14:39100/file/"; - public static String faceProdUrl = "http://112.29.103.165:9100/file/"; + public static String faceProdUrl = "http://112.29.103.165:14413/file/"; /** * 统一工作平台url地址 diff --git a/modules/bmw/src/main/resources/static/js/publicJs.js b/modules/bmw/src/main/resources/static/js/publicJs.js index 00f9f2c..1ec72eb 100644 --- a/modules/bmw/src/main/resources/static/js/publicJs.js +++ b/modules/bmw/src/main/resources/static/js/publicJs.js @@ -1,11 +1,11 @@ // 本地环境 -// let IP_URL="http://127.0.0.1:39100" -// let ctxPath = IP_URL+"/bmw"; - -// //测试环境 -let IP_URL="http://192.168.0.14:39100" +let IP_URL="http://127.0.0.1:39100" let ctxPath = IP_URL+"/bmw"; +// 测试环境 +// let IP_URL="http://192.168.0.14:39100" +// let ctxPath = IP_URL+"/bmw"; + //正式环境 // let IP_URL="http://112.29.103.165:14413" // let ctxPath = IP_URL+"/bmw"; diff --git a/modules/file/src/main/resources/bootstrap.yml b/modules/file/src/main/resources/bootstrap.yml index 244e6dc..30d363b 100644 --- a/modules/file/src/main/resources/bootstrap.yml +++ b/modules/file/src/main/resources/bootstrap.yml @@ -1,9 +1,9 @@ # Tomcat server: # 本地、测试 - port: 31909 +# port: 31909 # 线上 -# port: 1909 + port: 1909 # servlet: