Alawn/micro-fast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

重新生成代码

Browse Source
This commit is contained in:
winLsy
2018-03-13 22:27:00 +08:00
parent 517e139f95
commit 7e75664d5a
17 changed files with 407 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl
+4 -5
View File
@@ -16,7 +16,6 @@ import javax.validation.Valid;
import java.util.ArrayList;
/**
*
* @author lsy
*/
@Api("${varPojoName}")
@@ -34,14 +33,14 @@ public class ${pojoName}Controller {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse get${pojoName}ById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ${varPojoName}Service.getById(${mybatisGenerator.primaryKeyType}.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse get${pojoName}ByCondition(${pojoName} ${varPojoName},
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -50,7 +49,7 @@ public class ${pojoName}Controller {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
@PutMapping
public ServerResponse update${pojoName}(@Valid ${pojoName} ${varPojoName},
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
${varPojoName}.setId(${mybatisGenerator.primaryKeyType}.valueOf(id));
ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterOauthController.java
+5 -7
View File
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author lsy
*/
@Api("ucenterOauth")
@@ -35,14 +33,14 @@ public class UcenterOauthController {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse getUcenterOauthById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ucenterOauthService.getById(Integer.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse getUcenterOauthByCondition(UcenterOauth ucenterOauth,
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -51,8 +49,8 @@ public class UcenterOauthController {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
public ServerResponse updateUcenterOauth(UcenterOauth ucenterOauth,
@PutMapping
public ServerResponse updateUcenterOauth(@Valid UcenterOauth ucenterOauth,
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
ucenterOauth.setId(Integer.valueOf(id));
return ucenterOauthService.update(ucenterOauth);
ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserController.java
+5 -7
View File
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author lsy
*/
@Api("ucenterUser")
@@ -35,14 +33,14 @@ public class UcenterUserController {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse getUcenterUserById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ucenterUserService.getById(Integer.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse getUcenterUserByCondition(UcenterUser ucenterUser,
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -51,8 +49,8 @@ public class UcenterUserController {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
public ServerResponse updateUcenterUser(UcenterUser ucenterUser,
@PutMapping
public ServerResponse updateUcenterUser(@Valid UcenterUser ucenterUser,
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
ucenterUser.setId(Integer.valueOf(id));
return ucenterUserService.update(ucenterUser);
ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserDetailsController.java
+5 -7
View File
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author lsy
*/
@Api("ucenterUserDetails")
@@ -35,14 +33,14 @@ public class UcenterUserDetailsController {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse getUcenterUserDetailsById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ucenterUserDetailsService.getById(Integer.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse getUcenterUserDetailsByCondition(UcenterUserDetails ucenterUserDetails,
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -51,8 +49,8 @@ public class UcenterUserDetailsController {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
public ServerResponse updateUcenterUserDetails(UcenterUserDetails ucenterUserDetails,
@PutMapping
public ServerResponse updateUcenterUserDetails(@Valid UcenterUserDetails ucenterUserDetails,
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
ucenterUserDetails.setId(Integer.valueOf(id));
return ucenterUserDetailsService.update(ucenterUserDetails);
ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserLogController.java
+5 -7
View File
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author lsy
*/
@Api("ucenterUserLog")
@@ -35,14 +33,14 @@ public class UcenterUserLogController {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse getUcenterUserLogById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ucenterUserLogService.getById(Integer.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse getUcenterUserLogByCondition(UcenterUserLog ucenterUserLog,
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -51,8 +49,8 @@ public class UcenterUserLogController {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
public ServerResponse updateUcenterUserLog(UcenterUserLog ucenterUserLog,
@PutMapping
public ServerResponse updateUcenterUserLog(@Valid UcenterUserLog ucenterUserLog,
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
ucenterUserLog.setId(Integer.valueOf(id));
return ucenterUserLogService.update(ucenterUserLog);
ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserOauthController.java
+5 -7
View File
@@ -14,10 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author lsy
*/
@Api("ucenterUserOauth")
@@ -35,14 +33,14 @@ public class UcenterUserOauthController {
}
@ApiOperation("根据id查询详细信息")
@GetMapping("/{id}")
@GetMapping
public ServerResponse getUcenterUserOauthById(
@PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
@RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
return ucenterUserOauthService.getById(Integer.valueOf(id));
}
@ApiOperation("根据条件分页查询")
@GetMapping
@GetMapping("/byPageCondition")
public ServerResponse getUcenterUserOauthByCondition(UcenterUserOauth ucenterUserOauth,
@RequestParam(defaultValue = "1",required = false) int pageNum,
@RequestParam(defaultValue = "10",required = false)int pageSize,
@@ -51,8 +49,8 @@ public class UcenterUserOauthController {
}
@ApiOperation("修改信息")
@PutMapping("/{id}")
public ServerResponse updateUcenterUserOauth(UcenterUserOauth ucenterUserOauth,
@PutMapping
public ServerResponse updateUcenterUserOauth(@Valid UcenterUserOauth ucenterUserOauth,
@NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){
ucenterUserOauth.setId(Integer.valueOf(id));
return ucenterUserOauthService.update(ucenterUserOauth);
ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java
+37 -1
View File
@@ -7,11 +7,20 @@ public class UcenterOauth implements Serializable {
private String name;
private Long ctime;
private Long uptime;
private Integer version;
private static final long serialVersionUID = 1L;
public UcenterOauth(Integer id, String name) {
public UcenterOauth(Integer id, String name, Long ctime, Long uptime, Integer version) {
this.id = id;
this.name = name;
this.ctime = ctime;
this.uptime = uptime;
this.version = version;
}
public UcenterOauth() {
@@ -34,6 +43,30 @@ public class UcenterOauth implements Serializable {
this.name = name == null ? null : name.trim();
}
public Long getCtime() {
return ctime;
}
public void setCtime(Long ctime) {
this.ctime = ctime;
}
public Long getUptime() {
return uptime;
}
public void setUptime(Long uptime) {
this.uptime = uptime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -42,6 +75,9 @@ public class UcenterOauth implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", name=").append(name);
sb.append(", ctime=").append(ctime);
sb.append(", uptime=").append(uptime);
sb.append(", version=").append(version);
sb.append("]");
return sb.toString();
}
ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java
+37 -13
View File
@@ -16,27 +16,33 @@ public class UcenterUser implements Serializable {
private String avatar;
private Date createTime;
private String createIp;
private Date lastLoginTime;
private String lastLoginIp;
private Long ctime;
private Long uptime;
private Integer version;
private static final long serialVersionUID = 1L;
public UcenterUser(Integer id, String password, String salt, String nickname, Byte sex, String avatar, Date createTime, String createIp, Date lastLoginTime, String lastLoginIp) {
public UcenterUser(Integer id, String password, String salt, String nickname, Byte sex, String avatar, String createIp, Date lastLoginTime, String lastLoginIp, Long ctime, Long uptime, Integer version) {
this.id = id;
this.password = password;
this.salt = salt;
this.nickname = nickname;
this.sex = sex;
this.avatar = avatar;
this.createTime = createTime;
this.createIp = createIp;
this.lastLoginTime = lastLoginTime;
this.lastLoginIp = lastLoginIp;
this.ctime = ctime;
this.uptime = uptime;
this.version = version;
}
public UcenterUser() {
@@ -91,14 +97,6 @@ public class UcenterUser implements Serializable {
this.avatar = avatar == null ? null : avatar.trim();
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateIp() {
return createIp;
}
@@ -123,6 +121,30 @@ public class UcenterUser implements Serializable {
this.lastLoginIp = lastLoginIp == null ? null : lastLoginIp.trim();
}
public Long getCtime() {
return ctime;
}
public void setCtime(Long ctime) {
this.ctime = ctime;
}
public Long getUptime() {
return uptime;
}
public void setUptime(Long uptime) {
this.uptime = uptime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -135,10 +157,12 @@ public class UcenterUser implements Serializable {
sb.append(", nickname=").append(nickname);
sb.append(", sex=").append(sex);
sb.append(", avatar=").append(avatar);
sb.append(", createTime=").append(createTime);
sb.append(", createIp=").append(createIp);
sb.append(", lastLoginTime=").append(lastLoginTime);
sb.append(", lastLoginIp=").append(lastLoginIp);
sb.append(", ctime=").append(ctime);
sb.append(", uptime=").append(uptime);
sb.append(", version=").append(version);
sb.append("]");
return sb.toString();
}
ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java
+37 -1
View File
@@ -16,15 +16,24 @@ public class UcenterUserDetails implements Serializable {
private String answer;
private Long ctime;
private Long uptime;
private Integer version;
private static final long serialVersionUID = 1L;
public UcenterUserDetails(Integer id, String signature, String realName, Date birthday, String question, String answer) {
public UcenterUserDetails(Integer id, String signature, String realName, Date birthday, String question, String answer, Long ctime, Long uptime, Integer version) {
this.id = id;
this.signature = signature;
this.realName = realName;
this.birthday = birthday;
this.question = question;
this.answer = answer;
this.ctime = ctime;
this.uptime = uptime;
this.version = version;
}
public UcenterUserDetails() {
@@ -79,6 +88,30 @@ public class UcenterUserDetails implements Serializable {
this.answer = answer == null ? null : answer.trim();
}
public Long getCtime() {
return ctime;
}
public void setCtime(Long ctime) {
this.ctime = ctime;
}
public Long getUptime() {
return uptime;
}
public void setUptime(Long uptime) {
this.uptime = uptime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -91,6 +124,9 @@ public class UcenterUserDetails implements Serializable {
sb.append(", birthday=").append(birthday);
sb.append(", question=").append(question);
sb.append(", answer=").append(answer);
sb.append(", ctime=").append(ctime);
sb.append(", uptime=").append(uptime);
sb.append(", version=").append(version);
sb.append("]");
return sb.toString();
}
ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java
+32 -9
View File
@@ -1,7 +1,6 @@
package com.micro.fast.ucenter.pojo;
import java.io.Serializable;
import java.util.Date;
public class UcenterUserLog implements Serializable {
private Integer id;
@@ -10,7 +9,11 @@ public class UcenterUserLog implements Serializable {
private String ip;
private Date createTime;
private Long ctime;
private Long uptime;
private Integer version;
private byte[] content;
@@ -18,11 +21,13 @@ public class UcenterUserLog implements Serializable {
private static final long serialVersionUID = 1L;
public UcenterUserLog(Integer id, Integer userId, String ip, Date createTime, byte[] content, byte[] agent) {
public UcenterUserLog(Integer id, Integer userId, String ip, Long ctime, Long uptime, Integer version, byte[] content, byte[] agent) {
this.id = id;
this.userId = userId;
this.ip = ip;
this.createTime = createTime;
this.ctime = ctime;
this.uptime = uptime;
this.version = version;
this.content = content;
this.agent = agent;
}
@@ -55,12 +60,28 @@ public class UcenterUserLog implements Serializable {
this.ip = ip == null ? null : ip.trim();
}
public Date getCreateTime() {
return createTime;
public Long getCtime() {
return ctime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
public void setCtime(Long ctime) {
this.ctime = ctime;
}
public Long getUptime() {
return uptime;
}
public void setUptime(Long uptime) {
this.uptime = uptime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public byte[] getContent() {
@@ -88,7 +109,9 @@ public class UcenterUserLog implements Serializable {
sb.append(", id=").append(id);
sb.append(", userId=").append(userId);
sb.append(", ip=").append(ip);
sb.append(", createTime=").append(createTime);
sb.append(", ctime=").append(ctime);
sb.append(", uptime=").append(uptime);
sb.append(", version=").append(version);
sb.append(", content=").append(content);
sb.append(", agent=").append(agent);
sb.append("]");
ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java
+32 -9
View File
@@ -1,7 +1,6 @@
package com.micro.fast.ucenter.pojo;
import java.io.Serializable;
import java.util.Date;
public class UcenterUserOauth implements Serializable {
private Integer id;
@@ -12,18 +11,24 @@ public class UcenterUserOauth implements Serializable {
private Byte status;
private Date createTime;
private Long ctime;
private Long uptime;
private Integer version;
private byte[] openId;
private static final long serialVersionUID = 1L;
public UcenterUserOauth(Integer id, Integer userId, Integer oauthId, Byte status, Date createTime, byte[] openId) {
public UcenterUserOauth(Integer id, Integer userId, Integer oauthId, Byte status, Long ctime, Long uptime, Integer version, byte[] openId) {
this.id = id;
this.userId = userId;
this.oauthId = oauthId;
this.status = status;
this.createTime = createTime;
this.ctime = ctime;
this.uptime = uptime;
this.version = version;
this.openId = openId;
}
@@ -63,12 +68,28 @@ public class UcenterUserOauth implements Serializable {
this.status = status;
}
public Date getCreateTime() {
return createTime;
public Long getCtime() {
return ctime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
public void setCtime(Long ctime) {
this.ctime = ctime;
}
public Long getUptime() {
return uptime;
}
public void setUptime(Long uptime) {
this.uptime = uptime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public byte[] getOpenId() {
@@ -89,7 +110,9 @@ public class UcenterUserOauth implements Serializable {
sb.append(", userId=").append(userId);
sb.append(", oauthId=").append(oauthId);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", ctime=").append(ctime);
sb.append(", uptime=").append(uptime);
sb.append(", version=").append(version);
sb.append(", openId=").append(openId);
sb.append("]");
return sb.toString();
ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml
+39 -4
View File
@@ -5,10 +5,13 @@
<constructor >
<idArg column="id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="name" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, name
id, name, ctime, uptime, version
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
@@ -21,8 +24,10 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.micro.fast.ucenter.pojo.UcenterOauth" >
insert into ucenter_oauth (id, name)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR})
insert into ucenter_oauth (id, name, ctime,
uptime, version)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT},
#{uptime,jdbcType=BIGINT}, #{version,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.micro.fast.ucenter.pojo.UcenterOauth" >
insert into ucenter_oauth
@@ -33,6 +38,15 @@
<if test="name != null" >
name,
</if>
<if test="ctime != null" >
ctime,
</if>
<if test="uptime != null" >
uptime,
</if>
<if test="version != null" >
version,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
@@ -41,6 +55,15 @@
<if test="name != null" >
#{name,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
#{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
#{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
#{version,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.micro.fast.ucenter.pojo.UcenterOauth" >
@@ -49,12 +72,24 @@
<if test="name != null" >
name = #{name,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
ctime = #{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
uptime = #{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
version = #{version,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.micro.fast.ucenter.pojo.UcenterOauth" >
update ucenter_oauth
set name = #{name,jdbcType=VARCHAR}
set name = #{name,jdbcType=VARCHAR},
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
ms/ucenter/src/main/resources/mappers/UcenterUserDetailsMapper.xml
+39 -4
View File
@@ -9,10 +9,13 @@
<arg column="birthday" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="question" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="answer" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, signature, real_name, birthday, question, answer
id, signature, real_name, birthday, question, answer, ctime, uptime, version
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
@@ -26,10 +29,12 @@
</delete>
<insert id="insert" parameterType="com.micro.fast.ucenter.pojo.UcenterUserDetails" >
insert into ucenter_user_details (id, signature, real_name,
birthday, question, answer
birthday, question, answer,
ctime, uptime, version
)
values (#{id,jdbcType=INTEGER}, #{signature,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR},
#{birthday,jdbcType=TIMESTAMP}, #{question,jdbcType=VARCHAR}, #{answer,jdbcType=VARCHAR}
#{birthday,jdbcType=TIMESTAMP}, #{question,jdbcType=VARCHAR}, #{answer,jdbcType=VARCHAR},
#{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT}, #{version,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUserDetails" >
@@ -53,6 +58,15 @@
<if test="answer != null" >
answer,
</if>
<if test="ctime != null" >
ctime,
</if>
<if test="uptime != null" >
uptime,
</if>
<if test="version != null" >
version,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
@@ -73,6 +87,15 @@
<if test="answer != null" >
#{answer,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
#{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
#{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
#{version,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUserDetails" >
@@ -93,6 +116,15 @@
<if test="answer != null" >
answer = #{answer,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
ctime = #{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
uptime = #{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
version = #{version,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@@ -102,7 +134,10 @@
real_name = #{realName,jdbcType=VARCHAR},
birthday = #{birthday,jdbcType=TIMESTAMP},
question = #{question,jdbcType=VARCHAR},
answer = #{answer,jdbcType=VARCHAR}
answer = #{answer,jdbcType=VARCHAR},
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml
+41 -15
View File
@@ -6,7 +6,9 @@
<idArg column="id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="user_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="ip" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="create_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
</constructor>
</resultMap>
<resultMap id="ResultMapWithBLOBs" type="com.micro.fast.ucenter.pojo.UcenterUserLog" >
@@ -14,13 +16,15 @@
<idArg column="id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="user_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="ip" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="create_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="content" jdbcType="VARBINARY" javaType="_byte[]" />
<arg column="agent" jdbcType="VARBINARY" javaType="_byte[]" />
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, user_id, ip, create_time
id, user_id, ip, ctime, uptime, version
</sql>
<sql id="Blob_Column_List" >
content, agent
@@ -39,11 +43,11 @@
</delete>
<insert id="insert" parameterType="com.micro.fast.ucenter.pojo.UcenterUserLog" >
insert into ucenter_user_log (id, user_id, ip,
create_time, content, agent
)
ctime, uptime, version,
content, agent)
values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{ip,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{content,jdbcType=VARBINARY}, #{agent,jdbcType=VARBINARY}
)
#{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT}, #{version,jdbcType=INTEGER},
#{content,jdbcType=VARBINARY}, #{agent,jdbcType=VARBINARY})
</insert>
<insert id="insertSelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUserLog" >
insert into ucenter_user_log
@@ -57,8 +61,14 @@
<if test="ip != null" >
ip,
</if>
<if test="createTime != null" >
create_time,
<if test="ctime != null" >
ctime,
</if>
<if test="uptime != null" >
uptime,
</if>
<if test="version != null" >
version,
</if>
<if test="content != null" >
content,
@@ -77,8 +87,14 @@
<if test="ip != null" >
#{ip,jdbcType=VARCHAR},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=TIMESTAMP},
<if test="ctime != null" >
#{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
#{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
#{version,jdbcType=INTEGER},
</if>
<if test="content != null" >
#{content,jdbcType=VARBINARY},
@@ -97,8 +113,14 @@
<if test="ip != null" >
ip = #{ip,jdbcType=VARCHAR},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=TIMESTAMP},
<if test="ctime != null" >
ctime = #{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
uptime = #{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
version = #{version,jdbcType=INTEGER},
</if>
<if test="content != null" >
content = #{content,jdbcType=VARBINARY},
@@ -113,7 +135,9 @@
update ucenter_user_log
set user_id = #{userId,jdbcType=INTEGER},
ip = #{ip,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER},
content = #{content,jdbcType=VARBINARY},
agent = #{agent,jdbcType=VARBINARY}
where id = #{id,jdbcType=INTEGER}
@@ -122,7 +146,9 @@
update ucenter_user_log
set user_id = #{userId,jdbcType=INTEGER},
ip = #{ip,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml
+42 -18
View File
@@ -9,15 +9,17 @@
<arg column="nickname" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="sex" jdbcType="TINYINT" javaType="java.lang.Byte" />
<arg column="avatar" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="create_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="create_ip" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="last_login_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="last_login_ip" jdbcType="VARCHAR" javaType="java.lang.String" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, password, salt, nickname, sex, avatar, create_time, create_ip, last_login_time,
last_login_ip
id, password, salt, nickname, sex, avatar, create_ip, last_login_time, last_login_ip,
ctime, uptime, version
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
@@ -32,12 +34,14 @@
<insert id="insert" parameterType="com.micro.fast.ucenter.pojo.UcenterUser" >
insert into ucenter_user (id, password, salt,
nickname, sex, avatar,
create_time, create_ip, last_login_time,
last_login_ip)
create_ip, last_login_time, last_login_ip,
ctime, uptime, version
)
values (#{id,jdbcType=INTEGER}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR},
#{nickname,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, #{avatar,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{createIp,jdbcType=VARCHAR}, #{lastLoginTime,jdbcType=TIMESTAMP},
#{lastLoginIp,jdbcType=VARCHAR})
#{createIp,jdbcType=VARCHAR}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR},
#{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT}, #{version,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUser" >
insert into ucenter_user
@@ -60,9 +64,6 @@
<if test="avatar != null" >
avatar,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="createIp != null" >
create_ip,
</if>
@@ -72,6 +73,15 @@
<if test="lastLoginIp != null" >
last_login_ip,
</if>
<if test="ctime != null" >
ctime,
</if>
<if test="uptime != null" >
uptime,
</if>
<if test="version != null" >
version,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
@@ -92,9 +102,6 @@
<if test="avatar != null" >
#{avatar,jdbcType=VARCHAR},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createIp != null" >
#{createIp,jdbcType=VARCHAR},
</if>
@@ -104,6 +111,15 @@
<if test="lastLoginIp != null" >
#{lastLoginIp,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
#{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
#{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
#{version,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUser" >
@@ -124,9 +140,6 @@
<if test="avatar != null" >
avatar = #{avatar,jdbcType=VARCHAR},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createIp != null" >
create_ip = #{createIp,jdbcType=VARCHAR},
</if>
@@ -136,6 +149,15 @@
<if test="lastLoginIp != null" >
last_login_ip = #{lastLoginIp,jdbcType=VARCHAR},
</if>
<if test="ctime != null" >
ctime = #{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
uptime = #{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
version = #{version,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@@ -146,10 +168,12 @@
nickname = #{nickname,jdbcType=VARCHAR},
sex = #{sex,jdbcType=TINYINT},
avatar = #{avatar,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
create_ip = #{createIp,jdbcType=VARCHAR},
last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
last_login_ip = #{lastLoginIp,jdbcType=VARCHAR}
last_login_ip = #{lastLoginIp,jdbcType=VARCHAR},
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
ms/ucenter/src/main/resources/mappers/UcenterUserOauthMapper.xml
+41 -15
View File
@@ -7,7 +7,9 @@
<arg column="user_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="oauth_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="status" jdbcType="TINYINT" javaType="java.lang.Byte" />
<arg column="create_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
</constructor>
</resultMap>
<resultMap id="ResultMapWithBLOBs" type="com.micro.fast.ucenter.pojo.UcenterUserOauth" >
@@ -16,12 +18,14 @@
<arg column="user_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="oauth_id" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="status" jdbcType="TINYINT" javaType="java.lang.Byte" />
<arg column="create_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
<arg column="ctime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="uptime" jdbcType="BIGINT" javaType="java.lang.Long" />
<arg column="version" jdbcType="INTEGER" javaType="java.lang.Integer" />
<arg column="open_id" jdbcType="VARBINARY" javaType="_byte[]" />
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, user_id, oauth_id, status, create_time
id, user_id, oauth_id, status, ctime, uptime, version
</sql>
<sql id="Blob_Column_List" >
open_id
@@ -40,11 +44,11 @@
</delete>
<insert id="insert" parameterType="com.micro.fast.ucenter.pojo.UcenterUserOauth" >
insert into ucenter_user_oauth (id, user_id, oauth_id,
status, create_time, open_id
)
status, ctime, uptime,
version, open_id)
values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{oauthId,jdbcType=INTEGER},
#{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{openId,jdbcType=VARBINARY}
)
#{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT},
#{version,jdbcType=INTEGER}, #{openId,jdbcType=VARBINARY})
</insert>
<insert id="insertSelective" parameterType="com.micro.fast.ucenter.pojo.UcenterUserOauth" >
insert into ucenter_user_oauth
@@ -61,8 +65,14 @@
<if test="status != null" >
status,
</if>
<if test="createTime != null" >
create_time,
<if test="ctime != null" >
ctime,
</if>
<if test="uptime != null" >
uptime,
</if>
<if test="version != null" >
version,
</if>
<if test="openId != null" >
open_id,
@@ -81,8 +91,14 @@
<if test="status != null" >
#{status,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=TIMESTAMP},
<if test="ctime != null" >
#{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
#{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
#{version,jdbcType=INTEGER},
</if>
<if test="openId != null" >
#{openId,jdbcType=VARBINARY},
@@ -101,8 +117,14 @@
<if test="status != null" >
status = #{status,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=TIMESTAMP},
<if test="ctime != null" >
ctime = #{ctime,jdbcType=BIGINT},
</if>
<if test="uptime != null" >
uptime = #{uptime,jdbcType=BIGINT},
</if>
<if test="version != null" >
version = #{version,jdbcType=INTEGER},
</if>
<if test="openId != null" >
open_id = #{openId,jdbcType=VARBINARY},
@@ -115,7 +137,9 @@
set user_id = #{userId,jdbcType=INTEGER},
oauth_id = #{oauthId,jdbcType=INTEGER},
status = #{status,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=TIMESTAMP},
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER},
open_id = #{openId,jdbcType=VARBINARY}
where id = #{id,jdbcType=INTEGER}
</update>
@@ -124,7 +148,9 @@
set user_id = #{userId,jdbcType=INTEGER},
oauth_id = #{oauthId,jdbcType=INTEGER},
status = #{status,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=TIMESTAMP}
ctime = #{ctime,jdbcType=BIGINT},
uptime = #{uptime,jdbcType=BIGINT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
ms/ucenter/src/main/resources/mybatisStart.properties
+1 -1
View File
@@ -12,4 +12,4 @@ mybatisGenerator.servicePackage=com.micro.fast.ucenter.service
mybatisGenerator.controllerPackage=com.micro.fast.ucenter.controller
mybatisGenerator.serviceImplPackage=com.micro.fast.ucenter.service.impl
mybatisGenerator.primaryKeyType=Integer
mybatisGenerator.isOverWrite=false
mybatisGenerator.isOverWrite=true