Merge branch 'master' of http://121.42.53.174:3000/jiapeng/console-web

# Conflicts:
#	.gitignore

.gitignore

@@ -2,4 +2,5 @@
/.settings/
/.classpath
/.project
.idea
.idea
/.tern-project

src/main/java/com/ekexiu/console/system/po/MyCustomer.java

@@ -1,200 +1,208 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.DescpSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("powerId")
@Table("view_my_customer")
public class MyCustomer  implements CreateTimeSupported,ModifyTimeSupported,DescpSupported {
	private String powerId;
	private String id;
	private String email;
	private String phone;
	private String subject;	
	private String industry;
	private String department;
	private String office;
	private String orgId;
	private String title;
	private String name;
	private String address;
	private Integer authentication;
	private String authType;
	private Integer authStatus;
	private Integer sortFirst;
	private Integer authStatusExpert;
	private String orgname;
	private String descp;
	private String createTime;
	private String powType;
	private String modifyTime;
	private String cuserId;
//String_de大写的是允许为空，小写的是不允许为空
	@Column(DE.string_de)
	public String getPowerId() {
		return powerId;
	}
	public void setPowerId(String powerId) {
		this.powerId = powerId;
	}
	@Column(DE.String_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.String_de)
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(DE.String_de)
	public String getSubject() {
		return subject;
	}
	public void setSubject(String subject) {
		this.subject = subject;
	}
	@Column(DE.String_de)
	public String getPhone() {
		return phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
	@Column(DE.String_de)
	public String getIndustry() {
		return industry;
	}
	public void setIndustry(String industry) {
		this.industry = industry;
	}
	@Column(DE.String_de)
	public String getDepartment() {
		return department;
	}
	public void setDepartment(String department) {
		this.department = department;
	}
	@Column(DE.String_de)
	public String getOffice() {
		return office;
	}
	public void setOffice(String office) {
		this.office = office;
	}
	@Column(DE.String_de)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	@Column(DE.String_de)
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	@Column(DE.String_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.String_de)
	public String getAddress() {
		return address;
	}
	public void setAddress(String address) {
		this.address = address;
	}
	@Column(DE.Int_de)
	public Integer getAuthentication() {
		return authentication;
	}
	public void setAuthentication(Integer authentication) {
		this.authentication = authentication;
	}
	@Column(DE.String_de)
	public String getAuthType() {
		return authType;
	}
	public void setAuthType(String authType) {
		this.authType = authType;
	}
	@Column(DE.Int_de)
	public Integer getAuthStatus() {
		return authStatus;
	}
	public void setAuthStatus(Integer authStatus) {
		this.authStatus = authStatus;
	}
	@Column(DE.Int_de)
	public Integer getSortFirst() {
		return sortFirst;
	}
	public void setSortFirst(Integer sortFirst) {
		this.sortFirst = sortFirst;
	}
	@Column(DE.Int_de)
	public Integer getAuthStatusExpert() {
		return authStatusExpert;
	}
	public void setAuthStatusExpert(Integer authStatusExpert) {
		this.authStatusExpert = authStatusExpert;
	}
	@Column(DE.String_de)
	public String getOrgname() {
		return orgname;
	}
	public void setOrgname(String orgname) {
		this.orgname = orgname;
	}
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	public String getModifyTime() {
		return modifyTime;
	}
	public void setModifyTime(String modifyTime) {
		this.modifyTime = modifyTime;
	}
	@Column(DE.String_de)
	public String getPowType() {
		return powType;
	}
	public void setPowType(String powType) {
		this.powType = powType;
	}
	@Column(DE.String_de)
	public String getCuserId() {
		return cuserId;
	}
	public void setCuserId(String cuserId) {
		this.cuserId = cuserId;
	}
}
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.DescpSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("powerId")
@Table("view_my_customer")
public class MyCustomer  implements CreateTimeSupported,ModifyTimeSupported,DescpSupported {
	private String powerId;
	private String id;
	private String email;
	private String phone;
	private String subject;	
	private String industry;
	private String department;
	private String office;
	private String orgId;
	private String title;
	private String name;
	private String address;
	private Integer authentication;
	private String authType;
	private Integer authStatus;
	private Integer sortFirst;
	private Integer authStatusExpert;
	private String orgname;
	private String descp;
	private String createTime;
	private String powType;
	private String modifyTime;
	private String cuserId;
	private String cuserName;
//String_de大写的是允许为空，小写的是不允许为空
	@Column(DE.string_de)
	public String getPowerId() {
		return powerId;
	}
	public void setPowerId(String powerId) {
		this.powerId = powerId;
	}
	@Column(DE.String_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.String_de)
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(DE.String_de)
	public String getSubject() {
		return subject;
	}
	public void setSubject(String subject) {
		this.subject = subject;
	}
	@Column(DE.String_de)
	public String getPhone() {
		return phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
	@Column(DE.String_de)
	public String getIndustry() {
		return industry;
	}
	public void setIndustry(String industry) {
		this.industry = industry;
	}
	@Column(DE.String_de)
	public String getDepartment() {
		return department;
	}
	public void setDepartment(String department) {
		this.department = department;
	}
	@Column(DE.String_de)
	public String getOffice() {
		return office;
	}
	public void setOffice(String office) {
		this.office = office;
	}
	@Column(DE.String_de)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	@Column(DE.String_de)
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	@Column(DE.String_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.String_de)
	public String getAddress() {
		return address;
	}
	public void setAddress(String address) {
		this.address = address;
	}
	@Column(DE.Int_de)
	public Integer getAuthentication() {
		return authentication;
	}
	public void setAuthentication(Integer authentication) {
		this.authentication = authentication;
	}
	@Column(DE.String_de)
	public String getAuthType() {
		return authType;
	}
	public void setAuthType(String authType) {
		this.authType = authType;
	}
	@Column(DE.Int_de)
	public Integer getAuthStatus() {
		return authStatus;
	}
	public void setAuthStatus(Integer authStatus) {
		this.authStatus = authStatus;
	}
	@Column(DE.Int_de)
	public Integer getSortFirst() {
		return sortFirst;
	}
	public void setSortFirst(Integer sortFirst) {
		this.sortFirst = sortFirst;
	}
	@Column(DE.Int_de)
	public Integer getAuthStatusExpert() {
		return authStatusExpert;
	}
	public void setAuthStatusExpert(Integer authStatusExpert) {
		this.authStatusExpert = authStatusExpert;
	}
	@Column(DE.String_de)
	public String getOrgname() {
		return orgname;
	}
	public void setOrgname(String orgname) {
		this.orgname = orgname;
	}
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	public String getModifyTime() {
		return modifyTime;
	}
	public void setModifyTime(String modifyTime) {
		this.modifyTime = modifyTime;
	}
	@Column(DE.String_de)
	public String getPowType() {
		return powType;
	}
	public void setPowType(String powType) {
		this.powType = powType;
	}
	@Column(DE.String_de)
	public String getCuserId() {
		return cuserId;
	}
	public void setCuserId(String cuserId) {
		this.cuserId = cuserId;
	}
	@Column(DE.String_de)
	public String getCuserName() {
		return cuserName;
	}
	public void setCuserName(String cuserName) {
		this.cuserName = cuserName;
	}
}

src/main/resources/project-dev.properties

@@ -1,32 +1,34 @@
dataSource=com.alibaba.druid.pool.DruidDataSource
#数据库连接地址、名称、密码
dataSource.url=jdbc:postgresql://192.168.3.233:5432/console_dev
#dataSource.url=jdbc:postgresql://www.ekexiu.com:5432/ekexiu
dataSource.username=postgres
dataSource.password=postgres
#连接池启动时的初始值（初始化连接）
dataSource.initialSize::int=1
#最小空闲连接值
dataSource.minIdle::int=1 
#连接池的最大值（最大连接数量）
dataSource.maxActive::int=1
#超时等待时间（maxWait代表当Connection用尽了，多久之后进行回收丢失连接）
dataSource.maxWait::long=60000
#连接超时任务的时间间隔
dataSource.timeBetweenEvictionRunsMillis::long=60000
#连接的超时时间
dataSource.minEvictableIdleTimeMillis::long=300000  
#用来验证从连接池取出的连接
dataSource.validationQuery=SELECT 1  
#指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败则连接将被从池中去除
dataSource.testWhileIdle::boolean=true
#在从池中取出连接前进行检验,如果检验失败则从池中去除连接并尝试取出另一个
dataSource.testOnBorrow::boolean=true
#指明是否在归还到池中前进行检验
dataSource.testOnReturn::boolean=true   
#开启池的prepared statement 池功能
dataSource.poolPreparedStatements::boolean=true 
#statement池能够同时分配的打开的statements的最大数量
dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
dataSource=com.alibaba.druid.pool.DruidDataSource
#数据库连接地址、名称、密码
dataSource.url=jdbc:postgresql://192.168.3.233:5432/console_dev
#dataSource.url=jdbc:postgresql://localhost:5432/console
#dataSource.url=jdbc:postgresql://www.ekexiu.com:5432/ekexiu
dataSource.username=postgres
dataSource.password=postgres
#连接池启动时的初始值（初始化连接）
dataSource.initialSize::int=1
#最小空闲连接值
dataSource.minIdle::int=1 
#连接池的最大值（最大连接数量）
dataSource.maxActive::int=1
#超时等待时间（maxWait代表当Connection用尽了，多久之后进行回收丢失连接）
dataSource.maxWait::long=60000
#连接超时任务的时间间隔
dataSource.timeBetweenEvictionRunsMillis::long=60000
#连接的超时时间
dataSource.minEvictableIdleTimeMillis::long=300000  
#用来验证从连接池取出的连接
dataSource.validationQuery=SELECT 1  
#指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败则连接将被从池中去除
dataSource.testWhileIdle::boolean=true
#在从池中取出连接前进行检验,如果检验失败则从池中去除连接并尝试取出另一个
dataSource.testOnBorrow::boolean=true
#指明是否在归还到池中前进行检验
dataSource.testOnReturn::boolean=true   
#开启池的prepared statement 池功能
dataSource.poolPreparedStatements::boolean=true 
#statement池能够同时分配的打开的statements的最大数量
dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_console_system_service_UserService.path::java.io.File=D:/tmp/data