端口号更改
This commit is contained in:
parent
a023db140c
commit
09780f13e1
|
|
@ -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.Excel.Type;
|
||||||
import com.bonus.common.core.annotation.Excels;
|
import com.bonus.common.core.annotation.Excels;
|
||||||
import com.bonus.common.core.web.domain.BaseEntity;
|
import com.bonus.common.core.web.domain.BaseEntity;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
@ -54,6 +56,8 @@ public class SysUser extends BaseEntity
|
||||||
private String avatar;
|
private String avatar;
|
||||||
|
|
||||||
/** 密码 */
|
/** 密码 */
|
||||||
|
@JsonIgnore
|
||||||
|
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
/** 帐号状态(1正常 0停用) */
|
/** 帐号状态(1正常 0停用) */
|
||||||
|
|
@ -134,7 +138,7 @@ public class SysUser extends BaseEntity
|
||||||
.append("phonenumber", getPhonenumber())
|
.append("phonenumber", getPhonenumber())
|
||||||
.append("sex", getSex())
|
.append("sex", getSex())
|
||||||
.append("avatar", getAvatar())
|
.append("avatar", getAvatar())
|
||||||
.append("password", getPassword())
|
// .append("password", getPassword())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("delFlag", getDelFlag())
|
.append("delFlag", getDelFlag())
|
||||||
.append("loginIp", getLoginIp())
|
.append("loginIp", getLoginIp())
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import com.bonus.system.api.domain.SysUser;
|
import com.bonus.system.api.domain.SysUser;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -19,6 +21,8 @@ public class LoginUser implements Serializable
|
||||||
/**
|
/**
|
||||||
* 用户唯一标识
|
* 用户唯一标识
|
||||||
*/
|
*/
|
||||||
|
@JsonIgnore
|
||||||
|
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ public class AuthWriteUtils {
|
||||||
|
|
||||||
|
|
||||||
public static boolean endWith(String url){
|
public static boolean endWith(String url){
|
||||||
|
url = url.toLowerCase();
|
||||||
if(url.endsWith(".js")){
|
if(url.endsWith(".js")){
|
||||||
return true;
|
return true;
|
||||||
}else if(url.endsWith(".ttf")){
|
}else if(url.endsWith(".ttf")){
|
||||||
|
|
@ -44,7 +45,9 @@ public class AuthWriteUtils {
|
||||||
return true;
|
return true;
|
||||||
}else if(url.endsWith(".docx") || url.endsWith(".doc")){
|
}else if(url.endsWith(".docx") || url.endsWith(".doc")){
|
||||||
return true;
|
return true;
|
||||||
}else {
|
}else if(url.endsWith(".apk")){
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
return url.endsWith(".jpeg");
|
return url.endsWith(".jpeg");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ server:
|
||||||
# 本地、测试
|
# 本地、测试
|
||||||
port: 39100
|
port: 39100
|
||||||
# 线上
|
# 线上
|
||||||
# port: 9100
|
# port: 19100
|
||||||
# servlet:
|
# servlet:
|
||||||
# context-path: lpRealName
|
# context-path: lpRealName
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 31913
|
port: 1913
|
||||||
# servlet:
|
# servlet:
|
||||||
# context-path: /app
|
# context-path: /app
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ public class IpAndPathConfig {
|
||||||
*/
|
*/
|
||||||
public static String faceDevUrl = "http://127.0.0.1:39100/file/";
|
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 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地址
|
* 统一工作平台url地址
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
// 本地环境
|
// 本地环境
|
||||||
// let IP_URL="http://127.0.0.1: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 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 IP_URL="http://112.29.103.165:14413"
|
||||||
// let ctxPath = IP_URL+"/bmw";
|
// let ctxPath = IP_URL+"/bmw";
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
# 本地、测试
|
# 本地、测试
|
||||||
port: 31909
|
# port: 31909
|
||||||
# 线上
|
# 线上
|
||||||
# port: 1909
|
port: 1909
|
||||||
|
|
||||||
|
|
||||||
# servlet:
|
# servlet:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue