diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl index 9864c97..2c39016 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl @@ -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)); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterOauthController.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterOauthController.java index b7e188e..add90fc 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterOauthController.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterOauthController.java @@ -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); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserController.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserController.java index 06769ba..c89cdb2 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserController.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserController.java @@ -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); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserDetailsController.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserDetailsController.java index f028c15..750017e 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserDetailsController.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserDetailsController.java @@ -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); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserLogController.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserLogController.java index 68ca39a..8bf878f 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserLogController.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserLogController.java @@ -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); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserOauthController.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserOauthController.java index 6c5b7f1..a4a2422 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserOauthController.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/UcenterUserOauthController.java @@ -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); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java index 3f97f18..af2c0ed 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java @@ -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(); } diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java index 66767af..c0d697c 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java @@ -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(); } diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java index c3eee22..cbf4814 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java @@ -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(); } diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java index 8aca5eb..1d6ba14 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java @@ -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("]"); diff --git a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java index 66f04e2..5327f04 100644 --- a/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java +++ b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java @@ -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(); diff --git a/ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml index 2176069..3b05b2c 100644 --- a/ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml +++ b/ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml @@ -5,10 +5,13 @@ + + + - id, name + id, name, ctime, uptime, version select @@ -26,10 +29,12 @@ 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} ) @@ -53,6 +58,15 @@ answer, + + ctime, + + + uptime, + + + version, + @@ -73,6 +87,15 @@ #{answer,jdbcType=VARCHAR}, + + #{ctime,jdbcType=BIGINT}, + + + #{uptime,jdbcType=BIGINT}, + + + #{version,jdbcType=INTEGER}, + @@ -93,6 +116,15 @@ answer = #{answer,jdbcType=VARCHAR}, + + ctime = #{ctime,jdbcType=BIGINT}, + + + uptime = #{uptime,jdbcType=BIGINT}, + + + version = #{version,jdbcType=INTEGER}, + where id = #{id,jdbcType=INTEGER} @@ -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} \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml index fa6ee73..fa9f1fd 100644 --- a/ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml +++ b/ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml @@ -6,7 +6,9 @@ - + + + @@ -14,13 +16,15 @@ - + + + - id, user_id, ip, create_time + id, user_id, ip, ctime, uptime, version content, agent @@ -39,11 +43,11 @@ 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 into ucenter_user_log @@ -57,8 +61,14 @@ ip, - - create_time, + + ctime, + + + uptime, + + + version, content, @@ -77,8 +87,14 @@ #{ip,jdbcType=VARCHAR}, - - #{createTime,jdbcType=TIMESTAMP}, + + #{ctime,jdbcType=BIGINT}, + + + #{uptime,jdbcType=BIGINT}, + + + #{version,jdbcType=INTEGER}, #{content,jdbcType=VARBINARY}, @@ -97,8 +113,14 @@ 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}, @@ -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} \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml index 982fd81..e012628 100644 --- a/ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml +++ b/ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml @@ -9,15 +9,17 @@ - + + + - 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