diff --git a/README.md b/README.md index ef320a1c38f74c23440568eac2c1a9f89689bdf0..9c70516705eb996a0299df2fb7bd4bb8c0ce4105 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- + diff --git a/api/src/main/java/com/simon/common/handler/AuthSuccessHandler.java b/api/src/main/java/com/simon/common/handler/AuthSuccessHandler.java index 6e0f5b1050868f0e9af60921222c5d10df0c6d66..537eff0c6e882d98bf69b13fac43436de46ef40f 100644 --- a/api/src/main/java/com/simon/common/handler/AuthSuccessHandler.java +++ b/api/src/main/java/com/simon/common/handler/AuthSuccessHandler.java @@ -1,9 +1,9 @@ package com.simon.common.handler; import com.alibaba.fastjson.JSON; +import com.simon.common.domain.UserEntity; import com.simon.common.utils.DateUtil; import com.simon.common.utils.IpUtil; -import com.simon.common.domain.UserEntity; import com.simon.model.LogLogin; import com.simon.repository.LogLoginRepository; import org.apache.log4j.Logger; @@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; -import java.util.Date; +import java.time.LocalDateTime; /** * 登录处理 @@ -37,7 +37,7 @@ public class AuthSuccessHandler extends SavedRequestAwareAuthenticationSuccessHa public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { UserEntity userDetails = (UserEntity) authentication.getPrincipal(); LogLogin logLogin = new LogLogin(); - logLogin.setCreateTime(new Date()); + logLogin.setCreateTime(LocalDateTime.now()); logLogin.setIp(IpUtil.getIpAddr(request)); logLogin.setUsername(userDetails.getUsername()); logLogin = logLoginRepository.save(logLogin); diff --git a/api/src/main/java/com/simon/common/plugins/oauth/UsernamePasswordAuthenticator.java b/api/src/main/java/com/simon/common/plugins/oauth/UsernamePasswordAuthenticator.java index 774c7dc25ee23630e07c130423ac4e2e643c5dab..2833d49e6fd54c2b8a0af528e69e11747d5a5f1a 100644 --- a/api/src/main/java/com/simon/common/plugins/oauth/UsernamePasswordAuthenticator.java +++ b/api/src/main/java/com/simon/common/plugins/oauth/UsernamePasswordAuthenticator.java @@ -3,6 +3,7 @@ package com.simon.common.plugins.oauth; import com.simon.common.config.AppConfig; import com.simon.common.domain.UserEntity; import com.simon.common.exception.BusinessException; +import com.simon.common.utils.DateUtil; import com.simon.common.utils.ValidUtil; import com.simon.model.Authority; import lombok.extern.slf4j.Slf4j; @@ -51,7 +52,7 @@ public class UsernamePasswordAuthenticator extends AbstractPreparableIntegration sqlLoadUserByName = "select id,username,password,enabled,phone,email,address,birth,age,head_photo,person_brief,sex from t_users where username=?"; sqlLoadAuthorities = "select user_id,authority from t_authorities where user_id = ?"; - myUserDetailsRowMapper = (rs, i) -> new UserEntity(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getBoolean(4), rs.getString("phone"), rs.getString("email"),rs.getString("address"), rs.getDate("birth"), rs.getInt("age"), rs.getString("head_photo"), rs.getString("person_brief"), rs.getBoolean("sex")); + myUserDetailsRowMapper = (rs, i) -> new UserEntity(rs.getLong(1), rs.getString(2), rs.getString(3), rs.getBoolean(4), rs.getString("phone"), rs.getString("email"),rs.getString("address"), DateUtil.dateToLocalDate(rs.getDate("birth")), rs.getInt("age"), rs.getString("head_photo"), rs.getString("person_brief"), rs.getBoolean("sex")); authorityRowMapper = (rs,i) -> { Authority authority = new Authority(); diff --git a/api/src/main/java/com/simon/mapper/AccountBindMapper.java b/api/src/main/java/com/simon/mapper/AccountBindMapper.java deleted file mode 100644 index bf62bf9a590b382a68bfe8371b51033aaa5a9fd5..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/AccountBindMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.AccountBind; - -public interface AccountBindMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/AuthorityMapper.java b/api/src/main/java/com/simon/mapper/AuthorityMapper.java deleted file mode 100644 index b830819924b087ce99b24701c4d0922c3c3d8b86..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/AuthorityMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.dto.AuthorityDto; -import com.simon.model.Authority; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface AuthorityMapper extends MyMapper { - /** - * 查询权限Dto - * @param params 查询参数 - * @return 权限Dto - */ - List getDtoList(@Param("map") Map params); - - /** - * 根据userIds批量删除记录 - * @param userIds 用户ids - * @return 影响记录行数 - */ - int deleteByUserIds(@Param("userIds") String userIds); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/BillMapper.java b/api/src/main/java/com/simon/mapper/BillMapper.java deleted file mode 100644 index b7de85ac53418fe42811bd117629d2317b7282e7..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/BillMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.Bill; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface BillMapper extends MyMapper { - int updateBillStatusByOutTradeNo(String billStatus, String outTradeNo); - - List getDtoList(@Param("map") Map params); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/DictTypeGroupMapper.java b/api/src/main/java/com/simon/mapper/DictTypeGroupMapper.java deleted file mode 100644 index 849b93d1e846704dcfa3672ae4cd3541fe24de8e..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/DictTypeGroupMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.dto.EasyUiTreeGridDto; -import com.simon.model.DictTypeGroup; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface DictTypeGroupMapper extends MyMapper { - List getAll(); - - List getTreeGridDtos(@Param("map") Map map); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/DictTypeMapper.java b/api/src/main/java/com/simon/mapper/DictTypeMapper.java deleted file mode 100644 index 614078db0ad713968a825ce28d954b66abc330d9..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/DictTypeMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.dto.EasyUiTreeGridDto; -import com.simon.model.DictType; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author simon - */ -public interface DictTypeMapper extends MyMapper { - /** - * 根据字典组编码查询字典列表 - * @param groupCode - * @return - */ - List getByGroupCode(@Param("groupCode") String groupCode); - - List getTreeGridDtos(@Param("groupCode") String groupCode); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/LogLoginMapper.java b/api/src/main/java/com/simon/mapper/LogLoginMapper.java deleted file mode 100644 index fbb075159ce0e024716993d93825d2366fd23e05..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/LogLoginMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.LogLogin; - -public interface LogLoginMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/NewsInfoMapper.java b/api/src/main/java/com/simon/mapper/NewsInfoMapper.java deleted file mode 100644 index 46fb800e37dea970ecb1152d3ce9f40558ac6e44..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/NewsInfoMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.NewsInfo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface NewsInfoMapper extends MyMapper { - List getList(@Param("map") Map map); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/NewsTagMapper.java b/api/src/main/java/com/simon/mapper/NewsTagMapper.java deleted file mode 100644 index 91d6b9faab67b305288b3072eacbd35ad8e6262b..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/NewsTagMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.NewsTag; - -public interface NewsTagMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/NoticeMsgMapper.java b/api/src/main/java/com/simon/mapper/NoticeMsgMapper.java deleted file mode 100644 index 5ccbe766c591945f044bb5c715d25ac0581bbb40..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/NoticeMsgMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.NoticeMsg; - -public interface NoticeMsgMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/OauthUserMapper.java b/api/src/main/java/com/simon/mapper/OauthUserMapper.java deleted file mode 100644 index edef51f1bef44883f05ca7b97e07d17bfcf0cb73..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/OauthUserMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.dto.StatisticDto; -import com.simon.model.OauthUser; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface OauthUserMapper extends MyMapper { - int updatePwdByPhone(@Param("phone") String phone, @Param("password") String password); - - List findByMap(@Param("map") Map map); - - List sexRatio(); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/QrCodeMapper.java b/api/src/main/java/com/simon/mapper/QrCodeMapper.java deleted file mode 100644 index ea4b8c53c4b509e14305b58086e6fdab9dc9e060..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/QrCodeMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.QrCode; - -public interface QrCodeMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java b/api/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java deleted file mode 100644 index 032dbb10260cd295f8880ffc32466708fee45f25..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.ResetPwdInfo; - -public interface ResetPwdInfoMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/SideMenuMapper.java b/api/src/main/java/com/simon/mapper/SideMenuMapper.java deleted file mode 100644 index 79011948e4802e20b28edd2e0eb39f6d9d7df8f7..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/SideMenuMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.SideMenu; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface SideMenuMapper extends MyMapper { - List selectByPid(@Param("pid") Long pid); - List selectByPids(@Param("pids") String pids); - - /** - * 查询子菜单列表 - * @param pidArray 一级菜单id - * @return 子菜单列表 - */ - List selectByPidArray(@Param("pidArray") Long[] pidArray); - - /** - * 查询子菜单列表 - * @param pidList 一级菜单id - * @return 子菜单列表 - */ - List selectByPidList(@Param("pidList") List pidList); - - /** - * 查询一级菜单 - * @param map 查询参数 - * @return 一级菜单列表 - */ - List selectLevel1(@Param("map") Map map); - - /** - * 查询菜单列表（树状结构） - * @return 菜单列表（树状结构） - */ - List selectTreeGrid(); - - List findAll(); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/mapper/VeriCodeMapper.java b/api/src/main/java/com/simon/mapper/VeriCodeMapper.java deleted file mode 100644 index 2d8e14982e5ae8a40c8fcf2203a75d5ecabeccf3..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/mapper/VeriCodeMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simon.mapper; - -import com.simon.common.mapper.MyMapper; -import com.simon.model.VeriCode; - -public interface VeriCodeMapper extends MyMapper { -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/AccountBind.java b/api/src/main/java/com/simon/model/AccountBind.java deleted file mode 100644 index 3da78fb7b208d17fd2bc499c24e82ed0a2e5cf00..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/AccountBind.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* 账号绑定 -* @author SimonSun -* @date 2018-12-04 -**/ -@ApiModel(description = "账号绑定") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_account_bind") -public class AccountBind implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "id") - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "用户id") - @Column(name = "user_id") - private Long userId; - - @ApiModelProperty(value = "账号类型") - @Column(name = "account_type") - private Integer accountType; - - @ApiModelProperty(value = "账号") - @Column(name = "account_no") - private String accountNo; - - @ApiModelProperty(value = "密码") - @Column(name = "password") - private String password; - - @ApiModelProperty(value = "绑定密钥") - @Column(name = "secret_key") - private String secretKey; - - @ApiModelProperty(value = "是否绑定") - @Column(name = "is_bind") - private Boolean isBind; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "绑定过期时间") - @Column(name = "overdue_time") - private LocalDateTime overdueTime; - - @ApiModelProperty(value = "状态") - @Column(name = "status") - private String status; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/Authority.java b/api/src/main/java/com/simon/model/Authority.java deleted file mode 100644 index 1a7a01eb79a04f62f250d3b088cb7d4ccd3f99ad..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/Authority.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.security.core.GrantedAuthority; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -/** -* @author SimonSun -* @date 2018-09-12 -**/ -@ApiModel(value = "权限", description = "该文件的任何修改必须同步到common下的相同文件") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_authorities") -public class Authority implements GrantedAuthority, Serializable, Comparable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "用户id") - @Column(name = "user_id", nullable = false) - private Long userId; - - @ApiModelProperty(value = "权限") - @Column(name = "authority", nullable = false) - private String authority; - - @ApiModelProperty(value = "用户名(昵称)") - @Transient - private String username; - - @Override - public int compareTo(Authority o) { - return (int)(this.userId - o.userId); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/Bill.java b/api/src/main/java/com/simon/model/Bill.java deleted file mode 100644 index 944f60ff84e783edd184df3ebbaf975ba2907480..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/Bill.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* 订单 -* @author SimonSun -* @date 2018-11-20 -**/ -@ApiModel(description = "订单") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_bill") -public class Bill implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "id") - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "账单分类") - @Column(name = "bill_type") - private String billType; - - @ApiModelProperty(value = "账单状态") - @Column(name = "bill_status") - private String billStatus; - - @ApiModelProperty(value = "账单描述(商品描述)") - @Column(name = "bill_desc") - private String billDesc; - - @ApiModelProperty(value = "收货地址") - @Column(name = "receiving_address") - private String receivingAddress; - - @ApiModelProperty(value = "物流信息") - @Column(name = "logistics_info") - private String logisticsInfo; - - @ApiModelProperty(value = "物流号") - @Column(name = "logistics_no") - private String logisticsNo; - - @ApiModelProperty(value = "物流状况") - @Column(name = "logistics_status") - private String logisticsStatus; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "账单日期") - @Column(name = "bill_date") - private LocalDateTime billDate; - - @ApiModelProperty(value = "付款金额", notes = "微信单位是分，支付宝单位是元") - @Column(name = "total_amount") - private Double totalAmount; - - @ApiModelProperty(value = "数量") - @Column(name = "quantity") - private Integer quantity; - - @ApiModelProperty(value = "商户订单号") - @Column(name = "out_trade_no") - private String outTradeNo; - - @ApiModelProperty(value = "对方账号名称") - @Column(name = "to_member_name") - private String toMemberName; - - @ApiModelProperty(value = "对方账号") - @Column(name = "to_member_id") - private String toMemberId; - - @ApiModelProperty(value = "付款方式") - @Column(name = "payment_type") - private String paymentType; - - @ApiModelProperty(value = "付款账号") - @Column(name = "payment_account_no") - private String paymentAccountNo; - - @ApiModelProperty(value = "理由") - @Column(name = "reason") - private String reason; - - @ApiModelProperty(value = "积分奖励") - @Column(name = "integral_reward") - private Integer integralReward; - - @ApiModelProperty(value = "备注") - @Column(name = "remark") - private String remark; - - @ApiModelProperty(value = "付款详情页的订单信息") - @Column(name = "bill_context") - private String billContext; - - @ApiModelProperty(value = "用户id") - @Column(name = "user_id") - private Long userId; - - @ApiModelProperty(value = "用户名(昵称)") - @Transient - private String username; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/DictType.java b/api/src/main/java/com/simon/model/DictType.java deleted file mode 100644 index adf97206cece95f14f7cbc18b9efca5368d55f86..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/DictType.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "字典") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_dict_type") -public class DictType implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private LocalDateTime createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private Date createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "字典编码") - @Column(name = "type_code", nullable = false) - private String typeCode; - - @ApiModelProperty(value = "字典编码名称") - @Column(name = "type_name", nullable = false) - private String typeName; - - @ApiModelProperty(value = "字典组id") - @Column(name = "type_group_id", nullable = false) - private Long typeGroupId; - - @ApiModelProperty(value = "字典组编码") - @Column(name = "type_group_code", nullable = false) - private String typeGroupCode; - - @ApiModelProperty(value = "排序") - @Column(name = "order_num") - private Integer orderNum; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/DictTypeGroup.java b/api/src/main/java/com/simon/model/DictTypeGroup.java deleted file mode 100644 index b6246b88a9d44d9ffb76490d98321ad4e5ba2e97..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/DictTypeGroup.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "字典组") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_dict_type_group") -public class DictTypeGroup implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "字典组编码") - @Column(name = "type_group_code", nullable = false) - private String typeGroupCode; - - @ApiModelProperty(value = "字典组名称") - @Column(name = "type_group_name", nullable = false) - private String typeGroupName; - - @ApiModelProperty(value = "字典列表") - @Transient - private List dictTypes; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/LogLogin.java b/api/src/main/java/com/simon/model/LogLogin.java deleted file mode 100644 index 7d8bedab56b68a5c946692e8361cae210df308b5..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/LogLogin.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_log_login") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_log_login") -public class LogLogin implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "create_time") - @Column(name = "create_time") - private LocalDateTime createTime; - - @ApiModelProperty(value = "ip") - @Column(name = "ip") - private String ip; - - @ApiModelProperty(value = "username") - @Column(name = "username") - private String username; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/NewsInfo.java b/api/src/main/java/com/simon/model/NewsInfo.java deleted file mode 100644 index 69dc8152142a07b6fffdcb5813e42dc4b26debb5..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/NewsInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_news_info") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_news_info") -public class NewsInfo implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "标题") - @Column(name = "title") - private String title; - - @ApiModelProperty(value = "用户id") - @Column(name = "user_id") - private Long userId; - - @ApiModelProperty(value = "状态") - @Column(name = "status") - private Integer status; - - @ApiModelProperty(value = "新闻内容") - @Column(name = "content", columnDefinition = "TEXT") - private String content; - - @ApiModelProperty(value = "缩略图") - @Column(name = "image_url") - private String imageUrl; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "发布时间") - @Column(name = "publish_date") - private LocalDateTime publishDate; - - @ApiModelProperty(value = "标签") - @Column(name = "tags") - private String tags; - - @ApiModelProperty(value = "新闻类型") - @Column(name = "news_type") - private Integer newsType; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/NewsTag.java b/api/src/main/java/com/simon/model/NewsTag.java deleted file mode 100644 index 9d09fe15c3d5695c7523ecec379c0289d0302e15..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/NewsTag.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_news_tag") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_news_tag") -public class NewsTag implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "news_info_id") - @Column(name = "news_info_id") - private Long newsInfoId; - - @ApiModelProperty(value = "tag_id") - @Column(name = "tag_id") - private Long tagId; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/NoticeMsg.java b/api/src/main/java/com/simon/model/NoticeMsg.java deleted file mode 100644 index 86ab39f0064eb3f5af3fce180f20fb7d2131c35d..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/NoticeMsg.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* 通知消息 -* @author SimonSun -* @date 2018-11-24 -**/ -@ApiModel(description = "通知消息") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_notice_msg") -public class NoticeMsg implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "id") - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) -@ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "用户id") - @Column(name = "user_id") - private Long userId; - - @ApiModelProperty(value = "消息类型") - @Column(name = "msg_type") - private Integer msgType; - - @ApiModelProperty(value = "消息内容") - @Column(name = "content", columnDefinition = "LONGTEXT") - private String content; - - @ApiModelProperty(value = "是否已读") - @Column(name = "is_read", nullable = false) - private Boolean isRead; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/OauthUser.java b/api/src/main/java/com/simon/model/OauthUser.java deleted file mode 100644 index 670270a5e0576515129ed21d07fcb86155040ca0..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/OauthUser.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @date 2018-09-12 -**/ -@ApiModel(description = "用户") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_users") -public class OauthUser implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(useGeneratedKeys = true) - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "用户名(昵称)") - @Column(name = "username", nullable = false) - private String username; - - @ApiModelProperty(value = "密码") - @Column(name = "password", nullable = false) - private String password; - - @ApiModelProperty(value = "有效") - @Column(name = "enabled", nullable = false) - private Boolean enabled; - - @ApiModelProperty(value = "手机区号") - @Column(name = "area_code") - private String areaCode; - - @ApiModelProperty(value = "手机号") - @Column(name = "phone") - private String phone; - - @ApiModelProperty(value = "邮箱") - @Column(name = "email") - private String email; - - @ApiModelProperty(value = "地址") - @Column(name = "address") - private String address; - - @ApiModelProperty(value = "年龄") - @Column(name = "age") - private Integer age; - - @DateTimeFormat(pattern = AppConfig.DATE_PATTERN_DAY) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DAY, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "生日") - @Column(name = "birth") - private LocalDate birth; - - @ApiModelProperty(value = "头像") - @Column(name = "head_photo") - private String headPhoto; - - @ApiModelProperty(value = "个人简介") - @Column(name = "person_brief") - private String personBrief; - - @ApiModelProperty(value = "性别[0:女,1:男]") - @Column(name = "sex") - private Boolean sex; - - @ApiModelProperty(value = "邀请码") - @Column(name = "visit_card") - private String visitCard; - - @ApiModelProperty(value = "登录方式") - @Column(name = "login_type") - private Integer loginType; - - @ApiModelProperty(value = "登录状态") - @Column(name = "login_status") - private String loginStatus; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "登录时间") - @Column(name = "login_date") - private LocalDateTime loginDate; - - @ApiModelProperty(value = "角色") - @Transient - private String authorities; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/QrCode.java b/api/src/main/java/com/simon/model/QrCode.java deleted file mode 100644 index 63ca89e184506fc3f8bf88a70f2fe49f8fabbae3..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/QrCode.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_qr_code") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_qr_code") -public class QrCode implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "is_ok") - @Column(name = "is_ok") - private Boolean isOk; - - @ApiModelProperty(value = "sid") - @Column(name = "sid") - private String sid; - - @ApiModelProperty(value = "token") - @Column(name = "token") - private String token; - - @ApiModelProperty(value = "username") - @Column(name = "username") - private String username; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/ResetPwdInfo.java b/api/src/main/java/com/simon/model/ResetPwdInfo.java deleted file mode 100644 index 98ef618cf74e6fbbe65c599adfb3c75af425679d..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/ResetPwdInfo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_reset_pwd_info") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_reset_pwd_info") -public class ResetPwdInfo implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "expires_in") - @Column(name = "expires_in") - private LocalDateTime expiresIn; - - @ApiModelProperty(value = "secret_key") - @Column(name = "secret_key") - private String secretKey; - - @ApiModelProperty(value = "user_id") - @Column(name = "user_id") - private Long userId; - - @ApiModelProperty(value = "valid") - @Column(name = "valid", nullable = false) - private Boolean valid; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/SideMenu.java b/api/src/main/java/com/simon/model/SideMenu.java deleted file mode 100644 index 46d953970e675ef448a3068c0345a190136172d9..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/SideMenu.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** -* 侧边菜单 -* @author SimonSun -* @date 2018-10-02 -**/ -@ApiModel(value = "侧边菜单") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_side_menu") -public class SideMenu implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "id") - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "菜单名称") - @Column(name = "name") - private String name; - - @ApiModelProperty(value = "菜单地址") - @Column(name = "url") - private String url; - - @ApiModelProperty(value = "菜单权限") - @Column(name = "authority") - private String authority; - - @ApiModelProperty(value = "菜单图标") - @Column(name = "icon") - private String icon; - - @ApiModelProperty(value = "菜单组id") - @Column(name = "pid") - private Long pid; - - @ApiModelProperty(value = "排序") - @Column(name = "order_num") - private Integer orderNum; - - @ApiModelProperty(value = "菜单类型[1:一级菜单, 2:二级菜单]") - @Transient - private Integer menuType; - - @ApiModelProperty(value = "子菜单列表") - @Transient - private List subSideMenus; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/model/VeriCode.java b/api/src/main/java/com/simon/model/VeriCode.java deleted file mode 100644 index 4b6c3f6d479144d830936200ba0f711c135907f4..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/model/VeriCode.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.simon.model; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @create 2018-09-12 -**/ -@ApiModel(value = "t_veri_code") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_veri_code") -public class VeriCode implements Serializable{ - private static final long serialVersionUID = 1L; - - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @ApiModelProperty(value = "code") - @Column(name = "code") - private Integer code; - - @ApiModelProperty(value = "create_time") - @Column(name = "create_time") - private Long createTime; - - @ApiModelProperty(value = "expires") - @Column(name = "expires") - private Integer expires; - - @ApiModelProperty(value = "phone") - @Column(name = "phone") - private String phone; -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/repository/NewsInfoRepository.java b/api/src/main/java/com/simon/repository/NewsInfoRepository.java deleted file mode 100644 index 64214428ea8d3f62a3329a5b7a8c10b58d0c1f87..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/repository/NewsInfoRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simon.repository; - -import com.simon.model.NewsInfo; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * 新闻 - * - * @author simon - * @create 2018-08-03 22:32 - **/ - -public interface NewsInfoRepository extends JpaRepository { -} diff --git a/api/src/main/java/com/simon/repository/SideMenuRepository.java b/api/src/main/java/com/simon/repository/SideMenuRepository.java deleted file mode 100644 index 50568e391e52210bdc4183034c87c6b4a395d794..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/repository/SideMenuRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.simon.repository; - -import com.simon.model.SideMenu; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** -* @author SimonSun -* @date 2018-09-26 -**/ -@Repository -public interface SideMenuRepository extends JpaRepository { - -} diff --git a/api/src/main/java/com/simon/service/AccountBindService.java b/api/src/main/java/com/simon/service/AccountBindService.java deleted file mode 100644 index f429ddbdc13e86c24a904b67573b394a019e029f..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/AccountBindService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simon.service; -import com.simon.model.AccountBind; -import com.simon.common.service.BasicService; - -/** -* @author SimonSun -* @date 2018-12-04 -**/ -public interface AccountBindService extends BasicService { - -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/AuthorityService.java b/api/src/main/java/com/simon/service/AuthorityService.java deleted file mode 100644 index 5cda10dcda95fa3214d75190c95ec5702762f85d..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/AuthorityService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.simon.service; - -import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; -import com.simon.dto.AuthorityDto; -import com.simon.model.Authority; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-11-14 -**/ -public interface AuthorityService extends BasicService { - PageInfo getDtoList(Map params, Integer pageNo, Integer pageSize, String orderBy); - List findByUserId(Long userId); - - void updateByDto(AuthorityDto authorityDto); - - int deleteByUserIds(String userIds); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/DictTypeGroupService.java b/api/src/main/java/com/simon/service/DictTypeGroupService.java deleted file mode 100644 index be7c7153200d04a01075df5b3cf74e91f8c0b976..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/DictTypeGroupService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.simon.service; - -import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; -import com.simon.dto.DictTypeDto; -import com.simon.dto.EasyUiTreeGridDto; -import com.simon.model.DictTypeGroup; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -public interface DictTypeGroupService extends BasicService { - List getDtos(Integer limit, Integer offset); - - PageInfo getTreeGridDtos(Map params, Integer pageNo, Integer pageSize, String orderBy); - - DictTypeGroup save(DictTypeDto dictTypeDto); - - int countByTypeGroupCode(String typeGroupCode); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/DictTypeService.java b/api/src/main/java/com/simon/service/DictTypeService.java deleted file mode 100644 index cb7d3b9e7a1d3c04f3a67fc4f528c95646798964..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/DictTypeService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.simon.service; - -import com.simon.common.service.BasicService; -import com.simon.dto.DictTypeDto; -import com.simon.model.DictType; - -import java.util.List; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -public interface DictTypeService extends BasicService { - /** - * 根据字典组编码查询字典列表 - * @param groupCode 字典组编码 - * @return - */ - List getTypeByGroupCode(String groupCode); - - DictType save(DictTypeDto dictTypeDto); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/OauthUserService.java b/api/src/main/java/com/simon/service/OauthUserService.java deleted file mode 100644 index 9475e4ed778c6487bd155b9461967b2502a736a6..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/OauthUserService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.simon.service; - -import com.github.pagehelper.PageInfo; -import com.simon.common.domain.UserEntity; -import com.simon.common.service.BasicService; -import com.simon.dto.StatisticDto; -import com.simon.model.OauthUser; - -import java.util.List; -import java.util.Map; - -/** - * 用户 - * - * @author simon - * @create 2018-07-31 19:55 - **/ - -public interface OauthUserService extends BasicService { - void register(Integer code, String phone, String password); - - void register(String phone, String password); - - int updatePwdByCode(String phone, Integer code, String newPwd); - - int updatePwdByOldPwd(String username, String oldPwd, String newPwd); - - PageInfo getList(Map params, Integer limit, Integer offset, String orderBy); - - List sexRatio(); - - UserEntity findEntityByPhone(String phone); - UserEntity findEntityByUsername(String username); - UserEntity findEntityByEmail(String email); - - /** - * 根据手机号注册 - * @param areaCode 手机区号 - * @param phone 手机号 - * @return 注册账号信息 - */ - OauthUser registerByPhone(String areaCode, String phone); - - /** - * 根据账号(用户名、手机号、邮箱)+密码注册 - * @param account - * @param password - * @return - */ - OauthUser registerByAccountAndPwd(String account, String password); - - /** - * 根据手机号+密码注册 - * @param phone 手机号 - * @param password 密码 - * @return 注册账号信息 - */ - OauthUser registerByPhoneAndPwd(String phone, String password); - - /** - * 根据邮箱+密码注册 - * @param email 邮箱 - * @param password 密码 - * @return 注册账号信息 - */ - OauthUser registerByEmailAndPwd(String email, String password); - - /** - * 根据用户名+密码注册 - * @param username 用户名 - * @param password 密码 - * @return 注册账号信息 - */ - OauthUser registerByUsernameAndPwd(String username, String password); -} diff --git a/api/src/main/java/com/simon/service/SideMenuService.java b/api/src/main/java/com/simon/service/SideMenuService.java deleted file mode 100644 index fb3675e4f2c040268af8b81c74aa2934de46425e..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/SideMenuService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.simon.service; - -import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; -import com.simon.model.SideMenu; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-09-26 -**/ -public interface SideMenuService extends BasicService { - PageInfo getAll(Map params, Integer limit, Integer offset); - List getAll(); - PageInfo getList(Map params, Integer limit, Integer offset, String orderBy); -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/SmsService.java b/api/src/main/java/com/simon/service/SmsService.java deleted file mode 100644 index c317037bb105477687aa89748581ccf6318dc4ab..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/SmsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.simon.service; - -import com.taobao.api.ApiException; - -/** - * 短信服务 - * - * @author simon - * @date 2018-12-03 - **/ - -public interface SmsService { - boolean sendIdentifyCode(String mobile) throws ApiException; - - boolean checkCode(String mobile,String code); -} diff --git a/api/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java b/api/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java deleted file mode 100644 index dcb52f8f45ee7dc39b3659ec47d59220341d20ea..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ - -package com.simon.service.impl; - -import com.simon.mapper.AccountBindMapper; -import com.simon.model.AccountBind; -import com.simon.service.AccountBindService; -import com.simon.repository.AccountBindRepository; -import com.simon.common.config.AppConfig; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-12-04 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class AccountBindServiceImpl implements AccountBindService { - @Autowired - private AccountBindMapper accountBindMapper; - - @Autowired - private AccountBindRepository accountBindRepository; - - @Override - public long count() { - return accountBindRepository.count(); - } - - @Override - public AccountBind save(AccountBind accountBind){ - return accountBindRepository.save(accountBind); - } - - @Override - public List save(List accountBindList) { - return accountBindRepository.save(accountBindList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = accountBindMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return accountBindRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return accountBindRepository.findAll(); - } - - @Override - public void delete(Long id){ - accountBindRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return accountBindMapper.deleteByIds(ids); - } - - @Override - public AccountBind findById(Long id){ - return accountBindRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return accountBindMapper.insertList(list); - } - - @Override - public int insert(AccountBind accountBind){ - return accountBindMapper.insert(accountBind); - } - - @Override - public int insertSelective(AccountBind accountBind){ - return accountBindMapper.insertSelective(accountBind); - } - - @Override - public int updateByPrimaryKey(AccountBind accountBind){ - return accountBindMapper.updateByPrimaryKey(accountBind); - } - - @Override - public int updateByPrimaryKeySelective(AccountBind accountBind){ - return accountBindMapper.updateByPrimaryKeySelective(accountBind); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java b/api/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java deleted file mode 100644 index 713678ebc724a6914b84b9605c389809329aae6a..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java +++ /dev/null @@ -1,194 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.dto.AuthorityDto; -import com.simon.mapper.AuthorityMapper; -import com.simon.model.Authority; -import com.simon.repository.AuthorityRepository; -import com.simon.service.AuthorityService; -import lombok.var; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-11-14 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class AuthorityServiceImpl implements AuthorityService { - @Autowired - private AuthorityMapper authorityMapper; - - @Autowired - private AuthorityRepository authorityRepository; - - @Override - public long count() { - return authorityRepository.count(); - } - - @Override - public Authority save(Authority authority){ - return authorityRepository.save(authority); - } - - @Override - public List save(List authorityList) { - return authorityRepository.save(authorityList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = authorityMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return authorityRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return authorityRepository.findAll(); - } - - @Override - public void delete(Long id){ - authorityRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return authorityMapper.deleteByIds(ids); - } - - @Override - public Authority findById(Long id){ - return authorityRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return authorityMapper.insertList(list); - } - - @Override - public int insert(Authority authority){ - return authorityMapper.insert(authority); - } - - @Override - public int insertSelective(Authority authority){ - return authorityMapper.insertSelective(authority); - } - - @Override - public int updateByPrimaryKey(Authority authority){ - return authorityMapper.updateByPrimaryKey(authority); - } - - @Override - public int updateByPrimaryKeySelective(Authority authority){ - return authorityMapper.updateByPrimaryKeySelective(authority); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } - - @Override - public PageInfo getDtoList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - var list = authorityMapper.getDtoList(params); - return new PageInfo<>(list); - } - - @Override - public List findByUserId(Long userId) { - return authorityRepository.findByUserId(userId); - } - - @Override - public void updateByDto(AuthorityDto authorityDto) { - String auth = authorityDto.getAuthority(); - List oldRecords = authorityRepository.findByUserId(authorityDto.getUserId()); - List toDeleteIds = new ArrayList<>(); - List authorityList = new ArrayList<>(); - if(StringUtils.isNotEmpty(auth)){ - String[] authArr = auth.split(","); - if(authArr.length > 0){ - for(int i = 0; i < authArr.length; i++){ - boolean toAdd = true; - for(int j = 0; j < oldRecords.size(); j++){ - if (authArr[i].equals(oldRecords.get(j).getAuthority())){ - toAdd = false; - break; - } - } - if (toAdd){ - Authority authority = new Authority(); - authority.setCreateDate(new Date()); - authority.setUserId(authorityDto.getUserId()); - authority.setAuthority(authArr[i]); - authorityList.add(authority); - } - } - - } - } - if(StringUtils.isNotEmpty(auth)){ - oldRecords.forEach(oldRecord -> { - if(!auth.contains(oldRecord.getAuthority())){ - toDeleteIds.add(oldRecord.getId()); - } - }); - }else{ - oldRecords.forEach(oldRecord -> { - toDeleteIds.add(oldRecord.getId()); - }); - } - if(toDeleteIds.size() > 0){ - authorityMapper.deleteByIds(StringUtils.join(toDeleteIds, ",")); - } - if(authorityList.size() > 0){ - authorityRepository.save(authorityList); - } - } - - @Override - public int deleteByUserIds(String userIds) { - return authorityMapper.deleteByUserIds(userIds); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/BillServiceImpl.java b/api/src/main/java/com/simon/service/impl/BillServiceImpl.java deleted file mode 100644 index fe75c2e6c7c2b102badcd0d7b5f88097cc2ddc75..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/BillServiceImpl.java +++ /dev/null @@ -1,188 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.common.domain.BillStatus; -import com.simon.common.utils.BeanUtils; -import com.simon.common.utils.snowflake.SnowFlakeId; -import com.simon.model.OauthUser; -import com.simon.request.BillRequest; -import com.simon.mapper.BillMapper; -import com.simon.model.Bill; -import com.simon.repository.BillRepository; -import com.simon.service.BillService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-11-20 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class BillServiceImpl implements BillService { - @Autowired - private BillMapper billMapper; - - @Autowired - private BillRepository billRepository; - - @Override - public long count() { - return billRepository.count(); - } - - @Override - public Bill save(Bill bill){ - return billRepository.save(bill); - } - - @Override - public List save(List billList) { - return billRepository.save(billList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = billMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return billRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return billRepository.findAll(); - } - - @Override - public void delete(Long id){ - billRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return billMapper.deleteByIds(ids); - } - - @Override - public Bill findById(Long id){ - return billRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return billMapper.insertList(list); - } - - @Override - public int insert(Bill bill){ - return billMapper.insert(bill); - } - - @Override - public int insertSelective(Bill bill){ - return billMapper.insertSelective(bill); - } - - @Override - public int updateByPrimaryKey(Bill bill){ - return billMapper.updateByPrimaryKey(bill); - } - - @Override - public int updateByPrimaryKeySelective(Bill bill){ - return billMapper.updateByPrimaryKeySelective(bill); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } - - @Override - public Bill createBill(BillRequest billRequest) { - Bill bill = new Bill(); - BeanUtils.copyPropertiesIgnoreNull(billRequest, bill); - //设置订单状态为待支付 - bill.setBillStatus(String.valueOf(BillStatus.WAIT_PAY.getCode())); - //商户订单号，必须要有 - bill.setOutTradeNo(String.valueOf(SnowFlakeId.getId())); - billMapper.insert(bill); - return bill; - } - - @Override - public Bill createBill(OauthUser oauthUser, BillRequest billRequest) { - Date createDate = new Date(); - Bill bill = new Bill(); - bill.setUserId(oauthUser.getId()); - bill.setCreateBy(oauthUser.getId()); - bill.setCreateDate(createDate); - bill.setBillDate(createDate); - BeanUtils.copyPropertiesIgnoreNull(billRequest, bill); - //设置订单状态为待支付 - bill.setBillStatus(String.valueOf(BillStatus.WAIT_PAY.getCode())); - //商户订单号，必须要有 - bill.setOutTradeNo(String.valueOf(SnowFlakeId.getId())); - billMapper.insert(bill); - return bill; - } - - @Override - public void billPayed(String outTradeNo) { - billMapper.updateBillStatusByOutTradeNo(String.valueOf(BillStatus.PAYED.getCode()), outTradeNo); - } - - @Override - public void billPayed(Bill bill) { - billMapper.updateBillStatusByOutTradeNo(String.valueOf(BillStatus.PAYED.getCode()), bill.getOutTradeNo()); - } - - @Override - public void createFreeBill(OauthUser oauthUser, BillRequest billRequest) { - - } - - @Override - public void billPayFailed(String outTradeNo) { - billMapper.updateBillStatusByOutTradeNo(String.valueOf(BillStatus.WAIT_PAY.getCode()), outTradeNo); - } - - @Override - public PageInfo getDtoList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = billMapper.getDtoList(params); - return new PageInfo<>(list); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java b/api/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java deleted file mode 100644 index efe0b70e00f9265e3c7b81be6114ddfa9b3eaeda..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java +++ /dev/null @@ -1,196 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.dto.DictTypeDto; -import com.simon.dto.EasyUiTreeGridDto; -import com.simon.mapper.DictTypeGroupMapper; -import com.simon.model.DictType; -import com.simon.model.DictTypeGroup; -import com.simon.repository.DictTypeGroupRepository; -import com.simon.service.DictTypeGroupService; -import lombok.var; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class DictTypeGroupServiceImpl implements DictTypeGroupService { - @Autowired - private DictTypeGroupMapper dictTypeGroupMapper; - - @Autowired - private DictTypeGroupRepository dictTypeGroupRepository; - - @Override - public long count() { - return dictTypeGroupRepository.count(); - } - - @Override - public DictTypeGroup save(DictTypeGroup dictTypeGroup){ - return dictTypeGroupRepository.save(dictTypeGroup); - } - - @Override - public List save(List dictTypeGroupList) { - return dictTypeGroupRepository.save(dictTypeGroupList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - - List list = dictTypeGroupMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return dictTypeGroupRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return dictTypeGroupRepository.findAll(); - } - - @Override - public void delete(Long id){ - dictTypeGroupRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return dictTypeGroupMapper.deleteByIds(ids); - } - - @Override - public DictTypeGroup findById(Long id){ - return dictTypeGroupRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return dictTypeGroupMapper.insertList(list); - } - - @Override - public int insert(DictTypeGroup dictTypeGroup){ - return dictTypeGroupMapper.insert(dictTypeGroup); - } - - @Override - public int insertSelective(DictTypeGroup dictTypeGroup){ - return dictTypeGroupMapper.insertSelective(dictTypeGroup); - } - - @Override - public int updateByPrimaryKey(DictTypeGroup dictTypeGroup){ - return dictTypeGroupMapper.updateByPrimaryKey(dictTypeGroup); - } - - @Override - public int updateByPrimaryKeySelective(DictTypeGroup dictTypeGroup){ - return dictTypeGroupMapper.updateByPrimaryKeySelective(dictTypeGroup); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } - - @Override - public List getDtos(Integer limit, Integer offset) { - List dtoList = new ArrayList<>(); - /*List groups = dictTypeGroupRepository.findAll(new PageRequest((offset/limit - 1), limit, Sort.Direction.DESC, "id")).getContent();*/ - PageHelper.startPage(offset / limit + 1, limit); - List list = dictTypeGroupMapper.getAll(); - PageInfo pageInfo = new PageInfo<>(list); - List resultList = pageInfo.getList(); - for(int i = 0; i < resultList.size(); i++){ - DictTypeGroup dictTypeGroup = resultList.get(i); - DictTypeDto dto = new DictTypeDto(); - dto.setId(String.valueOf(dictTypeGroup.getId())); - dto.setName(dictTypeGroup.getTypeGroupName()); - dto.setCode(dictTypeGroup.getTypeGroupCode()); - //一级菜单 - dto.setType(1); - dtoList.add(dto); - - List dictTypes = dictTypeGroup.getDictTypes(); - if (null != dictTypes && dictTypes.size() > 0){ - for(int j = 0; j < dictTypes.size(); j++){ - DictType dictType = dictTypes.get(j); - DictTypeDto subDto = new DictTypeDto(); - subDto.setId(String.valueOf(dictTypeGroup.getId()) + "-" + String.valueOf(dictType.getId())); - subDto.setName(dictType.getTypeName()); - subDto.setCode(dictType.getTypeCode()); - subDto.setOrderNum(dictType.getOrderNum()); - subDto.setPid(String.valueOf(dictTypeGroup.getId())); - //二级菜单 - subDto.setType(2); - - dtoList.add(subDto); - } - } - } - return dtoList; - } - - @Override - public PageInfo getTreeGridDtos(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - - var list = dictTypeGroupMapper.getTreeGridDtos(params); - return new PageInfo<>(list); - } - - @Override - public DictTypeGroup save(DictTypeDto dictTypeDto) { - DictTypeGroup dictTypeGroup = new DictTypeGroup(); - if (StringUtils.isNotEmpty(dictTypeDto.getId())){ - dictTypeGroup.setId(Long.parseLong(dictTypeDto.getId())); - } - dictTypeGroup.setCreateDate(new Date()); - dictTypeGroup.setTypeGroupName(dictTypeDto.getName()); - dictTypeGroup.setTypeGroupCode(dictTypeDto.getCode()); - return dictTypeGroupRepository.save(dictTypeGroup); - } - - @Override - public int countByTypeGroupCode(String typeGroupCode) { - return dictTypeGroupRepository.countByTypeGroupCode(typeGroupCode); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java b/api/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java deleted file mode 100644 index 6b3e7dca2625c5046e48327998fd6adfdf907ba7..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.dto.DictTypeDto; -import com.simon.mapper.DictTypeMapper; -import com.simon.model.DictType; -import com.simon.model.DictTypeGroup; -import com.simon.repository.DictTypeGroupRepository; -import com.simon.repository.DictTypeRepository; -import com.simon.service.DictTypeService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class DictTypeServiceImpl implements DictTypeService { - @Autowired - private DictTypeMapper dictTypeMapper; - - @Autowired - private DictTypeRepository dictTypeRepository; - - @Autowired - private DictTypeGroupRepository dictTypeGroupRepository; - - @Override - public long count() { - return dictTypeRepository.count(); - } - - @Override - public DictType save(DictType dictType){ - return dictTypeRepository.save(dictType); - } - - @Override - public List save(List dictTypeList) { - return dictTypeRepository.save(dictTypeList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = dictTypeMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return dictTypeRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return dictTypeRepository.findAll(); - } - - @Override - public void delete(Long id){ - dictTypeRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return dictTypeMapper.deleteByIds(ids); - } - - @Override - public DictType findById(Long id){ - return dictTypeRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return dictTypeMapper.insertList(list); - } - - @Override - public int insert(DictType dictType){ - return dictTypeMapper.insert(dictType); - } - - @Override - public int insertSelective(DictType dictType){ - return dictTypeMapper.insertSelective(dictType); - } - - @Override - public int updateByPrimaryKey(DictType dictType){ - return dictTypeMapper.updateByPrimaryKey(dictType); - } - - @Override - public int updateByPrimaryKeySelective(DictType dictType){ - return dictTypeMapper.updateByPrimaryKeySelective(dictType); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } - - @Override - public List getTypeByGroupCode(String groupCode) { - return dictTypeMapper.getByGroupCode(groupCode); - } - - @Override - public DictType save(DictTypeDto dictTypeDto) { - DictType dictType = new DictType(); - if(StringUtils.isNotEmpty(dictTypeDto.getId())){ - dictType.setId(Long.parseLong(dictTypeDto.getId())); - } - dictType.setCreateDate(new Date()); - dictType.setTypeGroupId(Long.parseLong(dictTypeDto.getPid())); - dictType.setTypeGroupCode(dictTypeGroupRepository.findOne(Long.parseLong(dictTypeDto.getPid())).getTypeGroupCode()); - dictType.setTypeName(dictTypeDto.getName()); - dictType.setTypeCode(dictTypeDto.getCode()); - dictType.setOrderNum(dictTypeDto.getOrderNum()); - return dictTypeRepository.save(dictType); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java b/api/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java deleted file mode 100644 index e668d54c3598c482a6ecf278e858db06c80951e2..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java +++ /dev/null @@ -1,128 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.mapper.NewsInfoMapper; -import com.simon.model.NewsInfo; -import com.simon.repository.NewsInfoRepository; -import com.simon.service.NewsInfoService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @create 2018-08-06 20:56:26 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class NewsInfoServiceImpl implements NewsInfoService { - @Autowired - private NewsInfoMapper newsInfoMapper; - - @Autowired - private NewsInfoRepository newsInfoRepository; - - @Override - public long count() { - return newsInfoRepository.count(); - } - - @Override - public NewsInfo save(NewsInfo newsInfo){ - return newsInfoRepository.save(newsInfo); - } - - @Override - public List save(List newsInfoList) { - return newsInfoRepository.save(newsInfoList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsInfoMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return newsInfoRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return newsInfoRepository.findAll(); - } - - @Override - public void delete(Long id){ - newsInfoRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return newsInfoMapper.deleteByIds(ids); - } - - @Override - public NewsInfo findById(Long id){ - return newsInfoRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return newsInfoMapper.insertList(list); - } - - @Override - public int insert(NewsInfo newsInfo){ - return newsInfoMapper.insert(newsInfo); - } - - @Override - public int insertSelective(NewsInfo newsInfo){ - return newsInfoMapper.insertSelective(newsInfo); - } - - @Override - public int updateByPrimaryKey(NewsInfo newsInfo) { - return newsInfoMapper.updateByPrimaryKey(newsInfo); - } - - @Override - public int updateByPrimaryKeySelective(NewsInfo newsInfo) { - return newsInfoMapper.updateByPrimaryKeySelective(newsInfo); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsInfoMapper.getList(params); - return new PageInfo<>(list); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java b/api/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java deleted file mode 100644 index d17fb683b8a761c32975320a9e7eb023980d43f1..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.mapper.NewsTagMapper; -import com.simon.model.NewsTag; -import com.simon.repository.NewsTagRepository; -import com.simon.service.NewsTagService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @create 2018-08-06 20:56:26 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class NewsTagServiceImpl implements NewsTagService { - @Autowired - private NewsTagMapper newsTagMapper; - - @Autowired - private NewsTagRepository newsTagRepository; - - @Override - public long count() { - return newsTagRepository.count(); - } - - @Override - public NewsTag save(NewsTag newsTag){ - return newsTagRepository.save(newsTag); - } - - @Override - public List save(List newsTagList) { - return newsTagRepository.save(newsTagList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = newsTagMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return newsTagRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return newsTagRepository.findAll(); - } - - @Override - public void delete(Long id){ - newsTagRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return newsTagMapper.deleteByIds(ids); - } - - @Override - public NewsTag findById(Long id){ - return newsTagRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return newsTagMapper.insertList(list); - } - - @Override - public int insert(NewsTag newsTag){ - return newsTagMapper.insert(newsTag); - } - - @Override - public int insertSelective(NewsTag newsTag){ - return newsTagMapper.insertSelective(newsTag); - } - - @Override - public int updateByPrimaryKey(NewsTag newsTag) { - return newsTagMapper.updateByPrimaryKey(newsTag); - } - - @Override - public int updateByPrimaryKeySelective(NewsTag newsTag) { - return newsTagMapper.updateByPrimaryKeySelective(newsTag); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java b/api/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java deleted file mode 100644 index a37fa73045062d921d6f500769f3340cfae4def4..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ - -package com.simon.service.impl; - -import com.simon.mapper.NoticeMsgMapper; -import com.simon.model.NoticeMsg; -import com.simon.service.NoticeMsgService; -import com.simon.repository.NoticeMsgRepository; -import com.simon.common.config.AppConfig; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-11-24 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class NoticeMsgServiceImpl implements NoticeMsgService { - @Autowired - private NoticeMsgMapper noticeMsgMapper; - - @Autowired - private NoticeMsgRepository noticeMsgRepository; - - @Override - public long count() { - return noticeMsgRepository.count(); - } - - @Override - public NoticeMsg save(NoticeMsg noticeMsg){ - return noticeMsgRepository.save(noticeMsg); - } - - @Override - public List save(List noticeMsgList) { - return noticeMsgRepository.save(noticeMsgList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy){ - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = noticeMsgMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return noticeMsgRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return noticeMsgRepository.findAll(); - } - - @Override - public void delete(Long id){ - noticeMsgRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return noticeMsgMapper.deleteByIds(ids); - } - - @Override - public NoticeMsg findById(Long id){ - return noticeMsgRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return noticeMsgMapper.insertList(list); - } - - @Override - public int insert(NoticeMsg noticeMsg){ - return noticeMsgMapper.insert(noticeMsg); - } - - @Override - public int insertSelective(NoticeMsg noticeMsg){ - return noticeMsgMapper.insertSelective(noticeMsg); - } - - @Override - public int updateByPrimaryKey(NoticeMsg noticeMsg){ - return noticeMsgMapper.updateByPrimaryKey(noticeMsg); - } - - @Override - public int updateByPrimaryKeySelective(NoticeMsg noticeMsg){ - return noticeMsgMapper.updateByPrimaryKeySelective(noticeMsg); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java b/api/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java deleted file mode 100644 index 85ee5807a604a0288aaf7a4430bdf3184345f936..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java +++ /dev/null @@ -1,416 +0,0 @@ -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.common.domain.UserEntity; -import com.simon.common.exception.CodeInvalidException; -import com.simon.common.exception.PhoneRegisteredException; -import com.simon.common.exception.UserExistsException; -import com.simon.common.exception.UserNotValidException; -import com.simon.common.utils.BeanUtils; -import com.simon.common.utils.UsernameUtil; -import com.simon.common.utils.ValidUtil; -import com.simon.dto.StatisticDto; -import com.simon.mapper.AuthorityMapper; -import com.simon.mapper.OauthUserMapper; -import com.simon.model.Authority; -import com.simon.model.OauthUser; -import com.simon.repository.AuthorityRepository; -import com.simon.repository.OauthUserRepository; -import com.simon.repository.VeriCodeRepository; -import com.simon.service.OauthUserService; -import lombok.extern.slf4j.Slf4j; -import lombok.var; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.Cache; -import org.springframework.cache.CacheManager; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 用户 - * - * @author simon - * @create 2018-07-31 19:56 - **/ -@Slf4j -@Service -@Transactional(rollbackFor = {Exception.class}) -public class OauthUserServiceImpl implements OauthUserService { - @Autowired - private OauthUserMapper oauthUserMapper; - - @Autowired - private OauthUserRepository oauthUserRepository; - - @Autowired - private VeriCodeRepository veriCodeRepository; - - @Autowired - private AuthorityRepository authorityRepository; - - @Autowired - private AuthorityMapper authorityMapper; - - @Autowired - private CacheManager cacheManager; - - private PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(11); - - @Override - public void register(Integer code, String phone, String password) { - //加密密码 - var encoder = new BCryptPasswordEncoder(11); - password = encoder.encode(password); - if(null != code){ - var veriCode = veriCodeRepository.findByPhoneAndCode(phone, code); - if(null != veriCode){ - register(phone, password); - }else{ - throw new CodeInvalidException(); - } - register(phone, password); - } - } - - @Transactional - @Override - public void register(String phone, String password){ - if(null != oauthUserRepository.findByPhone(phone)){ - throw new PhoneRegisteredException(); - } - - var oauthUser = new OauthUser(); - oauthUser.setUsername("user" + phone.substring(phone.length()-4, phone.length())); - oauthUser.setPhone(phone); - oauthUser.setPassword(password); - oauthUser.setEnabled(true); - oauthUser = oauthUserRepository.save(oauthUser); - - var authority = new Authority(); - authority.setUserId(oauthUser.getId()); - authority.setAuthority("ROLE_USER"); - authority = authorityRepository.save(authority); - } - - @Override - public int updatePwdByCode(String phone, Integer code, String newPwd) { - //加密密码 - var encoder = new BCryptPasswordEncoder(11); - newPwd = encoder.encode(newPwd); - var veriCode = veriCodeRepository.findByPhoneAndCode(phone, code); - if(null != veriCode){ - return oauthUserMapper.updatePwdByPhone(phone, newPwd); - }else{ - throw new CodeInvalidException(); - } - } - - @Override - public int updatePwdByOldPwd(String phone, String oldPwd, String newPwd) { - var oauthUser = oauthUserRepository.findByPhone(phone); - if(null == oauthUser){ - throw new UserNotValidException(); - } - - var encoder = new BCryptPasswordEncoder(11); - if(encoder.matches(oldPwd, oauthUser.getPassword())){ - oauthUser.setPassword(encoder.encode(newPwd)); - oauthUserRepository.save(oauthUser); - return 1; - }else{ - throw new UserNotValidException(); - } - } - - @Override - public long count() { - return oauthUserRepository.count(); - } - - @Override - public OauthUser save(OauthUser oauthUser) { - oauthUser.setPassword(passwordEncoder.encode(oauthUser.getPassword())); - oauthUserMapper.insertSelective(oauthUser); - - if(StringUtils.isEmpty(oauthUser.getAuthorities())){ - Authority authority = new Authority(); - authority.setUserId(oauthUser.getId()); - authority.setAuthority(AppConfig.ROLE_USER); - authorityMapper.insertSelective(authority); - }else{ - String[] authorities = oauthUser.getAuthorities().split(","); - List authorityList = new ArrayList<>(); - for(int i = 0; i < authorities.length; i++){ - Authority authority = new Authority(); - authority.setUserId(oauthUser.getId()); - authority.setAuthority(authorities[i]); - authorityList.add(authority); - } - authorityMapper.insertList(authorityList); - } - - return oauthUser; - } - - @Override - public List save(List modelList) { - return oauthUserRepository.save(modelList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = oauthUserMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable) { - return oauthUserRepository.findAll(pageable); - } - - @Override - public List findAll() { - return oauthUserRepository.findAll(); - } - - //@CacheEvict(key = "#id", cacheNames = "oauthUserCache") - @Override - public void delete(Long id) { - OauthUser oauthUser = oauthUserRepository.getOne(id); - oauthUserRepository.delete(id); - if(null != cacheManager){ - Cache cache = cacheManager.getCache("oauthUserCache"); - if(null != cache){ - cache.evict(oauthUser.getUsername()); - cache.evict(oauthUser.getEmail()); - cache.evict(oauthUser.getPhone()); - } - } - } - - @Override - public int deleteByIds(String ids) { - return oauthUserMapper.deleteByIds(ids); - } - - @Override - public OauthUser findById(Long id) { - return oauthUserRepository.findById(id); - } - - @Override - public int insertList(List list) { - return oauthUserMapper.insertList(list); - } - - @Override - public int insert(OauthUser oauthUser) { - return insertSelective(oauthUser); - } - - @Override - public int insertSelective(OauthUser oauthUser) { - oauthUser.setPassword(passwordEncoder.encode(oauthUser.getPassword())); - int result = oauthUserMapper.insertSelective(oauthUser); - - if(StringUtils.isEmpty(oauthUser.getAuthorities())){ - Authority authority = new Authority(); - authority.setUserId(oauthUser.getId()); - authority.setAuthority(AppConfig.ROLE_USER); - authorityMapper.insertSelective(authority); - }else{ - String[] authorities = oauthUser.getAuthorities().split(","); - List authorityList = new ArrayList<>(); - for(int i = 0; i < authorities.length; i++){ - Authority authority = new Authority(); - authority.setUserId(oauthUser.getId()); - authority.setAuthority(authorities[i]); - authorityList.add(authority); - } - authorityMapper.insertList(authorityList); - } - return result; - } - - //@CachePut(key="#model.username", cacheNames = {"oauthUserCache"}) - @Override - public int updateByPrimaryKey(OauthUser model) { - int affectLineNum = oauthUserMapper.updateByPrimaryKey(model); - if(null != cacheManager){ - Cache cache = cacheManager.getCache("oauthUserCache"); - if(null != cache){ - OauthUser target = oauthUserRepository.findById(model.getId()); - BeanUtils.copyPropertiesIgnoreNull(model, target); - - UserEntity userEntity = new UserEntity(target.getId(), target.getUsername(), target.getPassword(), target.getEnabled(), target.getPhone(), target.getEmail(), target.getAddress(), target.getBirth(), target.getAge(), target.getHeadPhoto(), target.getPersonBrief(), target.getSex(), authorityRepository.findByUserId(target.getId())); - - //刷新缓存 - cache.put(model.getUsername(), userEntity); - cache.put(model.getEmail(), userEntity); - cache.put(model.getPhone(), userEntity); - } - } - - return affectLineNum; - } - - //@CachePut(key="#model.username", cacheNames = {"oauthUserCache"}) - @Override - public int updateByPrimaryKeySelective(OauthUser model) { - int affectLineNum = oauthUserMapper.updateByPrimaryKeySelective(model); - if(null != cacheManager){ - Cache cache = cacheManager.getCache("oauthUserCache"); - if(null != cache){ - OauthUser target = oauthUserRepository.findById(model.getId()); - BeanUtils.copyPropertiesIgnoreNull(model, target); - - UserEntity userEntity = new UserEntity(target.getId(), target.getUsername(), target.getPassword(), target.getEnabled(), target.getPhone(), target.getEmail(), target.getAddress(), target.getBirth(), target.getAge(), target.getHeadPhoto(), target.getPersonBrief(), target.getSex(), authorityRepository.findByUserId(target.getId())); - - //刷新缓存 - cache.put(model.getUsername(), userEntity); - cache.put(model.getEmail(), userEntity); - cache.put(model.getPhone(), userEntity); - } - } - return affectLineNum; - } - - @Override - public PageInfo getList(Map params, Integer limit, Integer offset, String orderBy) { - orderBy = orderBy.trim(); - if (org.springframework.util.StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(offset/limit + 1, limit); - }else{ - PageHelper.startPage(offset/limit + 1, limit, orderBy); - } - - List list = oauthUserMapper.findByMap(params); - return new PageInfo<>(list); - } - - @Override - public List sexRatio() { - List statisticDtoList = oauthUserMapper.sexRatio(); - return statisticDtoList; - } - - @Override - public UserEntity findEntityByPhone(String phone) { - OauthUser oauthUser = oauthUserRepository.findByPhone(phone); - UserEntity userEntity = new UserEntity(); - BeanUtils.copyProperties(oauthUser, userEntity); - return userEntity; - } - - @Override - public UserEntity findEntityByUsername(String username) { - OauthUser oauthUser = oauthUserRepository.findByUsername(username); - UserEntity userEntity = new UserEntity(); - BeanUtils.copyProperties(oauthUser, userEntity); - return userEntity; - } - - @Override - public UserEntity findEntityByEmail(String email) { - OauthUser oauthUser = oauthUserRepository.findByEmail(email); - UserEntity userEntity = new UserEntity(); - BeanUtils.copyProperties(oauthUser, userEntity); - return userEntity; - } - - @Override - public OauthUser registerByPhone(String areaCode, String phone) { - OauthUser oauthUser = oauthUserRepository.findByPhone(phone); - if (null == oauthUser){ - oauthUser = new OauthUser(); - oauthUser.setAreaCode(areaCode); - oauthUser.setPhone(phone); - oauthUser.setEnabled(true); - oauthUser.setUsername(UsernameUtil.generateByPhone(phone)); - oauthUser = oauthUserRepository.save(oauthUser); - return oauthUser; - }else{ - throw new UserExistsException("用户已存在，请登录"); - } - } - - @Override - public OauthUser registerByAccountAndPwd(String account, String password) { - if(ValidUtil.isMobile(account)){ - //account是手机号 - - }else if(ValidUtil.isEmail(account)){ - //account是邮箱 - }else{ - - } - return null; - } - - @Override - public OauthUser registerByPhoneAndPwd(String phone, String password) { - OauthUser oauthUser = oauthUserRepository.findByPhone(phone); - if (null == oauthUser){ - oauthUser = new OauthUser(); - oauthUser.setUsername(UsernameUtil.generateByPhone(phone)); - oauthUser.setPassword(passwordEncoder.encode(password)); - oauthUser.setEnabled(true); - oauthUser.setPhone(phone); - oauthUser = oauthUserRepository.save(oauthUser); - return oauthUser; - }else{ - throw new UserExistsException("用户已存在，请登录"); - } - } - - @Override - public OauthUser registerByEmailAndPwd(String email, String password) { - OauthUser oauthUser = oauthUserRepository.findByEmail(email); - if (null == oauthUser){ - oauthUser = new OauthUser(); - oauthUser.setUsername(UsernameUtil.generateByEmail(email)); - oauthUser.setPassword(passwordEncoder.encode(password)); - oauthUser.setEnabled(true); - oauthUser.setEmail(email); - oauthUser = oauthUserRepository.save(oauthUser); - return oauthUser; - }else{ - throw new UserExistsException("用户已存在，请登录"); - } - } - - @Override - public OauthUser registerByUsernameAndPwd(String username, String password) { - OauthUser oauthUser = oauthUserRepository.findByUsername(username); - if (null == oauthUser){ - oauthUser = new OauthUser(); - oauthUser.setUsername(username); - oauthUser.setPassword(passwordEncoder.encode(password)); - oauthUser.setEnabled(true); - oauthUser = oauthUserRepository.save(oauthUser); - return oauthUser; - }else{ - throw new UserExistsException("用户已存在，请登录"); - } - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java b/api/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java deleted file mode 100644 index c79a16737b57a78cbfc60283361e330fe7034390..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.mapper.ResetPwdInfoMapper; -import com.simon.model.ResetPwdInfo; -import com.simon.repository.ResetPwdInfoRepository; -import com.simon.service.ResetPwdInfoService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @create 2018-08-06 20:56:26 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class ResetPwdInfoServiceImpl implements ResetPwdInfoService { - @Autowired - private ResetPwdInfoMapper resetPwdInfoMapper; - - @Autowired - private ResetPwdInfoRepository resetPwdInfoRepository; - - @Override - public long count() { - return resetPwdInfoRepository.count(); - } - - @Override - public ResetPwdInfo save(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoRepository.save(resetPwdInfo); - } - - @Override - public List save(List resetPwdInfoList) { - return resetPwdInfoRepository.save(resetPwdInfoList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = resetPwdInfoMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return resetPwdInfoRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return resetPwdInfoRepository.findAll(); - } - - @Override - public void delete(Long id){ - resetPwdInfoRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return resetPwdInfoMapper.deleteByIds(ids); - } - - @Override - public ResetPwdInfo findById(Long id){ - return resetPwdInfoRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return resetPwdInfoMapper.insertList(list); - } - - @Override - public int insert(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoMapper.insert(resetPwdInfo); - } - - @Override - public int insertSelective(ResetPwdInfo resetPwdInfo){ - return resetPwdInfoMapper.insertSelective(resetPwdInfo); - } - - @Override - public int updateByPrimaryKey(ResetPwdInfo resetPwdInfo) { - return resetPwdInfoMapper.updateByPrimaryKey(resetPwdInfo); - } - - @Override - public int updateByPrimaryKeySelective(ResetPwdInfo resetPwdInfo) { - return resetPwdInfoMapper.updateByPrimaryKeySelective(resetPwdInfo); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java b/api/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java deleted file mode 100644 index 20535ff5c4d8a5e36112b4d97c6f55d34f049164..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ - -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.mapper.SideMenuMapper; -import com.simon.model.SideMenu; -import com.simon.repository.SideMenuRepository; -import com.simon.service.SideMenuService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-09-26 -**/ -@Service -@Transactional(rollbackFor = {Exception.class}) -public class SideMenuServiceImpl implements SideMenuService { - @Autowired - private SideMenuMapper sideMenuMapper; - - @Autowired - private SideMenuRepository sideMenuRepository; - - @Override - public long count() { - return sideMenuRepository.count(); - } - - @Override - public SideMenu save(SideMenu sideMenu){ - return sideMenuRepository.save(sideMenu); - } - - @Override - public List save(List sideMenuList) { - return sideMenuRepository.save(sideMenuList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (org.apache.commons.lang3.StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = sideMenuMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return sideMenuRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return sideMenuMapper.findAll(); - } - - @Override - public void delete(Long id){ - sideMenuRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return sideMenuMapper.deleteByIds(ids); - } - - @Override - public SideMenu findById(Long id){ - return sideMenuRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return sideMenuMapper.insertList(list); - } - - @Override - public int insert(SideMenu sideMenu){ - return sideMenuMapper.insert(sideMenu); - } - - @Override - public int insertSelective(SideMenu sideMenu){ - return sideMenuMapper.insertSelective(sideMenu); - } - - @Override - public int updateByPrimaryKey(SideMenu sideMenu){ - return sideMenuMapper.updateByPrimaryKey(sideMenu); - } - - @Override - public int updateByPrimaryKeySelective(SideMenu sideMenu){ - return sideMenuMapper.updateByPrimaryKeySelective(sideMenu); - } - - @Override - public PageInfo getAll(Map params, Integer limit, Integer offset) { - PageHelper.startPage(offset/limit + 1, limit); - List list = sideMenuMapper.selectLevel1(params); - PageInfo pageInfo = new PageInfo<>(list); - List pids = new ArrayList<>(); - List resultList = pageInfo.getList(); - for(SideMenu sideMenu : resultList){ - pids.add(sideMenu.getId()); - } - resultList.addAll(sideMenuMapper.selectByPidList(pids)); - pageInfo.setList(resultList); - return pageInfo; - } - - @Override - public List getAll() { - return sideMenuMapper.selectTreeGrid(); - } - - @Override - public PageInfo getList(Map params, Integer limit, Integer offset, String orderBy) { - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(offset/limit + 1, limit); - }else{ - PageHelper.startPage(offset/limit + 1, limit, orderBy); - } - - List list = sideMenuMapper.selectLevel1(params); - return new PageInfo<>(list); - } -} \ No newline at end of file diff --git a/api/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java b/api/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java deleted file mode 100644 index fa40bb04b360fa775886a912ff891fe03aaf465c..0000000000000000000000000000000000000000 --- a/api/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.simon.service.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simon.common.config.AppConfig; -import com.simon.mapper.VeriCodeMapper; -import com.simon.model.VeriCode; -import com.simon.repository.VeriCodeRepository; -import com.simon.service.VeriCodeService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 验证码 - * - * @author simon - * @create 2018-07-31 15:24 - **/ - -@Slf4j -@Service -public class VeriCodeServiceImpl implements VeriCodeService { - @Autowired - private VeriCodeMapper veriCodeMapper; - - @Autowired - private VeriCodeRepository veriCodeRepository; - - @Override - public long count() { - return veriCodeRepository.count(); - } - - @Override - public VeriCode save(VeriCode veriCode){ - return veriCodeRepository.save(veriCode); - } - - @Override - public List save(List veriCodeList) { - return veriCodeRepository.save(veriCodeList); - } - - @Override - public PageInfo findAll(Integer pageNo, Integer pageSize, String orderBy) { - if (null == pageSize){ - pageSize = AppConfig.DEFAULT_PAGE_SIZE; - } - orderBy = orderBy.trim(); - if (StringUtils.isEmpty(orderBy)){ - PageHelper.startPage(pageNo, pageSize); - }else{ - PageHelper.startPage(pageNo, pageSize, orderBy); - } - List list = veriCodeMapper.selectAll(); - return new PageInfo<>(list); - } - - @Override - public Page findAll(Pageable pageable){ - return veriCodeRepository.findAll(pageable); - } - - @Override - public List findAll(){ - return veriCodeRepository.findAll(); - } - - @Override - public void delete(Long id){ - veriCodeRepository.delete(id); - } - - @Override - public int deleteByIds(String ids){ - return veriCodeMapper.deleteByIds(ids); - } - - @Override - public VeriCode findById(Long id){ - return veriCodeRepository.findOne(id); - } - - @Override - public int insertList(List list){ - return veriCodeMapper.insertList(list); - } - - @Override - public int insert(VeriCode veriCode){ - return veriCodeMapper.insert(veriCode); - } - - @Override - public int insertSelective(VeriCode veriCode){ - return veriCodeMapper.insertSelective(veriCode); - } - - @Override - public int updateByPrimaryKey(VeriCode veriCode) { - return veriCodeMapper.updateByPrimaryKey(veriCode); - } - - @Override - public int updateByPrimaryKeySelective(VeriCode veriCode) { - return veriCodeMapper.updateByPrimaryKeySelective(veriCode); - } - - @Override - public PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy) { - return null; - } - - @Override - public VeriCode findByPhone(String phone) { - return veriCodeRepository.findByPhone(phone); - } - - @Override - public VeriCode findByPhoneAndCode(String phone, Integer code) { - return veriCodeRepository.findByPhoneAndCode(phone, code); - } -} diff --git a/api/src/main/resources/mapping/AuthorityMapper.xml b/api/src/main/resources/mapping/AuthorityMapper.xml deleted file mode 100644 index f3b525b7c4198665cbbfb20c23a858ccd4cfd24b..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/AuthorityMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - DELETE - FROM - t_authorities - WHERE - user_id IN - - - #{item} - - - - \ No newline at end of file diff --git a/api/src/main/resources/mapping/DictTypeGroupMapper.xml b/api/src/main/resources/mapping/DictTypeGroupMapper.xml deleted file mode 100644 index f42952d693f1092eb0c5c174804c4c1f60b2e178..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/DictTypeGroupMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api/src/main/resources/mapping/DictTypeMapper.xml b/api/src/main/resources/mapping/DictTypeMapper.xml deleted file mode 100644 index 309c74d571359faa970c9960ec66d01f3c5d8cf8..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/DictTypeMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api/src/main/resources/mapping/NewsInfoMapper.xml b/api/src/main/resources/mapping/NewsInfoMapper.xml deleted file mode 100644 index 72d534a3407a63f6f19dedabff84112540e1a1c2..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/NewsInfoMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api/src/main/resources/mapping/OauthUserMapper.xml b/api/src/main/resources/mapping/OauthUserMapper.xml deleted file mode 100644 index 6bdebe860ec91eeaf7b1eeac49d729071ca171d4..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/OauthUserMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, username, password, enabled, email, phone, enable - - - - update t_users set password=#{password} where phone=#{phone} - - - - - - \ No newline at end of file diff --git a/api/src/main/resources/mapping/SideMenuMapper.xml b/api/src/main/resources/mapping/SideMenuMapper.xml deleted file mode 100644 index f5d8103a5968f5f79bb8fb97687cebdbe46ddc3c..0000000000000000000000000000000000000000 --- a/api/src/main/resources/mapping/SideMenuMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index b4f4ced8fecd1b98b68f6e4dc5ef0bf21da0bda3..90c72430ffd37be7926079527e45b286d3c9c7e0 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -151,6 +151,31 @@ mysql-connector-java runtime --> + + + com.alibaba + easyexcel + + + + + com.alibaba + dayu + + + com.alibaba + dayu-source + + + + + org.quartz-scheduler + quartz + + + org.quartz-scheduler + quartz-jobs + diff --git a/common/src/main/java/com/simon/common/utils/DateUtil.java b/common/src/main/java/com/simon/common/utils/DateUtil.java index 3ca4da8257e6ace2beccbe2cb4296634ae00dcd8..74b84581e0af2aee7cdafc5379d6b40ee16c5c05 100644 --- a/common/src/main/java/com/simon/common/utils/DateUtil.java +++ b/common/src/main/java/com/simon/common/utils/DateUtil.java @@ -8,15 +8,10 @@ import java.util.Date; * 时间工具类 * * @author simon - * @create 2018-06-10 11:06 + * @date 2018-06-10 11:06 **/ public class DateUtil { - private static final SimpleDateFormat ISO8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZZ"); - - public static String formatISO(Date date) { - return ISO8601_DATE_FORMAT.format(date); - } public static String format(Date date, String pattern) { SimpleDateFormat sdf = new SimpleDateFormat(pattern); diff --git a/web/src/main/java/com/simon/dto/AuthorityDto.java b/common/src/main/java/com/simon/dto/AuthorityDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/AuthorityDto.java rename to common/src/main/java/com/simon/dto/AuthorityDto.java diff --git a/web/src/main/java/com/simon/dto/ButtonAuthorityDto.java b/common/src/main/java/com/simon/dto/ButtonAuthorityDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/ButtonAuthorityDto.java rename to common/src/main/java/com/simon/dto/ButtonAuthorityDto.java diff --git a/web/src/main/java/com/simon/dto/ChangePasswordDto.java b/common/src/main/java/com/simon/dto/ChangePasswordDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/ChangePasswordDto.java rename to common/src/main/java/com/simon/dto/ChangePasswordDto.java diff --git a/web/src/main/java/com/simon/dto/DictTypeDto.java b/common/src/main/java/com/simon/dto/DictTypeDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/DictTypeDto.java rename to common/src/main/java/com/simon/dto/DictTypeDto.java diff --git a/web/src/main/java/com/simon/dto/EasyUiSideMenuDto.java b/common/src/main/java/com/simon/dto/EasyUiSideMenuDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/EasyUiSideMenuDto.java rename to common/src/main/java/com/simon/dto/EasyUiSideMenuDto.java diff --git a/web/src/main/java/com/simon/dto/EasyUiTreeDto.java b/common/src/main/java/com/simon/dto/EasyUiTreeDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/EasyUiTreeDto.java rename to common/src/main/java/com/simon/dto/EasyUiTreeDto.java diff --git a/web/src/main/java/com/simon/dto/EasyUiTreeGridDto.java b/common/src/main/java/com/simon/dto/EasyUiTreeGridDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/EasyUiTreeGridDto.java rename to common/src/main/java/com/simon/dto/EasyUiTreeGridDto.java diff --git a/web/src/main/java/com/simon/dto/FontAwesomeDto.java b/common/src/main/java/com/simon/dto/FontAwesomeDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/FontAwesomeDto.java rename to common/src/main/java/com/simon/dto/FontAwesomeDto.java diff --git a/web/src/main/java/com/simon/dto/GenCodeDto.java b/common/src/main/java/com/simon/dto/GenCodeDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/GenCodeDto.java rename to common/src/main/java/com/simon/dto/GenCodeDto.java diff --git a/web/src/main/java/com/simon/dto/MenuDO.java b/common/src/main/java/com/simon/dto/MenuDO.java similarity index 100% rename from web/src/main/java/com/simon/dto/MenuDO.java rename to common/src/main/java/com/simon/dto/MenuDO.java diff --git a/web/src/main/java/com/simon/dto/SideMenuDto.java b/common/src/main/java/com/simon/dto/SideMenuDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/SideMenuDto.java rename to common/src/main/java/com/simon/dto/SideMenuDto.java diff --git a/web/src/main/java/com/simon/dto/StatisticDto.java b/common/src/main/java/com/simon/dto/StatisticDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/StatisticDto.java rename to common/src/main/java/com/simon/dto/StatisticDto.java diff --git a/web/src/main/java/com/simon/dto/Tree.java b/common/src/main/java/com/simon/dto/Tree.java similarity index 100% rename from web/src/main/java/com/simon/dto/Tree.java rename to common/src/main/java/com/simon/dto/Tree.java diff --git a/web/src/main/java/com/simon/dto/ueditor/FileInfo.java b/common/src/main/java/com/simon/dto/ueditor/FileInfo.java similarity index 100% rename from web/src/main/java/com/simon/dto/ueditor/FileInfo.java rename to common/src/main/java/com/simon/dto/ueditor/FileInfo.java diff --git a/web/src/main/java/com/simon/dto/vue/CascaderOptionDto.java b/common/src/main/java/com/simon/dto/vue/CascaderOptionDto.java similarity index 100% rename from web/src/main/java/com/simon/dto/vue/CascaderOptionDto.java rename to common/src/main/java/com/simon/dto/vue/CascaderOptionDto.java diff --git a/web/src/main/java/com/simon/mapper/AccountBindMapper.java b/common/src/main/java/com/simon/mapper/AccountBindMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/AccountBindMapper.java rename to common/src/main/java/com/simon/mapper/AccountBindMapper.java diff --git a/web/src/main/java/com/simon/mapper/AuthorityMapper.java b/common/src/main/java/com/simon/mapper/AuthorityMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/AuthorityMapper.java rename to common/src/main/java/com/simon/mapper/AuthorityMapper.java diff --git a/web/src/main/java/com/simon/mapper/BillMapper.java b/common/src/main/java/com/simon/mapper/BillMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/BillMapper.java rename to common/src/main/java/com/simon/mapper/BillMapper.java diff --git a/web/src/main/java/com/simon/mapper/CityMapper.java b/common/src/main/java/com/simon/mapper/CityMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/CityMapper.java rename to common/src/main/java/com/simon/mapper/CityMapper.java diff --git a/web/src/main/java/com/simon/mapper/ColumnUiMapper.java b/common/src/main/java/com/simon/mapper/ColumnUiMapper.java similarity index 88% rename from web/src/main/java/com/simon/mapper/ColumnUiMapper.java rename to common/src/main/java/com/simon/mapper/ColumnUiMapper.java index 87b677d1011cbcbc7fcc7655a7540189665b8e34..51c1b87d1ca3f9db9fcac620884298a1b776127a 100644 --- a/web/src/main/java/com/simon/mapper/ColumnUiMapper.java +++ b/common/src/main/java/com/simon/mapper/ColumnUiMapper.java @@ -3,9 +3,7 @@ package com.simon.mapper; import com.simon.common.mapper.MyMapper; import com.simon.model.ColumnUi; import com.simon.provider.ColumnUiProvider; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.ResultMap; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; import java.util.List; diff --git a/web/src/main/java/com/simon/mapper/CountryMapper.java b/common/src/main/java/com/simon/mapper/CountryMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/CountryMapper.java rename to common/src/main/java/com/simon/mapper/CountryMapper.java diff --git a/web/src/main/java/com/simon/mapper/DictTypeGroupMapper.java b/common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/DictTypeGroupMapper.java rename to common/src/main/java/com/simon/mapper/DictTypeGroupMapper.java diff --git a/web/src/main/java/com/simon/mapper/DictTypeMapper.java b/common/src/main/java/com/simon/mapper/DictTypeMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/DictTypeMapper.java rename to common/src/main/java/com/simon/mapper/DictTypeMapper.java diff --git a/web/src/main/java/com/simon/mapper/FontAwesomeMapper.java b/common/src/main/java/com/simon/mapper/FontAwesomeMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/FontAwesomeMapper.java rename to common/src/main/java/com/simon/mapper/FontAwesomeMapper.java diff --git a/web/src/main/java/com/simon/mapper/LogLoginMapper.java b/common/src/main/java/com/simon/mapper/LogLoginMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/LogLoginMapper.java rename to common/src/main/java/com/simon/mapper/LogLoginMapper.java diff --git a/web/src/main/java/com/simon/mapper/LoggingEventMapper.java b/common/src/main/java/com/simon/mapper/LoggingEventMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/LoggingEventMapper.java rename to common/src/main/java/com/simon/mapper/LoggingEventMapper.java diff --git a/web/src/main/java/com/simon/mapper/NewsInfoMapper.java b/common/src/main/java/com/simon/mapper/NewsInfoMapper.java similarity index 92% rename from web/src/main/java/com/simon/mapper/NewsInfoMapper.java rename to common/src/main/java/com/simon/mapper/NewsInfoMapper.java index fcce9ee81e6cc7ebe0787e4c11ffa88e9fffbd98..d0517742cd3d7c6622a4ce77d605fad002691ceb 100644 --- a/web/src/main/java/com/simon/mapper/NewsInfoMapper.java +++ b/common/src/main/java/com/simon/mapper/NewsInfoMapper.java @@ -4,7 +4,6 @@ import com.simon.common.mapper.MyMapper; import com.simon.model.NewsInfo; import com.simon.provider.NewsInfoProvider; import org.apache.ibatis.annotations.SelectProvider; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/mapper/NewsTagMapper.java b/common/src/main/java/com/simon/mapper/NewsTagMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/NewsTagMapper.java rename to common/src/main/java/com/simon/mapper/NewsTagMapper.java diff --git a/web/src/main/java/com/simon/mapper/NoticeMsgMapper.java b/common/src/main/java/com/simon/mapper/NoticeMsgMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/NoticeMsgMapper.java rename to common/src/main/java/com/simon/mapper/NoticeMsgMapper.java diff --git a/web/src/main/java/com/simon/mapper/OauthUserMapper.java b/common/src/main/java/com/simon/mapper/OauthUserMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/OauthUserMapper.java rename to common/src/main/java/com/simon/mapper/OauthUserMapper.java diff --git a/web/src/main/java/com/simon/mapper/ProvinceMapper.java b/common/src/main/java/com/simon/mapper/ProvinceMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/ProvinceMapper.java rename to common/src/main/java/com/simon/mapper/ProvinceMapper.java diff --git a/web/src/main/java/com/simon/mapper/QrCodeMapper.java b/common/src/main/java/com/simon/mapper/QrCodeMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/QrCodeMapper.java rename to common/src/main/java/com/simon/mapper/QrCodeMapper.java diff --git a/web/src/main/java/com/simon/mapper/QuartzJobMapper.java b/common/src/main/java/com/simon/mapper/QuartzJobMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/QuartzJobMapper.java rename to common/src/main/java/com/simon/mapper/QuartzJobMapper.java diff --git a/web/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java b/common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java rename to common/src/main/java/com/simon/mapper/ResetPwdInfoMapper.java diff --git a/web/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java b/common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java rename to common/src/main/java/com/simon/mapper/SideMenuAuthorityMapper.java diff --git a/web/src/main/java/com/simon/mapper/SideMenuMapper.java b/common/src/main/java/com/simon/mapper/SideMenuMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/SideMenuMapper.java rename to common/src/main/java/com/simon/mapper/SideMenuMapper.java diff --git a/web/src/main/java/com/simon/mapper/TownMapper.java b/common/src/main/java/com/simon/mapper/TownMapper.java similarity index 87% rename from web/src/main/java/com/simon/mapper/TownMapper.java rename to common/src/main/java/com/simon/mapper/TownMapper.java index 3aad9b448eb1037a5533410c32ec37096616abc4..74fa7e41234beb3a1787d4b7bfffeebe329e698f 100644 --- a/web/src/main/java/com/simon/mapper/TownMapper.java +++ b/common/src/main/java/com/simon/mapper/TownMapper.java @@ -3,9 +3,7 @@ package com.simon.mapper; import com.simon.common.mapper.MyMapper; import com.simon.model.Town; import com.simon.provider.TownProvider; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.ResultMap; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; import java.util.List; diff --git a/web/src/main/java/com/simon/mapper/VeriCodeMapper.java b/common/src/main/java/com/simon/mapper/VeriCodeMapper.java similarity index 100% rename from web/src/main/java/com/simon/mapper/VeriCodeMapper.java rename to common/src/main/java/com/simon/mapper/VeriCodeMapper.java diff --git a/web/src/main/java/com/simon/mapper/VillageMapper.java b/common/src/main/java/com/simon/mapper/VillageMapper.java similarity index 93% rename from web/src/main/java/com/simon/mapper/VillageMapper.java rename to common/src/main/java/com/simon/mapper/VillageMapper.java index ca91fba6b9e3bd2c15c227c92e4a6c651054af52..b1e742cbca368125da924b5943dd8b4439cc55ef 100644 --- a/web/src/main/java/com/simon/mapper/VillageMapper.java +++ b/common/src/main/java/com/simon/mapper/VillageMapper.java @@ -5,7 +5,6 @@ import com.simon.model.Village; import com.simon.provider.VillageProvider; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.SelectProvider; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/model/AccountBind.java b/common/src/main/java/com/simon/model/AccountBind.java similarity index 100% rename from web/src/main/java/com/simon/model/AccountBind.java rename to common/src/main/java/com/simon/model/AccountBind.java diff --git a/common/src/main/java/com/simon/model/Authority.java b/common/src/main/java/com/simon/model/Authority.java index 0716ed0b730027fd50e1bc3e60aab390509de7a8..c9355a976d5212c540f47dae6e22f22221e39379 100644 --- a/common/src/main/java/com/simon/model/Authority.java +++ b/common/src/main/java/com/simon/model/Authority.java @@ -15,18 +15,18 @@ import tk.mybatis.mapper.annotation.KeySql; import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** - * @author SimonSun - * @date 2018-09-12 - **/ -@ApiModel(value = "权限") +* @author SimonSun +* @date 2018-09-12 +**/ +@ApiModel(value = "权限", description = "该文件的任何修改必须同步到common下的相同文件") @Data @EqualsAndHashCode(callSuper = false) @Entity @Table(name="t_authorities") -public class Authority implements GrantedAuthority, Serializable, Comparable{ +public class Authority implements GrantedAuthority, Serializable, Comparable{ private static final long serialVersionUID = 1L; @JSONField(serializeUsing = ToStringSerializer.class) @@ -44,7 +44,7 @@ public class Authority implements GrantedAuthority, Serializable, Comparable { PageInfo getList(Map params, Integer pageNo, Integer pageSize, String orderBy); diff --git a/api/src/main/java/com/simon/service/NewsTagService.java b/common/src/main/java/com/simon/service/NewsTagService.java similarity index 100% rename from api/src/main/java/com/simon/service/NewsTagService.java rename to common/src/main/java/com/simon/service/NewsTagService.java diff --git a/api/src/main/java/com/simon/service/NoticeMsgService.java b/common/src/main/java/com/simon/service/NoticeMsgService.java similarity index 99% rename from api/src/main/java/com/simon/service/NoticeMsgService.java rename to common/src/main/java/com/simon/service/NoticeMsgService.java index 55e55fce8b80796a05fa4c286b1cf3aa1661574d..51144a03512bc27aef6a77184f36ca5a5631269d 100644 --- a/api/src/main/java/com/simon/service/NoticeMsgService.java +++ b/common/src/main/java/com/simon/service/NoticeMsgService.java @@ -1,6 +1,7 @@ package com.simon.service; -import com.simon.model.NoticeMsg; + import com.simon.common.service.BasicService; +import com.simon.model.NoticeMsg; /** * @author SimonSun diff --git a/web/src/main/java/com/simon/service/OauthUserService.java b/common/src/main/java/com/simon/service/OauthUserService.java similarity index 96% rename from web/src/main/java/com/simon/service/OauthUserService.java rename to common/src/main/java/com/simon/service/OauthUserService.java index 40d5a934c62d3d3174cdca79291f240cfcce7e71..6ddc0b49a16c7bf15471cbef1b702b5f9b539c28 100644 --- a/web/src/main/java/com/simon/service/OauthUserService.java +++ b/common/src/main/java/com/simon/service/OauthUserService.java @@ -32,10 +32,11 @@ public interface OauthUserService extends BasicService { /** * 根据手机号注册 + * @param areaCode 手机区号 * @param phone 手机号 * @return 注册账号信息 */ - OauthUser registerByPhone(String phone); + OauthUser registerByPhone(String areaCode, String phone); /** * 根据账号(用户名、手机号、邮箱)+密码注册 diff --git a/web/src/main/java/com/simon/service/ProvinceService.java b/common/src/main/java/com/simon/service/ProvinceService.java similarity index 100% rename from web/src/main/java/com/simon/service/ProvinceService.java rename to common/src/main/java/com/simon/service/ProvinceService.java diff --git a/api/src/main/java/com/simon/service/ResetPwdInfoService.java b/common/src/main/java/com/simon/service/ResetPwdInfoService.java similarity index 100% rename from api/src/main/java/com/simon/service/ResetPwdInfoService.java rename to common/src/main/java/com/simon/service/ResetPwdInfoService.java diff --git a/web/src/main/java/com/simon/service/SideMenuAuthorityService.java b/common/src/main/java/com/simon/service/SideMenuAuthorityService.java similarity index 99% rename from web/src/main/java/com/simon/service/SideMenuAuthorityService.java rename to common/src/main/java/com/simon/service/SideMenuAuthorityService.java index 15c75f8eb4e2e30be2cf6263644f5c6b0e20e324..37c552f73932361c285f1f91aacd5d8265e2b59c 100644 --- a/web/src/main/java/com/simon/service/SideMenuAuthorityService.java +++ b/common/src/main/java/com/simon/service/SideMenuAuthorityService.java @@ -1,6 +1,7 @@ package com.simon.service; -import com.simon.model.SideMenuAuthority; + import com.simon.common.service.BasicService; +import com.simon.model.SideMenuAuthority; /** * @author SimonSun diff --git a/web/src/main/java/com/simon/service/SideMenuService.java b/common/src/main/java/com/simon/service/SideMenuService.java similarity index 100% rename from web/src/main/java/com/simon/service/SideMenuService.java rename to common/src/main/java/com/simon/service/SideMenuService.java diff --git a/web/src/main/java/com/simon/service/SmsService.java b/common/src/main/java/com/simon/service/SmsService.java similarity index 81% rename from web/src/main/java/com/simon/service/SmsService.java rename to common/src/main/java/com/simon/service/SmsService.java index c317037bb105477687aa89748581ccf6318dc4ab..a293759bd27af161a77adf181a55eeeb4314d936 100644 --- a/web/src/main/java/com/simon/service/SmsService.java +++ b/common/src/main/java/com/simon/service/SmsService.java @@ -12,5 +12,5 @@ import com.taobao.api.ApiException; public interface SmsService { boolean sendIdentifyCode(String mobile) throws ApiException; - boolean checkCode(String mobile,String code); + boolean checkCode(String mobile, String code); } diff --git a/web/src/main/java/com/simon/service/TableService.java b/common/src/main/java/com/simon/service/TableService.java similarity index 100% rename from web/src/main/java/com/simon/service/TableService.java rename to common/src/main/java/com/simon/service/TableService.java diff --git a/web/src/main/java/com/simon/service/TownService.java b/common/src/main/java/com/simon/service/TownService.java similarity index 99% rename from web/src/main/java/com/simon/service/TownService.java rename to common/src/main/java/com/simon/service/TownService.java index af7a30bb4cf0de2f515a286fe7e1be2774e9044a..2ac77feeeaca64df05bed6f42a05b33924cfdcab 100644 --- a/web/src/main/java/com/simon/service/TownService.java +++ b/common/src/main/java/com/simon/service/TownService.java @@ -1,6 +1,7 @@ package com.simon.service; -import com.simon.model.Town; + import com.simon.common.service.BasicService; +import com.simon.model.Town; /** * @author SimonSun diff --git a/api/src/main/java/com/simon/service/VeriCodeService.java b/common/src/main/java/com/simon/service/VeriCodeService.java similarity index 100% rename from api/src/main/java/com/simon/service/VeriCodeService.java rename to common/src/main/java/com/simon/service/VeriCodeService.java diff --git a/web/src/main/java/com/simon/service/VillageService.java b/common/src/main/java/com/simon/service/VillageService.java similarity index 99% rename from web/src/main/java/com/simon/service/VillageService.java rename to common/src/main/java/com/simon/service/VillageService.java index 404bcd13ea73214fa7ec33915ac6e365d44edf1d..3d31e1857c16d350db3cdade4671bfc970ba9293 100644 --- a/web/src/main/java/com/simon/service/VillageService.java +++ b/common/src/main/java/com/simon/service/VillageService.java @@ -1,6 +1,7 @@ package com.simon.service; -import com.simon.model.Village; + import com.simon.common.service.BasicService; +import com.simon.model.Village; /** * @author SimonSun diff --git a/web/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java b/common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java rename to common/src/main/java/com/simon/service/impl/AccountBindServiceImpl.java diff --git a/api/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java b/common/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java similarity index 100% rename from api/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java rename to common/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java b/common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java rename to common/src/main/java/com/simon/service/impl/AuthorityServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/BillServiceImpl.java b/common/src/main/java/com/simon/service/impl/BillServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/BillServiceImpl.java rename to common/src/main/java/com/simon/service/impl/BillServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/CityServiceImpl.java b/common/src/main/java/com/simon/service/impl/CityServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/CityServiceImpl.java rename to common/src/main/java/com/simon/service/impl/CityServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java b/common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java rename to common/src/main/java/com/simon/service/impl/ColumnUiServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/CountryServiceImpl.java b/common/src/main/java/com/simon/service/impl/CountryServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/CountryServiceImpl.java rename to common/src/main/java/com/simon/service/impl/CountryServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java similarity index 99% rename from web/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java rename to common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java index 35a9888d2e83f627e6df6e658ec2cff604b4286a..928a51d0b84ee6fbec5d4326f702b7803c98eee9 100644 --- a/web/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/DictTypeGroupServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java b/common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java rename to common/src/main/java/com/simon/service/impl/DictTypeServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java b/common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java rename to common/src/main/java/com/simon/service/impl/FontAwesomeServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/LoggingEventServiceImpl.java b/common/src/main/java/com/simon/service/impl/LoggingEventServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/LoggingEventServiceImpl.java rename to common/src/main/java/com/simon/service/impl/LoggingEventServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java b/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java similarity index 98% rename from web/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java rename to common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java index 36c922d4cc68c813099cb61dc181e6d4e509e2da..5c905cdc5c0572e6e565fdb719e783de410b31f8 100644 --- a/web/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/NewsInfoServiceImpl.java @@ -1,23 +1,21 @@ package com.simon.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; import com.simon.mapper.NewsInfoMapper; import com.simon.model.NewsInfo; -import com.simon.service.NewsInfoService; import com.simon.repository.NewsInfoRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.NewsInfoService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import javax.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java b/common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java rename to common/src/main/java/com/simon/service/impl/NewsTagServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java b/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java similarity index 99% rename from web/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java rename to common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java index b7a83823dd581a35b5a89f9c26ba69a7cf0ea11a..2f7543ae083aa627c5ddbe701e0d5962a5174eda 100644 --- a/web/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/NoticeMsgServiceImpl.java @@ -1,22 +1,21 @@ package com.simon.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; import com.simon.mapper.NoticeMsgMapper; import com.simon.model.NoticeMsg; -import com.simon.service.NoticeMsgService; import com.simon.repository.NoticeMsgRepository; -import com.simon.common.config.AppConfig; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import com.simon.service.NoticeMsgService; import lombok.var; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import javax.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java b/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java similarity index 99% rename from web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java rename to common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java index 418669654dab02c1db762f8e67b42355e861a94a..990747a462b1918f67ce9da26139eb686381ad03 100644 --- a/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java @@ -344,10 +344,11 @@ public class OauthUserServiceImpl implements OauthUserService { } @Override - public OauthUser registerByPhone(String phone) { + public OauthUser registerByPhone(String areaCode, String phone) { OauthUser oauthUser = oauthUserRepository.findByPhone(phone); if (null == oauthUser){ oauthUser = new OauthUser(); + oauthUser.setAreaCode(areaCode); oauthUser.setPhone(phone); oauthUser.setEnabled(true); oauthUser.setUsername(UsernameUtil.generateByPhone(phone)); diff --git a/web/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java b/common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java rename to common/src/main/java/com/simon/service/impl/ProvinceServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java b/common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java rename to common/src/main/java/com/simon/service/impl/ResetPwdInfoServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java b/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java similarity index 98% rename from web/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java rename to common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java index f09fbb7bd468b7672e81139359aec5e9e5b0ec0c..7c33144d2333f30104ef5b4f7e4453b608a7d97f 100644 --- a/web/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/SideMenuAuthorityServiceImpl.java @@ -1,23 +1,21 @@ package com.simon.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; import com.simon.mapper.SideMenuAuthorityMapper; import com.simon.model.SideMenuAuthority; -import com.simon.service.SideMenuAuthorityService; import com.simon.repository.SideMenuAuthorityRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.SideMenuAuthorityService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java b/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java similarity index 99% rename from web/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java rename to common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java index 6df2e72b102189cc2f4d265a035a14b3fe2595ab..c78b613e00086f538db988373261880e004eb5d1 100644 --- a/web/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/SideMenuServiceImpl.java @@ -74,7 +74,7 @@ public class SideMenuServiceImpl implements SideMenuService { pageSize = AppConfig.DEFAULT_PAGE_SIZE; } orderBy = orderBy.trim(); - if (org.apache.commons.lang3.StringUtils.isEmpty(orderBy)) { + if (StringUtils.isEmpty(orderBy)) { PageHelper.startPage(pageNo, pageSize); } else { PageHelper.startPage(pageNo, pageSize, orderBy); diff --git a/web/src/main/java/com/simon/service/impl/TableServiceImpl.java b/common/src/main/java/com/simon/service/impl/TableServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/TableServiceImpl.java rename to common/src/main/java/com/simon/service/impl/TableServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/TownServiceImpl.java b/common/src/main/java/com/simon/service/impl/TownServiceImpl.java similarity index 98% rename from web/src/main/java/com/simon/service/impl/TownServiceImpl.java rename to common/src/main/java/com/simon/service/impl/TownServiceImpl.java index 55169b81de484c6a14256ad38c1230b67c67eaaf..26df9a51a71b240270eab6390febc6d955810bbe 100644 --- a/web/src/main/java/com/simon/service/impl/TownServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/TownServiceImpl.java @@ -1,23 +1,21 @@ package com.simon.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; import com.simon.mapper.TownMapper; import com.simon.model.Town; -import com.simon.service.TownService; import com.simon.repository.TownRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.TownService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import javax.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java b/common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java rename to common/src/main/java/com/simon/service/impl/TxSmsServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java b/common/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java similarity index 100% rename from web/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java rename to common/src/main/java/com/simon/service/impl/VeriCodeServiceImpl.java diff --git a/web/src/main/java/com/simon/service/impl/VillageServiceImpl.java b/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java similarity index 98% rename from web/src/main/java/com/simon/service/impl/VillageServiceImpl.java rename to common/src/main/java/com/simon/service/impl/VillageServiceImpl.java index a0042cdded1f2dea2008a77ebb31748a8eedc2d5..a6eb9fa639f6807788bc708d4d67b9f454e200cf 100644 --- a/web/src/main/java/com/simon/service/impl/VillageServiceImpl.java +++ b/common/src/main/java/com/simon/service/impl/VillageServiceImpl.java @@ -1,23 +1,21 @@ package com.simon.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simon.common.config.AppConfig; import com.simon.mapper.VillageMapper; import com.simon.model.Village; -import com.simon.service.VillageService; import com.simon.repository.VillageRepository; -import com.simon.common.config.AppConfig; +import com.simon.service.VillageService; import lombok.extern.slf4j.Slf4j; -import lombok.var; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import javax.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/api/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java b/common/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java similarity index 100% rename from api/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java rename to common/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java diff --git a/common/src/main/resources/application-common.yml b/common/src/main/resources/application-common.yml index 2ee311f66cf73dd5731dab508d3f4af0a8cbf274..334c9bbdf86cf22d5d49cfce263b1a48f95c824c 100644 --- a/common/src/main/resources/application-common.yml +++ b/common/src/main/resources/application-common.yml @@ -3,7 +3,7 @@ security: enabled: false spring: profiles: - active: oracle #pg, mysql, oracle。默认使用MySQL数据库连接配置。 + active: mysql #pg, mysql, oracle。默认使用MySQL数据库连接配置。 thymeleaf: prefix: classpath:/templates/ #默认值 suffix: .html diff --git a/api/src/main/resources/mapping/AccountBindMapper.xml b/common/src/main/resources/mapping/AccountBindMapper.xml similarity index 100% rename from api/src/main/resources/mapping/AccountBindMapper.xml rename to common/src/main/resources/mapping/AccountBindMapper.xml diff --git a/web/src/main/resources/mapping/AuthorityMapper.xml b/common/src/main/resources/mapping/AuthorityMapper.xml similarity index 100% rename from web/src/main/resources/mapping/AuthorityMapper.xml rename to common/src/main/resources/mapping/AuthorityMapper.xml diff --git a/api/src/main/resources/mapping/BillMapper.xml b/common/src/main/resources/mapping/BillMapper.xml similarity index 100% rename from api/src/main/resources/mapping/BillMapper.xml rename to common/src/main/resources/mapping/BillMapper.xml diff --git a/web/src/main/resources/mapping/CityMapper.xml b/common/src/main/resources/mapping/CityMapper.xml similarity index 100% rename from web/src/main/resources/mapping/CityMapper.xml rename to common/src/main/resources/mapping/CityMapper.xml diff --git a/web/src/main/resources/mapping/ColumnUiMapper.xml b/common/src/main/resources/mapping/ColumnUiMapper.xml similarity index 100% rename from web/src/main/resources/mapping/ColumnUiMapper.xml rename to common/src/main/resources/mapping/ColumnUiMapper.xml diff --git a/web/src/main/resources/mapping/CountryMapper.xml b/common/src/main/resources/mapping/CountryMapper.xml similarity index 100% rename from web/src/main/resources/mapping/CountryMapper.xml rename to common/src/main/resources/mapping/CountryMapper.xml diff --git a/web/src/main/resources/mapping/DictTypeGroupMapper.xml b/common/src/main/resources/mapping/DictTypeGroupMapper.xml similarity index 100% rename from web/src/main/resources/mapping/DictTypeGroupMapper.xml rename to common/src/main/resources/mapping/DictTypeGroupMapper.xml diff --git a/web/src/main/resources/mapping/DictTypeMapper.xml b/common/src/main/resources/mapping/DictTypeMapper.xml similarity index 100% rename from web/src/main/resources/mapping/DictTypeMapper.xml rename to common/src/main/resources/mapping/DictTypeMapper.xml diff --git a/web/src/main/resources/mapping/FontAwesomeMapper.xml b/common/src/main/resources/mapping/FontAwesomeMapper.xml similarity index 100% rename from web/src/main/resources/mapping/FontAwesomeMapper.xml rename to common/src/main/resources/mapping/FontAwesomeMapper.xml diff --git a/api/src/main/resources/mapping/LogLoginMapper.xml b/common/src/main/resources/mapping/LogLoginMapper.xml similarity index 100% rename from api/src/main/resources/mapping/LogLoginMapper.xml rename to common/src/main/resources/mapping/LogLoginMapper.xml diff --git a/web/src/main/resources/mapping/LoggingEventMapper.xml b/common/src/main/resources/mapping/LoggingEventMapper.xml similarity index 100% rename from web/src/main/resources/mapping/LoggingEventMapper.xml rename to common/src/main/resources/mapping/LoggingEventMapper.xml diff --git a/web/src/main/resources/mapping/NewsInfoMapper.xml b/common/src/main/resources/mapping/NewsInfoMapper.xml similarity index 100% rename from web/src/main/resources/mapping/NewsInfoMapper.xml rename to common/src/main/resources/mapping/NewsInfoMapper.xml diff --git a/api/src/main/resources/mapping/NewsTagMapper.xml b/common/src/main/resources/mapping/NewsTagMapper.xml similarity index 100% rename from api/src/main/resources/mapping/NewsTagMapper.xml rename to common/src/main/resources/mapping/NewsTagMapper.xml diff --git a/api/src/main/resources/mapping/NoticeMsgMapper.xml b/common/src/main/resources/mapping/NoticeMsgMapper.xml similarity index 100% rename from api/src/main/resources/mapping/NoticeMsgMapper.xml rename to common/src/main/resources/mapping/NoticeMsgMapper.xml diff --git a/web/src/main/resources/mapping/OauthUserMapper.xml b/common/src/main/resources/mapping/OauthUserMapper.xml similarity index 100% rename from web/src/main/resources/mapping/OauthUserMapper.xml rename to common/src/main/resources/mapping/OauthUserMapper.xml diff --git a/web/src/main/resources/mapping/ProvinceMapper.xml b/common/src/main/resources/mapping/ProvinceMapper.xml similarity index 100% rename from web/src/main/resources/mapping/ProvinceMapper.xml rename to common/src/main/resources/mapping/ProvinceMapper.xml diff --git a/api/src/main/resources/mapping/QrCodeMapper.xml b/common/src/main/resources/mapping/QrCodeMapper.xml similarity index 100% rename from api/src/main/resources/mapping/QrCodeMapper.xml rename to common/src/main/resources/mapping/QrCodeMapper.xml diff --git a/web/src/main/resources/mapping/QuartzJobMapper.xml b/common/src/main/resources/mapping/QuartzJobMapper.xml similarity index 100% rename from web/src/main/resources/mapping/QuartzJobMapper.xml rename to common/src/main/resources/mapping/QuartzJobMapper.xml diff --git a/api/src/main/resources/mapping/ResetPwdInfoMapper.xml b/common/src/main/resources/mapping/ResetPwdInfoMapper.xml similarity index 100% rename from api/src/main/resources/mapping/ResetPwdInfoMapper.xml rename to common/src/main/resources/mapping/ResetPwdInfoMapper.xml diff --git a/web/src/main/resources/mapping/SideMenuAuthorityMapper.xml b/common/src/main/resources/mapping/SideMenuAuthorityMapper.xml similarity index 100% rename from web/src/main/resources/mapping/SideMenuAuthorityMapper.xml rename to common/src/main/resources/mapping/SideMenuAuthorityMapper.xml diff --git a/web/src/main/resources/mapping/SideMenuMapper.xml b/common/src/main/resources/mapping/SideMenuMapper.xml similarity index 100% rename from web/src/main/resources/mapping/SideMenuMapper.xml rename to common/src/main/resources/mapping/SideMenuMapper.xml diff --git a/web/src/main/resources/mapping/TownMapper.xml b/common/src/main/resources/mapping/TownMapper.xml similarity index 100% rename from web/src/main/resources/mapping/TownMapper.xml rename to common/src/main/resources/mapping/TownMapper.xml diff --git a/api/src/main/resources/mapping/VeriCodeMapper.xml b/common/src/main/resources/mapping/VeriCodeMapper.xml similarity index 100% rename from api/src/main/resources/mapping/VeriCodeMapper.xml rename to common/src/main/resources/mapping/VeriCodeMapper.xml diff --git a/web/src/main/resources/mapping/VillageMapper.xml b/common/src/main/resources/mapping/VillageMapper.xml similarity index 100% rename from web/src/main/resources/mapping/VillageMapper.xml rename to common/src/main/resources/mapping/VillageMapper.xml diff --git a/pom.xml b/pom.xml index 74c1190b6507902c82e6d089f095ade0335db8b1..8014dc744720e7f55645e9638caf1daa9e7d86b0 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.20.RELEASE + 1.5.21.RELEASE @@ -32,7 +32,7 @@ UTF-8 UTF-8 1.8 - 1.5.20.RELEASE + 1.5.21.RELEASE 127.0.0.1:5000 2.9.2 Edgware.RELEASE diff --git a/web/src/main/java/com/simon/model/Authority.java b/web/src/main/java/com/simon/model/Authority.java deleted file mode 100644 index be623c30d48809a2458520476b421efffdce78ae..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/model/Authority.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.simon.model; - -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.ToStringSerializer; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.simon.common.config.AppConfig; -import com.simon.common.utils.SnowflakeGenId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.security.core.GrantedAuthority; -import tk.mybatis.mapper.annotation.KeySql; - -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* @author SimonSun -* @date 2018-09-12 -**/ -@ApiModel(value = "权限", description = "该文件的任何修改必须同步到common下的相同文件") -@Data -@EqualsAndHashCode(callSuper = false) -@Entity -@Table(name="t_authorities") -public class Authority implements GrantedAuthority, Serializable, Comparable{ - private static final long serialVersionUID = 1L; - - @JSONField(serializeUsing = ToStringSerializer.class) - @Id - @KeySql(genId = SnowflakeGenId.class) - @GeneratedValue(generator = "sequenceId") - @GenericGenerator(name = "sequenceId", strategy = "com.simon.common.utils.snowflake.SequenceId") - private Long id; - - @JSONField(serializeUsing = ToStringSerializer.class) - @ApiModelProperty(value = "创建人id") - @Column(name = "create_by") - private Long createBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "创建时间") - @Column(name = "create_date") - private LocalDateTime createDate; - - @JSONField(serializeUsing = ToStringSerializer.class) - @ApiModelProperty(value = "更新人id") - @Column(name = "update_by") - private Long updateBy; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = AppConfig.DATE_PATTERN_DATETIME, timezone = AppConfig.DATE_TIMEZONE) - @ApiModelProperty(value = "更新时间") - @Column(name = "update_date") - private LocalDateTime updateDate; - - @JSONField(serializeUsing = ToStringSerializer.class) - @ApiModelProperty(value = "用户id") - @Column(name = "user_id", nullable = false) - private Long userId; - - @ApiModelProperty(value = "权限") - @Column(name = "authority", nullable = false) - private String authority; - - @ApiModelProperty(value = "用户名(昵称)") - @Transient - private String username; - - @Override - public int compareTo(Authority o) { - return (int)(this.userId - o.userId); - } -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/repository/AccountBindRepository.java b/web/src/main/java/com/simon/repository/AccountBindRepository.java deleted file mode 100644 index 38b56819f067accca40d9a640e46ae47d88fbf6c..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/AccountBindRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.simon.repository; - -import com.simon.model.AccountBind; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** -* @author SimonSun -* @date 2018-12-04 -**/ -@Repository -public interface AccountBindRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/AuthorityRepository.java b/web/src/main/java/com/simon/repository/AuthorityRepository.java deleted file mode 100644 index abe15218ce440199a506f6d33010f2971fd3a36b..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/AuthorityRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.simon.repository; - -import com.simon.model.Authority; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** -* @author SimonSun -* @date 2018-11-14 -**/ -@Repository -public interface AuthorityRepository extends JpaRepository { - List findByUserId(Long userId); -} diff --git a/web/src/main/java/com/simon/repository/BillRepository.java b/web/src/main/java/com/simon/repository/BillRepository.java deleted file mode 100644 index dfb6ff1d6cc870e13545b4fa903da9f0946dc312..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/BillRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simon.repository; - -import com.simon.model.Bill; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** -* @author SimonSun -* @date 2018-11-20 -**/ -@Repository -public interface BillRepository extends JpaRepository { - Bill findByOutTradeNo(String outTradeNo); -} diff --git a/web/src/main/java/com/simon/repository/DictTypeGroupRepository.java b/web/src/main/java/com/simon/repository/DictTypeGroupRepository.java deleted file mode 100644 index f7a2791f0f7484b73cc9f418fa29f9f014d93627..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/DictTypeGroupRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simon.repository; - -import com.simon.model.DictTypeGroup; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -@Repository -public interface DictTypeGroupRepository extends JpaRepository { - int countByTypeGroupCode(String tpeGroupCode); -} diff --git a/web/src/main/java/com/simon/repository/DictTypeRepository.java b/web/src/main/java/com/simon/repository/DictTypeRepository.java deleted file mode 100644 index eeeb25dd354cedd5c3489afcce06d291257550a5..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/DictTypeRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.simon.repository; - -import com.simon.model.DictType; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** -* @author SimonSun -* @date 2018-09-06 10:03:50 -**/ -@Repository -public interface DictTypeRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/LogLoginRepository.java b/web/src/main/java/com/simon/repository/LogLoginRepository.java deleted file mode 100644 index 51c50d4a378a7603aa31c0e7f0269b3565c2edc9..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/LogLoginRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simon.repository; - -import com.simon.model.LogLogin; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * 登录日志 - * - * @author simon - * @create 2018-07-27 1:31 - **/ - -public interface LogLoginRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/NewsTagRepository.java b/web/src/main/java/com/simon/repository/NewsTagRepository.java deleted file mode 100644 index f9d7661fa9ab774355108d53441461b1d2b81386..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/NewsTagRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.simon.repository; - -import com.simon.model.NewsTag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface NewsTagRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/NoticeMsgRepository.java b/web/src/main/java/com/simon/repository/NoticeMsgRepository.java deleted file mode 100644 index d7d29c81b9293397bb06cbbc3fe6b85af7438952..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/NoticeMsgRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.simon.repository; - -import com.simon.model.NoticeMsg; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** -* @author SimonSun -* @date 2018-11-24 -**/ -@Repository -public interface NoticeMsgRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/OauthUserRepository.java b/web/src/main/java/com/simon/repository/OauthUserRepository.java deleted file mode 100644 index f48fa7a086f8bfb33ca8d88f0a15c81c7c06a7fe..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/OauthUserRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simon.repository; - -import com.simon.model.OauthUser; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface OauthUserRepository extends JpaRepository { - OauthUser findByUsername(String username); - OauthUser findByPhone(String phone); - OauthUser findById(Long id); - OauthUser findByEmail(String email); -} diff --git a/web/src/main/java/com/simon/repository/QrCodeRepository.java b/web/src/main/java/com/simon/repository/QrCodeRepository.java deleted file mode 100644 index cca6e7c2cc80b852b9e3e6198d52fd2f29fd8ed1..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/QrCodeRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.simon.repository; - -import com.simon.model.QrCode; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface QrCodeRepository extends JpaRepository { - QrCode findBySid(String sid); -} diff --git a/web/src/main/java/com/simon/repository/ResetPwdInfoRepository.java b/web/src/main/java/com/simon/repository/ResetPwdInfoRepository.java deleted file mode 100644 index a8a318875fb8eb570726f010089044a5a143b09f..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/ResetPwdInfoRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.simon.repository; - -import com.simon.model.ResetPwdInfo; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface ResetPwdInfoRepository extends JpaRepository { -} diff --git a/web/src/main/java/com/simon/repository/VeriCodeRepository.java b/web/src/main/java/com/simon/repository/VeriCodeRepository.java deleted file mode 100644 index d7ef9b96ddd9bab000f5b55965d492213c3640d3..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/repository/VeriCodeRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.simon.repository; - -import com.simon.model.VeriCode; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * 验证码 - * - * @author simon - * @create 2018-07-25 22:40 - **/ - -public interface VeriCodeRepository extends JpaRepository { - VeriCode findByPhone(String phone); - VeriCode findByPhoneAndCode(String phone, Integer code); -} diff --git a/web/src/main/java/com/simon/service/BillService.java b/web/src/main/java/com/simon/service/BillService.java deleted file mode 100644 index f0c6e539915baeb7f56968f07e3ab872c6184d7f..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/BillService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.simon.service; - -import com.github.pagehelper.PageInfo; -import com.simon.common.service.BasicService; -import com.simon.model.Bill; -import com.simon.model.OauthUser; -import com.simon.request.BillRequest; - -import java.util.Map; - -/** -* @author SimonSun -* @date 2018-11-20 -**/ -public interface BillService extends BasicService { - Bill createBill(BillRequest billRequest); - - Bill createBill(OauthUser oauthUser, BillRequest billRequest); - void billPayed(String outTradeNo); - void billPayed(Bill bill); - - void createFreeBill(OauthUser oauthUser, BillRequest billRequest); - - void billPayFailed(String outTradeNo); - - PageInfo getDtoList(Map params, Integer pageNo, Integer pageSize, String orderBy); -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/service/NewsInfoService.java b/web/src/main/java/com/simon/service/NewsInfoService.java deleted file mode 100644 index 8b25e0541a1df9faf0f7b324bdd80f8e1f093bb1..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/NewsInfoService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simon.service; -import com.simon.model.NewsInfo; -import com.simon.common.service.BasicService; - -/** -* @author SimonSun -* @date 2019-01-20 -**/ -public interface NewsInfoService extends BasicService { - -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/service/NewsTagService.java b/web/src/main/java/com/simon/service/NewsTagService.java deleted file mode 100644 index f6f9948259f19368ed74a50afba331c584564d77..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/NewsTagService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simon.service; - -import com.simon.common.service.BasicService; -import com.simon.model.NewsTag; - -/** -* @author SimonSun -* @create 2018-08-06 20:56:26 -**/ -public interface NewsTagService extends BasicService { - -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/service/NoticeMsgService.java b/web/src/main/java/com/simon/service/NoticeMsgService.java deleted file mode 100644 index 55e55fce8b80796a05fa4c286b1cf3aa1661574d..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/NoticeMsgService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simon.service; -import com.simon.model.NoticeMsg; -import com.simon.common.service.BasicService; - -/** -* @author SimonSun -* @date 2018-11-24 -**/ -public interface NoticeMsgService extends BasicService { - -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/service/ResetPwdInfoService.java b/web/src/main/java/com/simon/service/ResetPwdInfoService.java deleted file mode 100644 index 04c2e549da267d8cad9aed47a03f1a91b58372ef..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/ResetPwdInfoService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simon.service; - -import com.simon.common.service.BasicService; -import com.simon.model.ResetPwdInfo; - -/** -* @author SimonSun -* @create 2018-08-06 20:56:26 -**/ -public interface ResetPwdInfoService extends BasicService { - -} \ No newline at end of file diff --git a/web/src/main/java/com/simon/service/VeriCodeService.java b/web/src/main/java/com/simon/service/VeriCodeService.java deleted file mode 100644 index 71f35f7831444ff3003553ed7526a2cbfcfd5732..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/VeriCodeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.simon.service; - -import com.simon.common.service.BasicService; -import com.simon.model.VeriCode; - -/** - * 验证码 - * - * @author simon - * @create 2018-07-31 15:24 - **/ - -public interface VeriCodeService extends BasicService { - VeriCode findByPhone(String phone); - VeriCode findByPhoneAndCode(String phone, Integer code); -} diff --git a/web/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java b/web/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java deleted file mode 100644 index c0944da7953d3eb24c500ca5a062b7601956f4a2..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/impl/AliSmsServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.simon.service.impl; - -import com.simon.common.domain.ResultCode; -import com.simon.common.exception.BusinessException; -import com.simon.service.SmsService; -import com.taobao.api.ApiException; -import com.taobao.api.DefaultTaobaoClient; -import com.taobao.api.domain.BizResult; -import com.taobao.api.request.AlibabaAliqinFcSmsNumSendRequest; -import com.taobao.api.response.AlibabaAliqinFcSmsNumSendResponse; -import lombok.extern.slf4j.Slf4j; -import lombok.var; -import org.apache.commons.lang3.RandomUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 阿里大于短信验证码服务 - * - * @author simon - * @date 2019-01-02 - **/ -@Slf4j -@Service(value = "aliSmsServiceImpl") -@Transactional(rollbackFor = {Exception.class}) -public class AliSmsServiceImpl implements SmsService { - @Value("${com.alibaba.dayu.url.sandbox}") - private String DAYU_URL_SANDBOX; - - @Value("${com.alibaba.dayu.url.real}") - private String DAYU_URL_REAL; - - @Value("${com.alibaba.dayu.app-key}") - private String DAYU_APP_KEY; - - @Value("${com.alibaba.dayu.app-secret}") - private String DAYU_APP_SECRET; - - @Value("${com.alibaba.dayu.sms-type}") - private String DAYU_SMS_TYPE; - - @Value("${com.alibaba.dayu.sms-free-sign-name}") - private String DAYU_SMS_FREE_SIGN_NAME; - - @Value("${com.alibaba.dayu.sms-template-code}") - private String DAYU_SMS_TEMPLATE_CODE; - - @Autowired - private org.springframework.cache.CacheManager cacheManager; - - @Override - public boolean sendIdentifyCode(String mobile) throws ApiException { - var code = RandomUtils.nextInt(100000, 999999); - var client = new DefaultTaobaoClient( - DAYU_URL_REAL, DAYU_APP_KEY, DAYU_APP_SECRET); - var req = new AlibabaAliqinFcSmsNumSendRequest(); - req.setExtend(""); - req.setSmsType(DAYU_SMS_TYPE); - req.setSmsFreeSignName(DAYU_SMS_FREE_SIGN_NAME); - req.setSmsParamString("{veriCode:'"+code+"'}"); - req.setRecNum(mobile); - req.setSmsTemplateCode(DAYU_SMS_TEMPLATE_CODE); - AlibabaAliqinFcSmsNumSendResponse rsp = null; - rsp = client.execute(req); - BizResult bizResult = rsp.getResult(); - if (null != bizResult && bizResult.getSuccess()){ - //写入缓存 - var cache = cacheManager.getCache("smsCache"); - cache.put(mobile, code); - - return true; - }else{ - log.error("请确认阿里大于账号还有余额"); - return false; - } - } - - @Override - public boolean checkCode(String mobile, String code) { - log.info("checkCode"); - var cache = cacheManager.getCache("smsCache"); - var ele = cache.get(mobile); - - if (null == ele) { - throw new BusinessException(ResultCode.ERROR_VERI_CODE); - } - - String output = ele.get().toString(); - log.info("从缓存中读到" + mobile + "," + output); - - var result = false; - - if (StringUtils.isEmpty(output)) { - throw new BusinessException(ResultCode.ERROR_VERI_CODE); - } - - if (StringUtils.isNotEmpty(code) && StringUtils.isNotEmpty(output)) { - if (code.equals(output)) { - result = true; - //cache.evict(mobile);//删除 - } - } - - //删除缓存 - cache.evict(mobile); - - return result; - } -} diff --git a/web/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java b/web/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java deleted file mode 100644 index e5368dd21b6015aea164d7568a2d5ed4a8e8bcb9..0000000000000000000000000000000000000000 --- a/web/src/main/java/com/simon/service/impl/YzxSmsServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.simon.service.impl; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.simon.common.config.AppConfig; -import com.simon.common.domain.ResultCode; -import com.simon.common.exception.BusinessException; -import com.simon.common.utils.SmsUtil; -import com.simon.service.SmsService; -import lombok.extern.slf4j.Slf4j; -import lombok.var; -import org.apache.commons.lang3.RandomUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 云之讯短信服务 - * - * @author simon - * @date 2018-12-03 - **/ - -@Slf4j -@Service(value = "yzxSmsServiceImpl") -@Transactional(rollbackFor = {Exception.class}) -public class YzxSmsServiceImpl implements SmsService { - - private static final long EXPIRE_SECONDS = 300 * 1000; - - @Value("${sms.clientid}") - private String clientid; - - @Value("${sms.password}") - private String password; - - //@Value("${sms.identity-code-msg-template}") - private String identityCodeMsgTemplate = AppConfig.SMS_TEMPLATE; - - @Autowired - private org.springframework.cache.CacheManager cacheManager; - - @Override - public boolean sendIdentifyCode(String mobile) { - int code = RandomUtils.nextInt(100000, 999999); - String content = String.format(identityCodeMsgTemplate, code); - String result = SmsUtil.getInstance().sendSMS(clientid, password, mobile, content, "4"); - boolean ret = false; - String responseCode = null; - if (result != null) { - JSONObject obj = JSONObject.parseObject(result); - if (obj != null) { - JSONArray jsonArray = obj.getJSONArray("data"); - if (jsonArray != null && !jsonArray.isEmpty()) { - JSONObject index = jsonArray.getJSONObject(0); - if (index != null) { - responseCode = index.getString("code"); - if ("0".equals(responseCode)) { - log.info("发送成功"); - ret = true; - //写入缓存 - var cache = cacheManager.getCache("smsCache"); - cache.put(mobile, code); - } - } - } - } - } - return ret; - } - - @Override - public boolean checkCode(String mobile, String code) { - log.info("checkCode"); - var cache = cacheManager.getCache("smsCache"); - var ele = cache.get(mobile); - - if (null == ele) { - throw new BusinessException(ResultCode.ERROR_VERI_CODE); - } - - String output = ele.get().toString(); - log.info("从缓存中读到" + mobile + "," + output); - - var result = false; - - if (StringUtils.isEmpty(output)) { - throw new BusinessException(ResultCode.ERROR_VERI_CODE); - } - - if (StringUtils.isNotEmpty(code) && StringUtils.isNotEmpty(output)) { - if (code.equals(output)) { - result = true; - //cache.evict(mobile);//删除 - } - } - - //删除缓存 - cache.evict(mobile); - - return result; - } -} diff --git a/web/src/main/resources/mapping/AccountBindMapper.xml b/web/src/main/resources/mapping/AccountBindMapper.xml deleted file mode 100644 index 035ab83883fbf238d415f24e68d86b7ce571a0c1..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/AccountBindMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/BillMapper.xml b/web/src/main/resources/mapping/BillMapper.xml deleted file mode 100644 index 2c467e40e77bb1d031df8e3be4c72ac7af4d7135..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/BillMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE t_bill set bill_status=#{billStatus} WHERE out_trade_no=#{outTradeNo} - - - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/LogLoginMapper.xml b/web/src/main/resources/mapping/LogLoginMapper.xml deleted file mode 100644 index 518878495912050c641477ffb32858c1824e06c0..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/LogLoginMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - id, create_time, ip, username - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/NewsTagMapper.xml b/web/src/main/resources/mapping/NewsTagMapper.xml deleted file mode 100644 index 3b8b083b0661c7588c9210a7a564e8d0e04e59b3..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/NewsTagMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - id, news_info_id, tag_id - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/NoticeMsgMapper.xml b/web/src/main/resources/mapping/NoticeMsgMapper.xml deleted file mode 100644 index ec619a609b68ce578f95baaf909d1104bc435035..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/NoticeMsgMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/QrCodeMapper.xml b/web/src/main/resources/mapping/QrCodeMapper.xml deleted file mode 100644 index 65928504872f6b5c6fb33da445976649028d829e..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/QrCodeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - id, is_ok, sid, token, username - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/ResetPwdInfoMapper.xml b/web/src/main/resources/mapping/ResetPwdInfoMapper.xml deleted file mode 100644 index b08d04c2249f8223804ccf2161cc72ef4deb33cb..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/ResetPwdInfoMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - id, expires_in, secret_key, user_id, valid - - \ No newline at end of file diff --git a/web/src/main/resources/mapping/VeriCodeMapper.xml b/web/src/main/resources/mapping/VeriCodeMapper.xml deleted file mode 100644 index 0e8ffa4727612e21613a0ebcdc6069095c765136..0000000000000000000000000000000000000000 --- a/web/src/main/resources/mapping/VeriCodeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - id, code, create_time, expires, phone - - \ No newline at end of file diff --git a/web/src/main/resources/templates/vue/table/code_generate.html b/web/src/main/resources/templates/vue/table/code_generate.html index 7de032c2da6fce2db52c075c267875a855f208ad..25cdb42562cc0ab3a930cd432bf00f9c101b6f1b 100644 --- a/web/src/main/resources/templates/vue/table/code_generate.html +++ b/web/src/main/resources/templates/vue/table/code_generate.html @@ -30,8 +30,9 @@ - - + + +