member

.gitignore

@@ -21,6 +21,7 @@ target
*.rar
*.iml
.idea
.vscode
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
@@ -28,4 +29,4 @@ hs_err_pid*
.classpath
.settings
.project
src/main/resources/application-dev.yml
src/main/resources/application-mydev.yml

src/main/java/io/renren/modules/admin/member/controller/MemberController.java

@@ -0,0 +1,126 @@
package io.renren.modules.admin.member.controller;
import java.util.Arrays;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.admin.member.entity.MemberEntity;
import io.renren.modules.admin.member.service.MemberService;
import io.renren.modules.sys.controller.AbstractController;
/**
 * 会员表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-01-17 11:29:03
 */
@RestController
@RequestMapping("/admin/member")
@Api("会员管理")
public class MemberController extends AbstractController  {
    @Autowired
    private MemberService memberService;
    /**
     * 列表
     */
    @RequestMapping("/list")
    @RequiresPermissions("admin:member:list")
    @ApiOperation("列表")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = memberService.queryPage(params);
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */
    @RequestMapping("/info/{id}")
    @RequiresPermissions("admin:member:info")
    @ApiOperation("个人信息")
    public R info(@PathVariable("id") Long id){
		MemberEntity member = memberService.getById(id);
        return R.ok().put("member", member);
    }
    /**
     * 保存
     */
    @PostMapping("/save")
    @RequiresPermissions("admin:member:save")
    @ApiOperation("新增")
    public R save(@RequestBody MemberEntity member){
        ValidatorUtils.validateEntity(member, AddGroup.class);
		
		member.setCreateId(getUserId());
		memberService.saveMember(member);
        return R.ok();
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @RequiresPermissions("admin:member:update")
    @ApiOperation("修改")
    public R update(@RequestBody MemberEntity member){
        ValidatorUtils.validateEntity(member, UpdateGroup.class);
        member.setModifyId(getUserId());
		memberService.updateById(member);
        return R.ok();
    }
    /**
     * 删除
     */
    // @PostMapping("/delete")
    // @RequiresPermissions("admin:member:delete")
    // @ApiOperation("删除")
    // public R delete(@RequestBody Long[] ids){
	// 	memberService.removeByIds(Arrays.asList(ids));
    //     return R.ok();
    // }
    @PostMapping("/delete")
    @RequiresPermissions("admin:member:delete")
    @ApiOperation("删除")
    public R delete(@RequestBody Long[] ids){
        // memberService.removeByIds(Arrays.asList(ids));
        memberService.delete(ids);
        return R.ok();
    }
    @PostMapping("/status")
    @RequiresPermissions("admin:member:status")
    @ApiOperation("改变审核状态")
    public R status(@RequestBody Map<String, Object> param){
        // memberService.removeByIds(Arrays.asList(ids));
        Long id = Long.valueOf(param.get("id").toString());
        Integer status = Integer.valueOf(param.get("status").toString());
        System.out.println(id);
        System.out.println(status);
        int it = memberService.updateStatus(id, status);
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/member/dao/MemberDao.java

@@ -0,0 +1,21 @@
package io.renren.modules.admin.member.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Update;
import io.renren.modules.admin.member.entity.MemberEntity;
/**
 * 会员表
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-01-17 11:29:03
 */
@Mapper
public interface MemberDao extends BaseMapper<MemberEntity> {
	@Update("update member set is_check=#{isCheck} where id=#{id}")
    int updateStatus(Long id, Integer isCheck);
}

src/main/java/io/renren/modules/admin/member/entity/MemberEntity.java

@@ -0,0 +1,109 @@
package io.renren.modules.admin.member.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
import lombok.Data;
/**
 * 会员表
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-01-17 11:29:03
 */
@Data
@TableName("member")
public class MemberEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 会员id (会员表)
	 */
	@TableId
	private Long id;
	/**
	 * 用户名
	 */
	@NotBlank(message="用户名不能为空", groups = {AddGroup.class, UpdateGroup.class})
	private String username;
	/**
	 * 密码
	 */
	@NotBlank(message="密码不能为空", groups = AddGroup.class)
	@JsonIgnore
	private String password;
	/**
	 * 盐
	 */
	@JsonIgnore
	private String salt;
	/**
	 * 姓名
	 */
	@NotBlank(message="姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
	private String truename;
	/**
	 * 性别
	 */
	private Integer sex;
	/**
	 * 头像
	 */
	private String titlePic;
	/**
	 * 所属机构(单位名称、公司名称
	 */
	private String organization;
	/**
	 * 职位id
	 */
	private String position;
	/**
	 * 职称
	 */
	private String jobTitle;
	/**
	 * 电话
	 */
	@NotBlank(message="手机号不能为空", groups = {AddGroup.class, UpdateGroup.class})
	private String phone;
	/**
	 * 邮箱
	 */
	@Email(message="邮箱格式不正确", groups = {AddGroup.class, UpdateGroup.class})
	private String email;
	/**
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 修改时间
	 */
	private Date modifyTime;
	/**
	 * 是否通过审核 0:未通过 1:通过
	 */
	private Integer isCheck;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	@TableLogic
	private Integer isDel;
	/**
	 * 修改人
	 */
	private Long modifyId;
	/**
	 * 修改人
	 */
	private Long createId;
}

src/main/java/io/renren/modules/admin/member/service/MemberService.java

@@ -0,0 +1,46 @@
package io.renren.modules.admin.member.service;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.member.entity.MemberEntity;
/**
 * 会员表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-01-17 11:29:03
 */
public interface MemberService extends IService<MemberEntity> {
    PageUtils queryPage(Map<String, Object> params);
    /**
	 * 保存用户
	 */
	void saveMember(MemberEntity member);
	
	/**
	 * 修改用户
	 */
	void update(MemberEntity member);
	/**
	 * 删除用户(逻辑删除)
	 */
	void delete(Long[] ids);
	/**
	 * 更新审核状态
	 * @param id
	 * @param isCheck
	 */
    int updateStatus(Long id, Integer isCheck);
}

src/main/java/io/renren/modules/admin/member/service/impl/MemberServiceImpl.java

@@ -0,0 +1,81 @@
package io.renren.modules.admin.member.service.impl;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSession;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.admin.member.dao.MemberDao;
import io.renren.modules.admin.member.entity.MemberEntity;
import io.renren.modules.admin.member.service.MemberService;
@Service("memberService")
public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> implements MemberService {
    @Autowired
    private SqlSession sqlSession;
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String username = (String)params.get("username");
        String truename = (String)params.get("truename");
        // System.out.println(key);
        IPage<MemberEntity> page = this.page(
                new Query<MemberEntity>().getPage(params),
                new QueryWrapper<MemberEntity>()
                .like(StringUtils.isNotBlank(username),"username", username)
                .or()
                .like(StringUtils.isNotBlank(truename),"truename", truename)
        );
        return new PageUtils(page);
    }
    @Override
	@Transactional
    public void saveMember(MemberEntity member){
        member.setCreateTime(new Date());
        //sha256加密
		String salt = RandomStringUtils.randomAlphanumeric(20);
		member.setPassword(new Sha256Hash(member.getPassword(), salt).toHex());
		member.setSalt(salt);
		this.save(member); 
    }
    @Override
	@Transactional
    public void update(MemberEntity member) {
        member.setModifyTime(new Date());
        if(StringUtils.isBlank(member.getPassword())){
			member.setPassword(null);
		}else{
			member.setPassword(new Sha256Hash(member.getPassword(), member.getSalt()).toHex());
		}
        this.updateById(member);
    }
    @Override
    public void delete(Long[] ids) {
        baseMapper.deleteBatchIds(Arrays.asList(ids));
    }
    @Override
    public int updateStatus(Long id, Integer isCheck) {
        int itemp = baseMapper.updateStatus(id, isCheck);
        return itemp;
        // @Update("update member set is_check=#{is_check}  where id = #{id}")
    }
}

src/main/java/io/renren/modules/app/controller/AppRegisterController.java

@@ -8,9 +8,9 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.RegisterForm;
import io.renren.modules.app.service.UserService;
@@ -37,18 +37,29 @@ public class AppRegisterController {
    @Autowired
    private UserService userService;
    // @PostMapping("register")
    // @ApiOperation("注册")
    // public R register(@RequestBody RegisterForm form){
    //     //表单校验
    //     ValidatorUtils.validateEntity(form);
    //     UserEntity user = new UserEntity();
    //     user.setPhone(form.getPhone());
    //     user.setUsername(form.getPhone());
    //     user.setTruename(form.getTruename());
    //     userService.saveMember(user);
    //     return R.ok();
    // }
    @PostMapping("register")
    @ApiOperation("注册")
    public R register(@RequestBody RegisterForm form){
    public R register(@RequestBody UserEntity user){
        user.setUsername(user.getPhone());
        //表单校验
        ValidatorUtils.validateEntity(form);
        UserEntity user = new UserEntity();
        user.setMobile(form.getMobile());
        user.setUsername(form.getMobile());
        user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
        user.setCreateTime(new Date());
        userService.save(user);
        ValidatorUtils.validateEntity(user, AddGroup.class);
        userService.saveMember(user);
        return R.ok();
    }

src/main/java/io/renren/modules/app/entity/UserEntity.java

@@ -10,6 +10,11 @@ package io.renren.modules.app.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@@ -22,30 +27,67 @@ import java.util.Date;
 * @author Mark sunlightcs@gmail.com
 */
@Data
@TableName("tb_user")
@TableName("member")
public class UserEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 用户ID
	 * 用户ID 会员id (会员表)
	 */
	@TableId
	private Long userId;
	/**
	 * 用户名
	 */
	@NotBlank(message="用户名不能为空", groups = AddGroup.class)
	private String username;
	/**
	 * 手机号
	 */
	private String mobile;
	/**
	 * 密码
	 */
	@NotBlank(message="密码不能为空", groups = AddGroup.class)
	private String password;
	/**
	 * 盐
	 */
	@JsonIgnore
	private String salt;
	/**
	 * 姓名
	 */
	@NotBlank(message="姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
	private String truename;
	/**
	 * 性别
	 */
	private Integer sex;
	/**
	 * 头像
	 */
	private String titlePic;
	/**
	 * 所属机构(单位名称、公司名称
	 */
	private String organization;
	/**
	 * 职位id
	 */
	private String position;
	/**
	 * 职称
	 */
	private String jobTitle;
	/**
	 * 电话
	 */
	@NotBlank(message="手机号不能为空", groups = {AddGroup.class, UpdateGroup.class})
	private String phone;
	/**
	 * 邮箱
	 */
	@Email(message="邮箱格式不正确", groups = {AddGroup.class, UpdateGroup.class})
	private String email;
	/**
	 * 创建时间
	 */
	private Date createTime;
}

src/main/java/io/renren/modules/app/form/RegisterForm.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Email;
/**
 * 注册表单
@@ -24,10 +25,30 @@ import javax.validation.constraints.NotBlank;
public class RegisterForm {
    @ApiModelProperty(value = "手机号")
    @NotBlank(message="手机号不能为空")
    private String mobile;
    private String phone;
    @ApiModelProperty(value = "密码")
    @NotBlank(message="密码不能为空")
    private String password;
    @ApiModelProperty(value = "姓名")
    @NotBlank(message="姓名不能为空")
    private String truename;
    @ApiModelProperty(value = "性别")
	private Integer sex;
    @ApiModelProperty(value = "头像")
	private String titlePic;
    @ApiModelProperty(value = "所属机构")
	private String organization;
    @ApiModelProperty(value = "职位")
	private String position;
    @ApiModelProperty(value = "职称")
	private String jobTitle;
    @ApiModelProperty(value = "邮箱")
	@Email(message="邮箱格式不正确")
	private String email;
}

src/main/java/io/renren/modules/app/service/UserService.java

@@ -28,4 +28,10 @@ public interface UserService extends IService<UserEntity> {
	 * @return        返回用户ID
	 */
	long login(LoginForm form);
	/**
	 * 用户注册
	 * @param user
	 */
	public void saveMember(UserEntity user);
}

src/main/java/io/renren/modules/app/service/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@
package io.renren.modules.app.service.impl;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,7 +19,10 @@ import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.LoginForm;
import io.renren.modules.app.service.UserService;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("userService")
@@ -41,4 +45,15 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		return user.getUserId();
	}
	@Override
	@Transactional
    public void saveMember(UserEntity user){
        user.setCreateTime(new Date());
        //sha256加密
		String salt = RandomStringUtils.randomAlphanumeric(20);
		user.setPassword(new Sha256Hash(user.getPassword(), salt).toHex());
		user.setSalt(salt);
		this.save(user); 
    }
}

src/main/resources/mapper/admin/member/MemberDao.xml

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="io.renren.modules.admin.member.dao.MemberDao">
	<!-- 可根据自己的需求，是否要使用 -->
    <resultMap type="io.renren.modules.admin.member.entity.MemberEntity" id="memberMap">
        <result property="id" column="id"/>
        <result property="username" column="username"/>
        <result property="password" column="password"/>
        <result property="truename" column="truename"/>
        <result property="sex" column="sex"/>
        <result property="titlePic" column="title_pic"/>
        <result property="organization" column="organization"/>
        <result property="position" column="position"/>
        <result property="jobTitle" column="job_title"/>
        <result property="phone" column="phone"/>
        <result property="email" column="email"/>
        <result property="createTime" column="create_time"/>
        <result property="modifyTime" column="modify_time"/>
        <result property="isCheck" column="is_check"/>
        <result property="isDel" column="is_del"/>
    </resultMap>
    
</mapper>