| @@ -1,9 +1,6 @@ | |||||
| package com.iformall.common; | package com.iformall.common; | ||||
| import tk.mybatis.mapper.common.BaseMapper; | |||||
| import tk.mybatis.mapper.common.IdsMapper; | |||||
| import tk.mybatis.mapper.common.Marker; | |||||
| import tk.mybatis.mapper.common.special.InsertListMapper; | |||||
| import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @@ -12,5 +9,5 @@ import java.io.Serializable; | |||||
| * @date 2017-12-27 | * @date 2017-12-27 | ||||
| */ | */ | ||||
| public interface CommonMapper<T, ID extends Serializable> extends BaseMapper<T>, IdsMapper<T>, InsertListMapper<T>, Marker { | |||||
| public interface CommonMapper<T, ID extends Serializable> extends BaseMapper<T> { | |||||
| } | } | ||||
| @@ -1,26 +1,22 @@ | |||||
| package com.iformall.domain.dto; | package com.iformall.domain.dto; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | |||||
| import java.io.Serializable; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Transient; | |||||
| /** | /** | ||||
| * 用户查询dto | * 用户查询dto | ||||
| * @author jinguo | * @author jinguo | ||||
| * | * | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| public class WxCUserBasicInfoDto implements Serializable{ | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxCUserBasicInfoDto extends BaseEntity { | |||||
| /** | |||||
| * | |||||
| */ | |||||
| private static final long serialVersionUID = -1116465873573690766L; | private static final long serialVersionUID = -1116465873573690766L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") | @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") | ||||
| @@ -35,22 +31,22 @@ public class WxCUserBasicInfoDto implements Serializable{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") | @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") | ||||
| private String name; | private String name; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Date birthStartTime; | private Date birthStartTime; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Date birthEndTime; | private Date birthEndTime; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer levelStartScore; | private Integer levelStartScore; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer levelEndScore; | private Integer levelEndScore; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sex; | private Integer sex; | ||||
| } | } | ||||
| @@ -1,8 +1,8 @@ | |||||
| package com.iformall.domain.dto; | package com.iformall.domain.dto; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import java.io.Serializable; | |||||
| import lombok.EqualsAndHashCode; | |||||
| /** | /** | ||||
| * 审核提交 | * 审核提交 | ||||
| @@ -10,7 +10,8 @@ import java.io.Serializable; | |||||
| * | * | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| public class WxWeappCodeAuditDto implements Serializable { | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxWeappCodeAuditDto extends BaseEntity { | |||||
| private static final long serialVersionUID = -1116465873573690766L; | private static final long serialVersionUID = -1116465873573690766L; | ||||
| @@ -1,13 +1,14 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.lang.reflect.Field; | import java.lang.reflect.Field; | ||||
| import java.util.List; | |||||
| /** | /** | ||||
| * @author luozukai | * @author luozukai | ||||
| @@ -18,15 +19,28 @@ import java.lang.reflect.Field; | |||||
| public class BaseEntity implements Serializable { | public class BaseEntity implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private List<Long> ids; | |||||
| @TableField(exist = false) | |||||
| private String sortColumn; | private String sortColumn; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private String sortOrder; | private String sortOrder; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private String sortColumns; | private String sortColumns; | ||||
| @TableField(exist = false) | |||||
| protected String floorForRule; | |||||
| @TableField(exist = false) | |||||
| protected String businessForRule; | |||||
| @TableField(exist = false) | |||||
| protected String[] tempShop; | |||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| if(StringUtils.isBlank(sortColumn)){ | if(StringUtils.isBlank(sortColumn)){ | ||||
| @@ -1,41 +1,42 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | |||||
| @Table(name = "mall_permission") | |||||
| @TableName(value = "mall_permission") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class MallPermission extends BaseEntity { | public class MallPermission extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") | ||||
| private String name; | private String name; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") | @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") | ||||
| private String nameLike; | private String nameLike; | ||||
| @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") | @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") | ||||
| private Long parentId; | private Long parentId; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") | @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") | ||||
| private String parentName; | private String parentName; | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") | @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") | ||||
| private String available; | private String available; | ||||
| @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") | @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") | ||||
| private String permission; | private String permission; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private List<String> permissions; | private List<String> permissions; | ||||
| @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") | @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") | ||||
| private Integer resourceType; | private Integer resourceType; | ||||
| @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") | @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") | ||||
| @@ -51,20 +52,20 @@ public class MallPermission extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") | @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") | ||||
| private Integer sort; | private Integer sort; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortFrom; | private Integer sortFrom; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortTo; | private Integer sortTo; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortGte; | private Integer sortGte; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortGt; | private Integer sortGt; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortLte; | private Integer sortLte; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer sortLt; | private Integer sortLt; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") | @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") | ||||
| private List<?> children; | private List<?> children; | ||||
| @@ -1,24 +1,19 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | |||||
| @Table(name = "mall_role") | |||||
| @TableName(value = "mall_role") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class MallRole extends BaseEntity { | public class MallRole extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -28,8 +23,8 @@ public class MallRole extends BaseEntity { | |||||
| private String available; | private String available; | ||||
| @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") | @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") | ||||
| private String description; | private String description; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") | @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") | ||||
| private String menus; | private String menus; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.iformall.enums.EnumUserAdmin; | import com.iformall.enums.EnumUserAdmin; | ||||
| import com.iformall.enums.EnumUserWechat; | import com.iformall.enums.EnumUserWechat; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| @@ -7,27 +9,17 @@ import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.ArrayList; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "mall_user_info") | |||||
| @TableName(value = "mall_user_info") | |||||
| @Data | @Data | ||||
| @ToString(callSuper = true) | @ToString(callSuper = true) | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class MallUserInfo extends BaseEntity { | public class MallUserInfo extends BaseEntity { | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -57,29 +49,29 @@ public class MallUserInfo extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="admin用户微信登录用,可绑定多个账户",name="webOpenId") | @io.swagger.annotations.ApiModelProperty(value="admin用户微信登录用,可绑定多个账户",name="webOpenId") | ||||
| private String webOpenId; | private String webOpenId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") | |||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") | |||||
| private Integer withWechat; | private Integer withWechat; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Integer withWechatForQuery; | private Integer withWechatForQuery; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private Long roleId; | private Long roleId; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private String roleName; | private String roleName; | ||||
| //该用户所有的角色 | //该用户所有的角色 | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private List<MallRole> role; | private List<MallRole> role; | ||||
| //该用户包含的所有权限 | //该用户包含的所有权限 | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private List<MallPermission> permission; | private List<MallPermission> permission; | ||||
| //拥有的菜单权限 | //拥有的菜单权限 | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private String menus; | private String menus; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| private String captcha; | private String captcha; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") | @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") | ||||
| @@ -1,24 +1,17 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| @Table(name = "wx_appinfo") | |||||
| @TableName(value = "wx_appinfo") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxAppinfo extends BaseEntity { | public class WxAppinfo extends BaseEntity { | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -1,23 +1,21 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_authorizer_info") | |||||
| @TableName(value = "wx_authorizer_info") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxAuthorizerInfo extends BaseEntity { | public class WxAuthorizerInfo extends BaseEntity { | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| @@ -1,31 +1,26 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.UUID; | import java.util.UUID; | ||||
| @Table(name = "wx_c_user") | |||||
| @TableName(value = "wx_c_user") | |||||
| @JsonIgnoreProperties(ignoreUnknown = true) | @JsonIgnoreProperties(ignoreUnknown = true) | ||||
| @Data | @Data | ||||
| @ToString(callSuper = true) | @ToString(callSuper = true) | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxCUser extends BaseEntity { | public class WxCUser extends BaseEntity { | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -114,28 +109,28 @@ public class WxCUser extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") | @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") | ||||
| private Integer credit; | private Integer credit; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") | @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") | ||||
| private String channelName; | private String channelName; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") | @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") | ||||
| protected String sceneDescription; | protected String sceneDescription; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| List<String> sceneList; | List<String> sceneList; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| protected Date startDate; | protected Date startDate; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| protected Date endDate; | protected Date endDate; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") | @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") | ||||
| private Integer operatorType; | private Integer operatorType; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | ||||
| private Long operatorId; | private Long operatorId; | ||||
| @@ -1,25 +1,18 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | |||||
| import javax.persistence.Id; | |||||
| @Table(name = "wx_component_verify_ticket") | |||||
| @TableName(value = "wx_component_verify_ticket") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxComponentVerifyTicket extends BaseEntity { | public class WxComponentVerifyTicket extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") | @io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid") | ||||
| private String componentAppid; | private String componentAppid; | ||||
| @@ -1,24 +1,16 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | |||||
| import javax.persistence.Id; | |||||
| @Table(name = "wx_pay_account") | |||||
| @TableName(value = "wx_pay_account") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxPayAccount extends BaseEntity { | public class WxPayAccount extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -1,23 +1,21 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_pay_order") | |||||
| @TableName(value = "wx_pay_order") | |||||
| @Data | @Data | ||||
| public class WxPayOrder implements Serializable { | public class WxPayOrder implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| @TableField(exist = false) | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| @@ -1,26 +1,18 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | |||||
| import javax.persistence.Id; | |||||
| import java.io.Serializable; | |||||
| @Table(name = "wx_template_msg") | |||||
| @TableName(value = "wx_template_msg") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxTemplateMsg extends BaseEntity { | public class WxTemplateMsg extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -1,27 +1,19 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| @Table(name = "wx_weapp_audit_status") | |||||
| @TableName(value = "wx_weapp_audit_status") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappAuditStatus extends BaseEntity { | public class WxWeappAuditStatus extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| @@ -1,26 +1,19 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | |||||
| import java.io.Serializable; | |||||
| @Table(name = "wx_weapp_basic_set") | |||||
| @TableName(value = "wx_weapp_basic_set") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappBasicSet extends BaseEntity { | public class WxWeappBasicSet extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| @@ -1,27 +1,20 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_weapp_code_status") | |||||
| @TableName(value = "wx_weapp_code_status") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappCodeStatus extends BaseEntity { | public class WxWeappCodeStatus extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| @@ -1,25 +1,19 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | |||||
| @Table(name = "wx_weapp_ext_set") | |||||
| @TableName(value = "wx_weapp_ext_set") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappExtSet extends BaseEntity { | public class WxWeappExtSet extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| private String appId; | private String appId; | ||||
| @@ -1,26 +1,19 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import javax.persistence.Id; | |||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| @Table(name = "wx_weapp_release_status") | |||||
| @TableName(value = "wx_weapp_release_status") | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappReleaseStatus extends BaseEntity { | public class WxWeappReleaseStatus extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Id | |||||
| protected Long id; | protected Long id; | ||||
| @Transient | |||||
| protected List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| @@ -9,9 +9,10 @@ import java.util.List; | |||||
| public interface MallPermissionMapper extends CommonMapper<MallPermission, String> { | public interface MallPermissionMapper extends CommonMapper<MallPermission, String> { | ||||
| List<MallPermission> findList(MallPermission mallPermission); | List<MallPermission> findList(MallPermission mallPermission); | ||||
| List<MallPermission> findPermissionByRoleId(Long roleId); | |||||
| List<MallPermission> findPermissionByRoleIds(@Param("roleIds") List<Long> roleIds); | |||||
| List<MallPermission> queryListParentId(Long parentId); | |||||
| List<MallPermission> queryNotButtonList(); | |||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.mapper; | package com.iformall.mapper; | ||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.MallPermission; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.vo.MallUserInfoVo; | import com.iformall.domain.vo.MallUserInfoVo; | ||||
| import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
| @@ -10,7 +11,7 @@ import java.util.Map; | |||||
| public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> { | public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> { | ||||
| MallUserInfo selectById(@Param("id") Long id); | |||||
| MallUserInfo getById(@Param("id") Long id); | |||||
| List<MallUserInfo> findList(MallUserInfo mallUserInfo); | List<MallUserInfo> findList(MallUserInfo mallUserInfo); | ||||
| @@ -24,6 +25,8 @@ public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> { | |||||
| void removeWebOpenId(MallUserInfo mallUserInfo); | void removeWebOpenId(MallUserInfo mallUserInfo); | ||||
| void removeAllOpenId(MallUserInfo mallUserInfo); | |||||
| MallUserInfo selectByPhone(@Param("phone") String phone, @Param("tenantId") String tenantId); | MallUserInfo selectByPhone(@Param("phone") String phone, @Param("tenantId") String tenantId); | ||||
| Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); | Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); | ||||
| @@ -35,4 +38,19 @@ public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> { | |||||
| List<MallUserInfoVo> selectUsersByWebOpenId(@Param("webOpenId") String webOpenId); | List<MallUserInfoVo> selectUsersByWebOpenId(@Param("webOpenId") String webOpenId); | ||||
| /** | |||||
| * 查询用户的所有菜单 | |||||
| * @param userId 用户ID | |||||
| */ | |||||
| List<MallPermission> queryAllMenu(Long userId); | |||||
| /** | |||||
| * 查询用户的所有权限 | |||||
| * @param userId 用户ID | |||||
| */ | |||||
| List<String> queryAllPerms(Long userId); | |||||
| /** | |||||
| * 查询用户的所有菜单ID | |||||
| */ | |||||
| List<Long> queryAllMenuId(Long userId); | |||||
| } | } | ||||
| @@ -11,8 +11,8 @@ public interface MallPermissionService { | |||||
| * 根据实体查询分页列表 | * 根据实体查询分页列表 | ||||
| * | * | ||||
| * @param record | * @param record | ||||
| * @param offset | |||||
| * @param limit | |||||
| * @param pageIndex | |||||
| * @param pageSize | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| PageInfo<MallPermission> listAsPage(MallPermission record, Integer pageIndex, Integer pageSize); | PageInfo<MallPermission> listAsPage(MallPermission record, Integer pageIndex, Integer pageSize); | ||||
| @@ -38,25 +38,4 @@ public interface MallPermissionService { | |||||
| * @param id | * @param id | ||||
| */ | */ | ||||
| void deleteById(Long id); | void deleteById(Long id); | ||||
| /** | |||||
| * 根据roleId查询菜单和按钮权限 | |||||
| * @param roleId | |||||
| * @return | |||||
| */ | |||||
| List<MallPermission> findPermissionByRoleId(Long roleId); | |||||
| /** | |||||
| * 根据ruleId权限组查找相应权限 | |||||
| * @param roleIds | |||||
| * @return | |||||
| */ | |||||
| List<MallPermission> findPermissionByRoleIds(List<Long> roleIds); | |||||
| } | } | ||||
| @@ -28,7 +28,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { | |||||
| @Override | @Override | ||||
| public MallPermission getById(Long id) { | public MallPermission getById(Long id) { | ||||
| return mallPermissionMapper.selectByPrimaryKey(id); | |||||
| return mallPermissionMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -37,31 +37,15 @@ public class MallPermissionServiceImpl implements MallPermissionService { | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallPermissionMapper.insertSelective(record); | |||||
| mallPermissionMapper.insert(record); | |||||
| } else { | } else { | ||||
| mallPermissionMapper.updateByPrimaryKeySelective(record); | |||||
| mallPermissionMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| mallPermissionMapper.deleteByPrimaryKey(id); | |||||
| mallPermissionMapper.deleteById(id); | |||||
| } | } | ||||
| @Override | |||||
| public List<MallPermission> findPermissionByRoleId(Long roleId) { | |||||
| return mallPermissionMapper.findPermissionByRoleId(roleId); | |||||
| } | |||||
| @Override | |||||
| public List<MallPermission> findPermissionByRoleIds(List<Long> roleIds) { | |||||
| return mallPermissionMapper.findPermissionByRoleIds(roleIds); | |||||
| } | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| @@ -31,12 +32,12 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| @Override | @Override | ||||
| public int cntUserList(MallUserInfo record) { | public int cntUserList(MallUserInfo record) { | ||||
| return mallUserInfoMapper.selectCount(record); | |||||
| return mallUserInfoMapper.selectCount(new QueryWrapper<>(record)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public MallUserInfo getById(Long id) { | public MallUserInfo getById(Long id) { | ||||
| return mallUserInfoMapper.selectById(id); | |||||
| return mallUserInfoMapper.getById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -49,7 +50,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| MallUserInfo updateUser = new MallUserInfo(); | MallUserInfo updateUser = new MallUserInfo(); | ||||
| updateUser.setId(user.getId()); | updateUser.setId(user.getId()); | ||||
| updateUser.setBopenId(user.getBopenId()); | updateUser.setBopenId(user.getBopenId()); | ||||
| mallUserInfoMapper.updateByPrimaryKeySelective(user); | |||||
| mallUserInfoMapper.updateById(user); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -78,15 +79,15 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| mallUserInfoMapper.insertSelective(record); | |||||
| mallUserInfoMapper.insert(record); | |||||
| } else { | } else { | ||||
| mallUserInfoMapper.updateByPrimaryKeySelective(record); | |||||
| mallUserInfoMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| mallUserInfoMapper.deleteByPrimaryKey(id); | |||||
| mallUserInfoMapper.deleteById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -98,7 +99,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| public long cntByUserName(String username) { | public long cntByUserName(String username) { | ||||
| MallUserInfo userInfo = new MallUserInfo(); | MallUserInfo userInfo = new MallUserInfo(); | ||||
| userInfo.setUsername(username); | userInfo.setUsername(username); | ||||
| return PageHelper.count(() -> mallUserInfoMapper.select(userInfo)); | |||||
| return PageHelper.count(() -> mallUserInfoMapper.selectList(new QueryWrapper<>(userInfo))); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxAppinfo; | import com.iformall.domain.po.WxAppinfo; | ||||
| @@ -26,7 +27,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { | |||||
| WxAppinfo appinfoQ = new WxAppinfo(); | WxAppinfo appinfoQ = new WxAppinfo(); | ||||
| appinfoQ.setTenantId(tenantId); | appinfoQ.setTenantId(tenantId); | ||||
| appinfoQ.setType(EnumAppType.C.getCode()); | appinfoQ.setType(EnumAppType.C.getCode()); | ||||
| List<WxAppinfo> appList = wxAppinfoMapper.select(appinfoQ); | |||||
| List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper<>(appinfoQ)); | |||||
| if (appList.size() > 0) { | if (appList.size() > 0) { | ||||
| appInfo = appList.get(0); | appInfo = appList.get(0); | ||||
| } | } | ||||
| @@ -50,7 +51,7 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { | |||||
| @Override | @Override | ||||
| public WxAppinfo getById(Long id) { | public WxAppinfo getById(Long id) { | ||||
| return wxAppinfoMapper.selectByPrimaryKey(id); | |||||
| return wxAppinfoMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -59,14 +60,14 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxAppinfoMapper.insertSelective(record); | |||||
| wxAppinfoMapper.insert(record); | |||||
| } else { | } else { | ||||
| wxAppinfoMapper.updateByPrimaryKeySelective(record); | |||||
| wxAppinfoMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxAppinfoMapper.deleteByPrimaryKey(id); | |||||
| wxAppinfoMapper.deleteById(id); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxAppinfo; | import com.iformall.domain.po.WxAppinfo; | ||||
| @@ -53,7 +54,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| @Override | @Override | ||||
| public WxAuthorizerInfo getById(Long id) { | public WxAuthorizerInfo getById(Long id) { | ||||
| return authorizerInfoMapper.selectByPrimaryKey(id); | |||||
| return authorizerInfoMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -61,7 +62,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| WxAuthorizerInfo authQ = new WxAuthorizerInfo(); | WxAuthorizerInfo authQ = new WxAuthorizerInfo(); | ||||
| authQ.setAuthorizerAppid(appId); | authQ.setAuthorizerAppid(appId); | ||||
| try { | try { | ||||
| WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(authQ); | |||||
| WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(authQ)); | |||||
| return authorizerInfo; | return authorizerInfo; | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -80,7 +81,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| try { | try { | ||||
| WxAuthorizerInfo aiQ = new WxAuthorizerInfo(); | WxAuthorizerInfo aiQ = new WxAuthorizerInfo(); | ||||
| aiQ.setAuthorizerAppid(record.getAuthorizerAppid()); | aiQ.setAuthorizerAppid(record.getAuthorizerAppid()); | ||||
| authorizerInfo = authorizerInfoMapper.selectOne(aiQ); | |||||
| authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(aiQ)); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| } | } | ||||
| @@ -98,7 +99,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| record.setCreateTime(curDate); | record.setCreateTime(curDate); | ||||
| record.setUpdateTime(curDate); | record.setUpdateTime(curDate); | ||||
| // 授权表 添加 | // 授权表 添加 | ||||
| authorizerInfoMapper.insertSelective(record); | |||||
| authorizerInfoMapper.insert(record); | |||||
| if(appinfo != null && appinfo.getType() != null) { | if(appinfo != null && appinfo.getType() != null) { | ||||
| if (appinfo.getType().equals(EnumAppType.C.getCode()) || | if (appinfo.getType().equals(EnumAppType.C.getCode()) || | ||||
| appinfo.getType().equals(EnumAppType.B.getCode())) { | appinfo.getType().equals(EnumAppType.B.getCode())) { | ||||
| @@ -114,20 +115,20 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| } | } | ||||
| weappExtSet.setCreateDate(curDate); | weappExtSet.setCreateDate(curDate); | ||||
| weappExtSet.setUpdateDate(curDate); | weappExtSet.setUpdateDate(curDate); | ||||
| weappExtSetMapper.insertSelective(weappExtSet); | |||||
| weappExtSetMapper.insert(weappExtSet); | |||||
| } | } | ||||
| } | } | ||||
| } else { | } else { | ||||
| record.setId(authorizerInfo.getId()); | record.setId(authorizerInfo.getId()); | ||||
| record.setUpdateTime(curDate); | record.setUpdateTime(curDate); | ||||
| logger.info(record.toString()); | logger.info(record.toString()); | ||||
| authorizerInfoMapper.updateByPrimaryKeySelective(record); | |||||
| authorizerInfoMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| authorizerInfoMapper.deleteByPrimaryKey(id); | |||||
| authorizerInfoMapper.deleteById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -143,7 +144,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| info.setBaseStatus(record.getBaseStatus()); | info.setBaseStatus(record.getBaseStatus()); | ||||
| info.setBaseTime(curDate); | info.setBaseTime(curDate); | ||||
| info.setUpdateTime(curDate); | info.setUpdateTime(curDate); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(info); | |||||
| return authorizerInfoMapper.updateById(info); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -154,7 +155,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| info.setDomainStatus(record.getDomainStatus()); | info.setDomainStatus(record.getDomainStatus()); | ||||
| info.setDomainTime(curDate); | info.setDomainTime(curDate); | ||||
| info.setUpdateTime(curDate); | info.setUpdateTime(curDate); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(info); | |||||
| return authorizerInfoMapper.updateById(info); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -165,7 +166,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| info.setWebdomainStatus(record.getWebdomainStatus()); | info.setWebdomainStatus(record.getWebdomainStatus()); | ||||
| info.setWebdomainTime(curDate); | info.setWebdomainTime(curDate); | ||||
| info.setUpdateTime(curDate); | info.setUpdateTime(curDate); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(info); | |||||
| return authorizerInfoMapper.updateById(info); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -176,7 +177,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| info.setTemplateStatus(record.getTemplateStatus()); | info.setTemplateStatus(record.getTemplateStatus()); | ||||
| info.setTemplateTime(curDate); | info.setTemplateTime(curDate); | ||||
| info.setUpdateTime(curDate); | info.setUpdateTime(curDate); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(info); | |||||
| return authorizerInfoMapper.updateById(info); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -186,7 +187,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| info.setId(record.getId()); | info.setId(record.getId()); | ||||
| info.setOpenAppid(record.getOpenAppid()); | info.setOpenAppid(record.getOpenAppid()); | ||||
| info.setBindOpenTime(curDate); | info.setBindOpenTime(curDate); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(info); | |||||
| return authorizerInfoMapper.updateById(info); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -199,7 +200,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.findByAppid(record.getAuthorizerAppid()); | WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.findByAppid(record.getAuthorizerAppid()); | ||||
| if(authorizerInfo != null) { | if(authorizerInfo != null) { | ||||
| record.setId(authorizerInfo.getId()); | record.setId(authorizerInfo.getId()); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(record); | |||||
| return authorizerInfoMapper.updateById(record); | |||||
| } else { | } else { | ||||
| /// TODO | /// TODO | ||||
| } | } | ||||
| @@ -221,7 +222,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| } else { | } else { | ||||
| // 不是同一个月,重置authBackNum | // 不是同一个月,重置authBackNum | ||||
| record.setAuditBackNum(1); | record.setAuditBackNum(1); | ||||
| return authorizerInfoMapper.updateByPrimaryKeySelective(record); | |||||
| return authorizerInfoMapper.updateById(record); | |||||
| } | } | ||||
| } else { | } else { | ||||
| /// TODO | /// TODO | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| @@ -32,7 +33,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| @Override | @Override | ||||
| public WxCUser getById(Long id) { | public WxCUser getById(Long id) { | ||||
| return wxCUserMapper.selectByPrimaryKey(id); | |||||
| return wxCUserMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -43,7 +44,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| @Override | @Override | ||||
| public WxCUser getByObject(WxCUser record) { | public WxCUser getByObject(WxCUser record) { | ||||
| try { | try { | ||||
| return wxCUserMapper.selectOne(record); | |||||
| return wxCUserMapper.selectOne(new QueryWrapper<>(record)); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("NOT found: " + e.getMessage()); | logger.error("NOT found: " + e.getMessage()); | ||||
| } | } | ||||
| @@ -62,7 +63,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| // 已有,更新 | // 已有,更新 | ||||
| user.setId(oldUser.getId()); | user.setId(oldUser.getId()); | ||||
| // TODO 是否其他信息需要更新 | // TODO 是否其他信息需要更新 | ||||
| ret = wxCUserMapper.updateByPrimaryKeySelective(user); | |||||
| ret = wxCUserMapper.updateById(user); | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| } | } | ||||
| @@ -71,10 +72,10 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| user.setLoginCount(1); | user.setLoginCount(1); | ||||
| user.setCreateDate(curr); | user.setCreateDate(curr); | ||||
| user.setUpdateDate(curr); | user.setUpdateDate(curr); | ||||
| ret = wxCUserMapper.insertSelective(user); | |||||
| ret = wxCUserMapper.insert(user); | |||||
| } else { | } else { | ||||
| user.setUpdateDate(curr); | user.setUpdateDate(curr); | ||||
| ret = wxCUserMapper.updateByPrimaryKeySelective(user); | |||||
| ret = wxCUserMapper.updateById(user); | |||||
| } | } | ||||
| return ret; | return ret; | ||||
| @@ -138,7 +139,7 @@ public class WxCUserServiceImpl implements WxCUserService { | |||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxCUserMapper.deleteByPrimaryKey(id); | |||||
| wxCUserMapper.deleteById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxComponentVerifyTicket; | import com.iformall.domain.po.WxComponentVerifyTicket; | ||||
| @@ -26,7 +27,7 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick | |||||
| @Override | @Override | ||||
| public WxComponentVerifyTicket getById(Long id) { | public WxComponentVerifyTicket getById(Long id) { | ||||
| return wxComponentVerifyTicketMapper.selectByPrimaryKey(id); | |||||
| return wxComponentVerifyTicketMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -35,23 +36,23 @@ public class WxComponentVerifyTicketServiceImpl implements WxComponentVerifyTick | |||||
| try { | try { | ||||
| WxComponentVerifyTicket ctQ = new WxComponentVerifyTicket(); | WxComponentVerifyTicket ctQ = new WxComponentVerifyTicket(); | ||||
| ctQ.setComponentAppid(record.getComponentAppid()); | ctQ.setComponentAppid(record.getComponentAppid()); | ||||
| wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(ctQ); | |||||
| wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(new QueryWrapper<>(ctQ)); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| } | } | ||||
| if (wxComponentVerifyTicket == null) { | if (wxComponentVerifyTicket == null) { | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxComponentVerifyTicketMapper.insertSelective(record); | |||||
| wxComponentVerifyTicketMapper.insert(record); | |||||
| } else { | } else { | ||||
| record.setId(wxComponentVerifyTicket.getId()); | record.setId(wxComponentVerifyTicket.getId()); | ||||
| wxComponentVerifyTicketMapper.updateByPrimaryKeySelective(record); | |||||
| wxComponentVerifyTicketMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxComponentVerifyTicketMapper.deleteByPrimaryKey(id); | |||||
| wxComponentVerifyTicketMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxTemplateMsg; | import com.iformall.domain.po.WxTemplateMsg; | ||||
| @@ -28,12 +29,12 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { | |||||
| @Override | @Override | ||||
| public WxTemplateMsg getById(Long id) { | public WxTemplateMsg getById(Long id) { | ||||
| return wxTemplateMsgMapper.selectByPrimaryKey(id); | |||||
| return wxTemplateMsgMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxTemplateMsg getByObj(WxTemplateMsg record) { | public WxTemplateMsg getByObj(WxTemplateMsg record) { | ||||
| return wxTemplateMsgMapper.selectOne(record); | |||||
| return wxTemplateMsgMapper.selectOne(new QueryWrapper<>(record)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -45,16 +46,16 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| record.setCreateDate(curDate); | record.setCreateDate(curDate); | ||||
| record.setUpdateDate(curDate); | record.setUpdateDate(curDate); | ||||
| wxTemplateMsgMapper.insertSelective(record); | |||||
| wxTemplateMsgMapper.insert(record); | |||||
| } else { | } else { | ||||
| record.setUpdateDate(curDate); | record.setUpdateDate(curDate); | ||||
| wxTemplateMsgMapper.updateByPrimaryKeySelective(record); | |||||
| wxTemplateMsgMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxTemplateMsgMapper.deleteByPrimaryKey(id); | |||||
| wxTemplateMsgMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| @@ -40,31 +41,31 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService | |||||
| @Override | @Override | ||||
| public WxWeappAuditStatus getById(Long id) { | public WxWeappAuditStatus getById(Long id) { | ||||
| return weappAuditStatusMapper.selectByPrimaryKey(id); | |||||
| return weappAuditStatusMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxWeappAuditStatus getByAppId(String appId) { | public WxWeappAuditStatus getByAppId(String appId) { | ||||
| WxWeappAuditStatus statusQ = new WxWeappAuditStatus(); | WxWeappAuditStatus statusQ = new WxWeappAuditStatus(); | ||||
| statusQ.setAppId(appId); | statusQ.setAppId(appId); | ||||
| return weappAuditStatusMapper.selectOne(statusQ); | |||||
| return weappAuditStatusMapper.selectOne(new QueryWrapper<>(statusQ)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void saveStatus(WxWeappAuditStatus record) { | public void saveStatus(WxWeappAuditStatus record) { | ||||
| logger.info("AUDIT: " + record.toString()); | logger.info("AUDIT: " + record.toString()); | ||||
| weappAuditStatusMapper.insertSelective(record); | |||||
| weappAuditStatusMapper.insert(record); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void updateStatus(WxWeappAuditStatus record) { | public void updateStatus(WxWeappAuditStatus record) { | ||||
| logger.info("AUDIT: " + record.toString()); | logger.info("AUDIT: " + record.toString()); | ||||
| weappAuditStatusMapper.updateByPrimaryKeySelective(record); | |||||
| weappAuditStatusMapper.updateById(record); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| weappAuditStatusMapper.deleteByPrimaryKey(id); | |||||
| weappAuditStatusMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,6 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import java.util.*; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxWeappBasicSet; | import com.iformall.domain.po.WxWeappBasicSet; | ||||
| @@ -24,12 +24,12 @@ public class WxWeappBasicSetServiceImpl implements WxWeappBasicSetService { | |||||
| @Override | @Override | ||||
| public WxWeappBasicSet getById(Long id) { | public WxWeappBasicSet getById(Long id) { | ||||
| return wxWeappBasicSetMapper.selectByPrimaryKey(id); | |||||
| return wxWeappBasicSetMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxWeappBasicSet getByTypeAndDeploy(WxWeappBasicSet weappBasicSet) { | public WxWeappBasicSet getByTypeAndDeploy(WxWeappBasicSet weappBasicSet) { | ||||
| return wxWeappBasicSetMapper.selectOne(weappBasicSet); | |||||
| return wxWeappBasicSetMapper.selectOne(new QueryWrapper<>(weappBasicSet)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -38,15 +38,15 @@ public class WxWeappBasicSetServiceImpl implements WxWeappBasicSetService { | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| wxWeappBasicSetMapper.insertSelective(record); | |||||
| wxWeappBasicSetMapper.insert(record); | |||||
| } else { | } else { | ||||
| wxWeappBasicSetMapper.updateByPrimaryKeySelective(record); | |||||
| wxWeappBasicSetMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxWeappBasicSetMapper.deleteByPrimaryKey(id); | |||||
| wxWeappBasicSetMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| @@ -42,20 +43,20 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { | |||||
| @Override | @Override | ||||
| public WxWeappCodeStatus getById(Long id) { | public WxWeappCodeStatus getById(Long id) { | ||||
| return weappCodeStatusMapper.selectByPrimaryKey(id); | |||||
| return weappCodeStatusMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxWeappCodeStatus getByAppId(String appId) { | public WxWeappCodeStatus getByAppId(String appId) { | ||||
| WxWeappCodeStatus weappCodeStatusQ = new WxWeappCodeStatus(); | WxWeappCodeStatus weappCodeStatusQ = new WxWeappCodeStatus(); | ||||
| weappCodeStatusQ.setAppId(appId); | weappCodeStatusQ.setAppId(appId); | ||||
| return weappCodeStatusMapper.selectOne(weappCodeStatusQ); | |||||
| return weappCodeStatusMapper.selectOne(new QueryWrapper<>(weappCodeStatusQ)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void saveStatus(WxWeappCodeStatus record) { | public void saveStatus(WxWeappCodeStatus record) { | ||||
| logger.info("CODE-COMMIT: " + record.toString()); | logger.info("CODE-COMMIT: " + record.toString()); | ||||
| weappCodeStatusMapper.insertSelective(record); | |||||
| weappCodeStatusMapper.insert(record); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -66,7 +67,7 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { | |||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| weappCodeStatusMapper.deleteByPrimaryKey(id); | |||||
| weappCodeStatusMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxAppinfo; | import com.iformall.domain.po.WxAppinfo; | ||||
| @@ -36,12 +37,12 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { | |||||
| @Override | @Override | ||||
| public WxWeappExtSet getById(Long id) { | public WxWeappExtSet getById(Long id) { | ||||
| return wxWeappExtSetMapper.selectByPrimaryKey(id); | |||||
| return wxWeappExtSetMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxWeappExtSet getByObj(WxWeappExtSet record) { | public WxWeappExtSet getByObj(WxWeappExtSet record) { | ||||
| return wxWeappExtSetMapper.selectOne(record); | |||||
| return wxWeappExtSetMapper.selectOne(new QueryWrapper<>(record)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -55,7 +56,7 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { | |||||
| record.setType(appinfo.getType()); | record.setType(appinfo.getType()); | ||||
| WxWeappExtSet q = new WxWeappExtSet(); | WxWeappExtSet q = new WxWeappExtSet(); | ||||
| q.setId(appinfo.getId()); | q.setId(appinfo.getId()); | ||||
| int count = wxWeappExtSetMapper.selectCount(q); | |||||
| int count = wxWeappExtSetMapper.selectCount(new QueryWrapper<>(q)); | |||||
| if (count > 0) { | if (count > 0) { | ||||
| isUpdate = true; | isUpdate = true; | ||||
| } | } | ||||
| @@ -66,19 +67,19 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { | |||||
| record.setCreateDate(curDate); | record.setCreateDate(curDate); | ||||
| record.setUpdateDate(curDate); | record.setUpdateDate(curDate); | ||||
| if (!isUpdate) { | if (!isUpdate) { | ||||
| wxWeappExtSetMapper.insertSelective(record); | |||||
| wxWeappExtSetMapper.insert(record); | |||||
| } else { | } else { | ||||
| wxWeappExtSetMapper.updateByPrimaryKeySelective(record); | |||||
| wxWeappExtSetMapper.updateById(record); | |||||
| } | } | ||||
| } else { | } else { | ||||
| record.setUpdateDate(curDate); | record.setUpdateDate(curDate); | ||||
| wxWeappExtSetMapper.updateByPrimaryKeySelective(record); | |||||
| wxWeappExtSetMapper.updateById(record); | |||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| wxWeappExtSetMapper.deleteByPrimaryKey(id); | |||||
| wxWeappExtSetMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxAuthorizerInfo; | import com.iformall.domain.po.WxAuthorizerInfo; | ||||
| @@ -47,21 +48,21 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ | |||||
| @Override | @Override | ||||
| public WxWeappReleaseStatus getById(Long id) { | public WxWeappReleaseStatus getById(Long id) { | ||||
| return weappReleaseStatusMapper.selectByPrimaryKey(id); | |||||
| return weappReleaseStatusMapper.selectById(id); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxWeappReleaseStatus getByAppId(String appId) { | public WxWeappReleaseStatus getByAppId(String appId) { | ||||
| WxWeappReleaseStatus weappCodeStatusQ = new WxWeappReleaseStatus(); | WxWeappReleaseStatus weappCodeStatusQ = new WxWeappReleaseStatus(); | ||||
| weappCodeStatusQ.setAppId(appId); | weappCodeStatusQ.setAppId(appId); | ||||
| return weappReleaseStatusMapper.selectOne(weappCodeStatusQ); | |||||
| return weappReleaseStatusMapper.selectOne(new QueryWrapper<>(weappCodeStatusQ)); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void saveStatus(WxWeappReleaseStatus record) { | public void saveStatus(WxWeappReleaseStatus record) { | ||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| logger.info("RELEASE: " + record.toString()); | logger.info("RELEASE: " + record.toString()); | ||||
| weappReleaseStatusMapper.insertSelective(record); | |||||
| weappReleaseStatusMapper.insert(record); | |||||
| // 更新 小程序 状态 | // 更新 小程序 状态 | ||||
| if(record.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { // 发布成功 | if(record.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { // 发布成功 | ||||
| WxAuthorizerInfo updateInfo = new WxAuthorizerInfo(); | WxAuthorizerInfo updateInfo = new WxAuthorizerInfo(); | ||||
| @@ -93,7 +94,7 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ | |||||
| try { | try { | ||||
| WxAuthorizerInfo appQ = new WxAuthorizerInfo(); | WxAuthorizerInfo appQ = new WxAuthorizerInfo(); | ||||
| appQ.setAuthorizerAppid(record.getAppId()); | appQ.setAuthorizerAppid(record.getAppId()); | ||||
| WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(appQ); | |||||
| WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(new QueryWrapper<>(appQ)); | |||||
| if(authorizerInfo != null) { | if(authorizerInfo != null) { | ||||
| record.setUserVersion(authorizerInfo.getCurrentVersion()); | record.setUserVersion(authorizerInfo.getCurrentVersion()); | ||||
| record.setVersionDesc(authorizerInfo.getCurrentDesc()); | record.setVersionDesc(authorizerInfo.getCurrentDesc()); | ||||
| @@ -108,7 +109,7 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ | |||||
| @Override | @Override | ||||
| public void deleteById(Long id) { | public void deleteById(Long id) { | ||||
| weappReleaseStatusMapper.deleteByPrimaryKey(id); | |||||
| weappReleaseStatusMapper.deleteById(id); | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.service.wechat; | package com.iformall.service.wechat; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.iformall.common.FmHttpClientBuilder; | import com.iformall.common.FmHttpClientBuilder; | ||||
| import com.iformall.domain.po.WxAuthorizerInfo; | import com.iformall.domain.po.WxAuthorizerInfo; | ||||
| import com.iformall.domain.po.WxComponentVerifyTicket; | import com.iformall.domain.po.WxComponentVerifyTicket; | ||||
| @@ -90,7 +91,7 @@ public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { | |||||
| WxComponentVerifyTicket wxComponentVerifyTicket = new WxComponentVerifyTicket(); | WxComponentVerifyTicket wxComponentVerifyTicket = new WxComponentVerifyTicket(); | ||||
| wxComponentVerifyTicket.setComponentAppid(getComponentAppId()); | wxComponentVerifyTicket.setComponentAppid(getComponentAppId()); | ||||
| try { | try { | ||||
| wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(wxComponentVerifyTicket); | |||||
| wxComponentVerifyTicket = wxComponentVerifyTicketMapper.selectOne(new QueryWrapper<>(wxComponentVerifyTicket)); | |||||
| if(wxComponentVerifyTicket != null) { | if(wxComponentVerifyTicket != null) { | ||||
| ticket = wxComponentVerifyTicket.getComponentVerifyTicket(); | ticket = wxComponentVerifyTicket.getComponentVerifyTicket(); | ||||
| } | } | ||||
| @@ -1,99 +1,109 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||||
| <mapper namespace="com.iformall.mapper.MallPermissionMapper"> | <mapper namespace="com.iformall.mapper.MallPermissionMapper"> | ||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.MallPermission"> | |||||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||||
| <result column="name" jdbcType="VARCHAR" property="name" /> | |||||
| <result column="available" jdbcType="VARCHAR" property="available" /> | |||||
| <result column="parent_id" jdbcType="BIGINT" property="parentId" /> | |||||
| <result column="parent_ids" jdbcType="VARCHAR" property="parentIds" /> | |||||
| <result column="permission" jdbcType="VARCHAR" property="permission" /> | |||||
| <result column="resource_type" jdbcType="VARCHAR" property="resourceType" /> | |||||
| <result column="url" jdbcType="VARCHAR" property="url" /> | |||||
| <result column="sort" jdbcType="INTEGER" property="sort" /> | |||||
| </resultMap> | |||||
| <sql id="allColumns"> | |||||
| `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` | |||||
| </sql> | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.MallPermission"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="name" jdbcType="VARCHAR" property="name"/> | |||||
| <result column="parent_id" jdbcType="BIGINT" property="parentId"/> | |||||
| <result column="available" jdbcType="VARCHAR" property="available"/> | |||||
| <result column="permission" jdbcType="VARCHAR" property="permission"/> | |||||
| <result column="resource_type" jdbcType="VARCHAR" property="resourceType"/> | |||||
| <result column="module_color" jdbcType="VARCHAR" property="moduleColor"/> | |||||
| <result column="module_color_num" jdbcType="VARCHAR" property="moduleColorNum"/> | |||||
| <result column="url" jdbcType="VARCHAR" property="url"/> | |||||
| <result column="icon" jdbcType="VARCHAR" property="icon"/> | |||||
| <result column="version_type" jdbcType="VARCHAR" property="versionType"/> | |||||
| <result column="sort" jdbcType="INTEGER" property="sort"/> | |||||
| </resultMap> | |||||
| <sql id="dynamicWhereConditions"> | |||||
| where 1 = 1 | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != name "> | |||||
| and `name` like concat('%', #{name},'%') | |||||
| </if> | |||||
| <if test=" null != nameLike and '' != nameLike "> and `name` like concat('%', #{nameLike},'%')</if> | |||||
| <if test=" null != available "> | |||||
| and `available` like concat('%', #{available},'%') | |||||
| </if> | |||||
| <if test=" null != parentId "> | |||||
| and `parent_id` = #{parentId} | |||||
| </if> | |||||
| <if test=" null != parentIds "> | |||||
| and `parent_ids` like concat('%', #{parentIds},'%') | |||||
| </if> | |||||
| <if test=" null != permission "> | |||||
| and `permission` like concat('%', #{permission},'%') | |||||
| </if> | |||||
| <if test=" null != permissions "> | |||||
| and `permission` in | |||||
| <foreach collection="permissions" item="item_permission" open="(" close=")" separator=","> | |||||
| #{item_permission} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != resourceType "> | |||||
| and `resource_type` like concat('%', #{resourceType},'%') | |||||
| </if> | |||||
| <if test=" null != url "> | |||||
| and `url` like concat('%', #{url},'%') | |||||
| </if> | |||||
| <if test=" null != sort "> | |||||
| and `sort` = #{sort} | |||||
| </if> | |||||
| <if test=" null != sortFrom "> and `sort` >= #{sortFrom} </if> | |||||
| <if test=" null != sortTo "> and #{sortTo} >= `sort` </if> | |||||
| <if test=" null != sortGte "> and `sort` >= #{sortGte} </if> | |||||
| <if test=" null != sortGt "> and `sort` > #{sortGt} </if> | |||||
| <if test=" null != sortLte "> and #{sortLte} >= `sort` </if> | |||||
| <if test=" null != sortLt "> and #{sortLt} > `sort` </if> | |||||
| <if test=" null != ids "> | |||||
| and id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <sql id="allColumns"> | |||||
| `id`,`name`,`parent_id`,`available`,`permission`,`resource_type`,`module_color`,`module_color_num`,`url`,`icon`,`sort` | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.MallPermission" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns" /> from mall_permission | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| </select> | |||||
| <sql id="dynamicWhereConditions"> | |||||
| where 1 = 1 | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != name "> | |||||
| and `name` = #{name} | |||||
| </if> | |||||
| <if test=" null != nameLike and '' != nameLike "> | |||||
| and `name` like concat('%', #{nameLike},'%') | |||||
| </if> | |||||
| <if test=" null != parentId "> | |||||
| and `parent_id` = #{parentId} | |||||
| </if> | |||||
| <if test=" null != available "> | |||||
| and `available` = #{available} | |||||
| </if> | |||||
| <if test=" null != permission "> | |||||
| and `permission` = #{permission} | |||||
| </if> | |||||
| <if test=" null != permissions "> | |||||
| and `permission` in | |||||
| <foreach collection="permissions" item="item_permission" open="(" close=")" separator=","> | |||||
| #{item_permission} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != resourceType "> | |||||
| and `resource_type` = #{resourceType} | |||||
| </if> | |||||
| <if test=" null != url "> | |||||
| and `url` like concat('%', #{url},'%') | |||||
| </if> | |||||
| <if test=" null != icon "> | |||||
| and `icon` = #{icon} | |||||
| </if> | |||||
| <if test=" null != sort "> | |||||
| and `sort` = #{sort} | |||||
| </if> | |||||
| <if test=" null != sortFrom ">and `sort` >= #{sortFrom}</if> | |||||
| <if test=" null != sortTo ">and #{sortTo} >= `sort`</if> | |||||
| <if test=" null != sortGte ">and `sort` >= #{sortGte}</if> | |||||
| <if test=" null != sortGt ">and `sort` > #{sortGt}</if> | |||||
| <if test=" null != sortLte ">and #{sortLte} >= `sort`</if> | |||||
| <if test=" null != sortLt ">and #{sortLt} > `sort`</if> | |||||
| <if test=" null != ids "> | |||||
| and id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </sql> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.MallPermission" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from mall_permission | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | |||||
| <select id="queryListParentId" parameterType="long" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from mall_permission | |||||
| where 1=1 and `parent_id` = #{value} and available = 'Y' order by sort asc | |||||
| </select> | |||||
| <select id="queryNotButtonList" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from mall_permission | |||||
| where 1=1 and `resource_type` != 2 and `available` = 'Y' order by sort asc | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||
| @@ -115,7 +115,7 @@ | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <select id="selectById" resultMap="BaseResultMap"> | |||||
| <select id="getById" resultMap="BaseResultMap"> | |||||
| select | select | ||||
| <include refid="allSafeColumns"/> | <include refid="allSafeColumns"/> | ||||
| from mall_user_info | from mall_user_info | ||||
| @@ -21,6 +21,7 @@ | |||||
| <artifactId>mallinkService</artifactId> | <artifactId>mallinkService</artifactId> | ||||
| <version>1.0</version> | <version>1.0</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.google.zxing</groupId> | <groupId>com.google.zxing</groupId> | ||||
| <artifactId>core</artifactId> | <artifactId>core</artifactId> | ||||
| @@ -41,6 +42,7 @@ | |||||
| <artifactId>spring-boot-maven-plugin</artifactId> | <artifactId>spring-boot-maven-plugin</artifactId> | ||||
| <configuration> | <configuration> | ||||
| <executable>true</executable> | <executable>true</executable> | ||||
| <!-- | |||||
| <layout>ZIP</layout> | <layout>ZIP</layout> | ||||
| <excludeGroupIds> | <excludeGroupIds> | ||||
| antlr, | antlr, | ||||
| @@ -159,6 +161,7 @@ | |||||
| xmlpull, | xmlpull, | ||||
| xpp3 | xpp3 | ||||
| </excludeGroupIds> | </excludeGroupIds> | ||||
| --> | |||||
| </configuration> | </configuration> | ||||
| </plugin> | </plugin> | ||||
| </plugins> | </plugins> | ||||
| @@ -1,20 +1,19 @@ | |||||
| package com.iformall; | package com.iformall; | ||||
| import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | ||||
| import io.swagger.models.auth.In; | |||||
| import org.mybatis.spring.annotation.MapperScan; | |||||
| import org.springframework.beans.factory.annotation.Value; | import org.springframework.beans.factory.annotation.Value; | ||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| import org.springframework.context.annotation.Bean; | import org.springframework.context.annotation.Bean; | ||||
| import springfox.documentation.swagger2.annotations.EnableSwagger2; | import springfox.documentation.swagger2.annotations.EnableSwagger2; | ||||
| import tk.mybatis.spring.annotation.MapperScan; | |||||
| /** | /** | ||||
| * @author stormeye | * @author stormeye | ||||
| * @date 2019-01-14 | * @date 2019-01-14 | ||||
| */ | */ | ||||
| @SpringBootApplication | @SpringBootApplication | ||||
| @MapperScan(basePackages = {"com.iformall.mapper"}) | |||||
| @MapperScan("com.iformall.mapper") | |||||
| @EnableSwagger2 | @EnableSwagger2 | ||||
| @EnableEncryptableProperties | @EnableEncryptableProperties | ||||
| public class WechatOpenApplication { | public class WechatOpenApplication { | ||||
| @@ -66,7 +66,7 @@ public class UserUnionIdSchedule { | |||||
| String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), payOrderVo.getTransactionId(), null, null); | String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), payOrderVo.getTransactionId(), null, null); | ||||
| logger.info(openRet); | logger.info(openRet); | ||||
| } else { | } else { | ||||
| WxPayAccount payAccount = payAccountMapper.selectByPrimaryKey(payOrderVo.getPayId()); | |||||
| WxPayAccount payAccount = payAccountMapper.selectById(payOrderVo.getPayId()); | |||||
| if(payAccount != null) { | if(payAccount != null) { | ||||
| String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), null, payAccount.getMchId(), payOrderVo.getPayOrderNo()); | String openRet = openMaService.getPaidUnionId(payOrderVo.getOpenId(), null, payAccount.getMchId(), payOrderVo.getPayOrderNo()); | ||||
| logger.info(openRet); | logger.info(openRet); | ||||
| @@ -22,21 +22,6 @@ spring: | |||||
| redis: | redis: | ||||
| time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | ||||
| # @{link} https://github.com/abel533 | |||||
| #Mybatis | |||||
| mybatis: | |||||
| type-aliases-package: com.iformall.domain.po | |||||
| mapper-locations: classpath:mapper/*Mapper.xml | |||||
| configuration: | |||||
| map-underscore-to-camel-case: true | |||||
| cache-enabled: true | |||||
| lazy-loading-enabled: true | |||||
| use-generated-keys: true | |||||
| default-fetch-size: 100 | |||||
| default-statement-timeout: 10 | |||||
| #PageHelper | #PageHelper | ||||
| pagehelper: | pagehelper: | ||||
| helperDialect: mysql | helperDialect: mysql | ||||
| @@ -51,4 +36,17 @@ mapper: | |||||
| mappers: | mappers: | ||||
| - com.iformall.common.CommonMapper | - com.iformall.common.CommonMapper | ||||
| mybatis-plus: | |||||
| mapper-locations: classpath:mapper/*Mapper.xml | |||||
| global-config: | |||||
| db-config: | |||||
| id-type: id_worker | |||||
| field-strategy: not_null | |||||
| db-type: mysql | |||||
| configuration: | |||||
| jdbc-type-for-null: 'null' | |||||
| cache-enabled: false | |||||
| call-setters-on-nulls: true | |||||
| type-aliases-package: com.iformall.domain.po | |||||
| version: @project.version@ | version: @project.version@ | ||||
| @@ -18,7 +18,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
| <artifactId>spring-boot-starter-parent</artifactId> | <artifactId>spring-boot-starter-parent</artifactId> | ||||
| <version>2.1.5.RELEASE</version> | |||||
| <version>2.1.8.RELEASE</version> | |||||
| <relativePath/> | <relativePath/> | ||||
| </parent> | </parent> | ||||
| @@ -82,20 +82,44 @@ | |||||
| <artifactId>spring-boot-starter-mail</artifactId> | <artifactId>spring-boot-starter-mail</artifactId> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>com.github.pagehelper</groupId> | |||||
| <artifactId>pagehelper-spring-boot-starter</artifactId> | |||||
| <version>1.2.10</version> | |||||
| <exclusions> | |||||
| <exclusion> | |||||
| <groupId>org.mybatis</groupId> | |||||
| <artifactId>mybatis</artifactId> | |||||
| </exclusion> | |||||
| <exclusion> | |||||
| <groupId>org.mybatis</groupId> | |||||
| <artifactId>mybatis-spring</artifactId> | |||||
| </exclusion> | |||||
| </exclusions> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>com.baomidou</groupId> | |||||
| <artifactId>mybatis-plus-boot-starter</artifactId> | |||||
| <version>3.1.0</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis.spring.boot</groupId> | <groupId>org.mybatis.spring.boot</groupId> | ||||
| <artifactId>mybatis-spring-boot-starter</artifactId> | <artifactId>mybatis-spring-boot-starter</artifactId> | ||||
| <version>1.3.2</version> | |||||
| <version>2.1.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.github.pagehelper</groupId> | |||||
| <artifactId>pagehelper-spring-boot-starter</artifactId> | |||||
| <version>1.2.7</version> | |||||
| <groupId>org.mybatis.spring.boot</groupId> | |||||
| <artifactId>mybatis-spring-boot-starter</artifactId> | |||||
| <version>2.1.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>tk.mybatis</groupId> | |||||
| <artifactId>mapper-spring-boot-starter</artifactId> | |||||
| <version>2.0.4</version> | |||||
| <groupId>org.mybatis.generator</groupId> | |||||
| <artifactId>mybatis-generator-core</artifactId> | |||||
| <version>1.3.7</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -106,7 +130,7 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>mysql</groupId> | <groupId>mysql</groupId> | ||||
| <artifactId>mysql-connector-java</artifactId> | <artifactId>mysql-connector-java</artifactId> | ||||
| <version>8.0.11</version> | |||||
| <version>8.0.17</version> | |||||
| <scope>runtime</scope> | <scope>runtime</scope> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -148,27 +172,6 @@ | |||||
| <artifactId>druid</artifactId> | <artifactId>druid</artifactId> | ||||
| <version>1.1.12</version> | <version>1.1.12</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>org.mybatis.generator</groupId> | |||||
| <artifactId>mybatis-generator-core</artifactId> | |||||
| <version>1.3.7</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.quartz-scheduler</groupId> | |||||
| <artifactId>quartz</artifactId> | |||||
| <version>${quartz.version}</version> | |||||
| <exclusions> | |||||
| <exclusion> | |||||
| <groupId>com.mchange</groupId> | |||||
| <artifactId>c3p0</artifactId> | |||||
| </exclusion> | |||||
| <exclusion> | |||||
| <groupId>com.zaxxer</groupId> | |||||
| <artifactId>HikariCP-java6</artifactId> | |||||
| </exclusion> | |||||
| </exclusions> | |||||
| </dependency> | |||||
| <!-- Swagger --> | <!-- Swagger --> | ||||
| <dependency> | <dependency> | ||||
| @@ -201,29 +204,12 @@ | |||||
| <artifactId>jaxb-api</artifactId> | <artifactId>jaxb-api</artifactId> | ||||
| <version>2.3.0</version> | <version>2.3.0</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>javax.persistence</groupId> | |||||
| <artifactId>persistence-api</artifactId> | |||||
| <version>1.0.2</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.projectlombok</groupId> | <groupId>org.projectlombok</groupId> | ||||
| <artifactId>lombok</artifactId> | <artifactId>lombok</artifactId> | ||||
| <version>1.18.2</version> | <version>1.18.2</version> | ||||
| <scope>provided</scope> | <scope>provided</scope> | ||||
| </dependency> | </dependency> | ||||
| <!-- </dependencyManagement> --> | |||||
| <!-- <dependencies> --> | |||||
| <!-- <dependency> --> | |||||
| <!-- <groupId>com.iformall</groupId> --> | |||||
| <!-- <artifactId>base</artifactId> --> | |||||
| <!-- <version>1.0</version> --> | |||||
| <!-- </dependency> --> | |||||
| <!-- <dependency> --> | |||||
| <!-- <groupId>com.iformall</groupId> --> | |||||
| <!-- <artifactId>freemarker</artifactId> --> | |||||
| <!-- <version>1.0</version> --> | |||||
| <!-- </dependency> --> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.apache.shiro</groupId> | <groupId>org.apache.shiro</groupId> | ||||
| <artifactId>shiro-spring</artifactId> | <artifactId>shiro-spring</artifactId> | ||||
| @@ -253,13 +239,6 @@ | |||||
| <artifactId>bcpkix-jdk15on</artifactId> | <artifactId>bcpkix-jdk15on</artifactId> | ||||
| <version>1.60</version> | <version>1.60</version> | ||||
| </dependency> | </dependency> | ||||
| <!-- <dependency> --> | |||||
| <!-- <groupId>net.coobird</groupId> --> | |||||
| <!-- <artifactId>thumbnailator</artifactId> --> | |||||
| <!-- <version>0.4.8</version> --> | |||||
| <!-- </dependency> --> | |||||
| <!-- https://mvnrepository.com/artifact/commons-io/commons-io --> | |||||
| <dependency> | <dependency> | ||||
| <groupId>commons-io</groupId> | <groupId>commons-io</groupId> | ||||
| <artifactId>commons-io</artifactId> | <artifactId>commons-io</artifactId> | ||||