Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysTokenController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.center.sysUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 令牌表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysTokenController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysTokenController.class);
+
+    @Autowired
+    public ISysTokenService iSysTokenService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.GET)
+    public ResponseBean sysTokenList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysToken> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysToken> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysToken> result = iSysTokenService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.POST)
+    public ResponseBean sysTokenAdd(@RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.save(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysToken/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysTokenDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysTokenService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysTokenUpdate(@PathVariable Integer id,
+                                        @RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.updateById(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.GET)
+    public ResponseBean sysTokenGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysTokenService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -0,0 +1,208 @@
+package com.huiju.estateagents.center.sysUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.GET)
+    public ResponseBean sysUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysUser> result = iSysUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.POST)
+    public ResponseBean sysUserAdd(@RequestBody SysUser sysUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysUserService.save(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
+            if (iSysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.GET)
+    public ResponseBean sysUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    @PostMapping("/center/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+        
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        if (sysUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        String token = JWTUtils.newToken(sysUser.getUserName());
+    
+        //保存token
+        saveToken(token);
+        
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", sysUser);
+        
+        return ResponseBean.success(result);
+    }
+    
+    @PostMapping("/center/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+    
+    private void saveToken(String token) {
+        SysToken sysToken = new SysToken();
+        sysToken.setToken(token);
+        sysToken.setExpDate(LocalDateTime.now());
+        sysTokenService.save(sysToken);
+    }
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.center.sysUser.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 令牌表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * token
+     */
+    @TableId(value = "token")
+    private String token;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expDate;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.center.sysUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账户登录
+     */
+    @TableId(value = "user_name")
+    private String userName;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 令牌表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysTokenMapper extends BaseMapper<SysToken> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+
+/**
+ * <p>
+ * 令牌表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysTokenService extends IService<SysToken> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 令牌表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+    * 用户表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
+
+    @Autowired
+    public ITaUserService iTaUserService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserService.save(taUser)){
+                responseBean.addSuccess(taUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUser taUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserService.updateById(taUser)){
+                responseBean.addSuccess(taUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserRoleController.java

@@ -0,0 +1,178 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+    * 用户角色表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserRoleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserRoleController.class);
+
+    @Autowired
+    public ITaUserRoleService iTaUserRoleService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.GET)
+    public ResponseBean taUserRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaUserRole> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaUserRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaUserRole> result = iTaUserRoleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.POST)
+    public ResponseBean taUserRoleAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserRoleService.save(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 批量保存用户角色
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRoleList",method= RequestMethod.POST)
+    public ResponseBean taUserRoleListAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaUserRole> taUserRoleList = new ArrayList<>();
+            List<Integer> roleIdList = taUserRole.getRoleIdList();
+            roleIdList.forEach(e -> {
+                TaUserRole taUserRoles = new TaUserRole();
+                taUserRoles.setRoleId(e);
+                taUserRole.setUserId(taUserRole.getUserId());
+                taUserRoleList.add(taUserRoles);
+            });
+            if (iTaUserRoleService.saveBatch(taUserRoleList)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUserRole/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserRoleDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserRoleService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserRoleUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUserRole.setRoleId(id);
+            if (iTaUserRoleService.updateById(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUserRole/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserRoleGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserRoleService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -0,0 +1,82 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录账户
+     */
+    private String loginName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 账户过期时间
+     */
+    private LocalDateTime expDate;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUserRole.java

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+    
+    /**
+     * 角色ID集合
+     */
+    @TableField(exist = false)
+    private List<Integer> roleIdList = new ArrayList<>();
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserMapper extends BaseMapper<TaUser> {
+	
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserRoleMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户角色表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserRoleMapper extends BaseMapper<TaUserRole> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserRoleService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+
+/**
+ * <p>
+ * 用户角色表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserRoleService extends IService<TaUserRole> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserService extends IService<TaUser> {
+	
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserRoleServiceImpl extends ServiceImpl<TaUserRoleMapper, TaUserRole> implements ITaUserRoleService {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+	
+	@Autowired
+	private TaUserMapper taUserMapper;
+	
+	@Override
+	public IPage<Map<String,Object>> getPageList(IPage pg) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+		pg.setRecords(taUserList);
+		return pg;
+	}
+}

src/main/java/com/huiju/estateagents/common/JWTUtils.java

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.common;
 
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.Key;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * JWTUtils
@@ -17,7 +17,7 @@ import java.util.Date;
 public class JWTUtils {
     // 直接定义常量是不安全的
     public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-5-17 16:18:14".getBytes());
-
+    
     /**
      * getSubject 获取 jwt subject
      * @param request
@@ -38,6 +38,26 @@ public class JWTUtils {
 
         return null;
     }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getToken(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) {
+            return null;
+        }
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) {
+            return null;
+        }
+        
+        
+        return jwtAuths[1];
+    }
 
     /**
      * newToken 生成新的 token
@@ -49,7 +69,19 @@ public class JWTUtils {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
-
         return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
     }
+    
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newTokenByMap(Map subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+        return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
 }

src/main/java/com/huiju/estateagents/controller/SysButtonInMenuController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.service.ISysButtonInMenuService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 菜单按钮表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysButtonInMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysButtonInMenuController.class);
+
+    @Autowired
+    public ISysButtonInMenuService iSysButtonInMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu",method= RequestMethod.GET)
+    public ResponseBean sysButtonInMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysButtonInMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysButtonInMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysButtonInMenu> result = iSysButtonInMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysButtonInMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu",method= RequestMethod.POST)
+    public ResponseBean sysButtonInMenuAdd(@RequestBody SysButtonInMenu sysButtonInMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysButtonInMenuService.save(sysButtonInMenu)){
+                responseBean.addSuccess(sysButtonInMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysButtonInMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysButtonInMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysButtonInMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysButtonInMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysButtonInMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody SysButtonInMenu sysButtonInMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysButtonInMenuService.updateById(sysButtonInMenu)){
+                responseBean.addSuccess(sysButtonInMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysButtonInMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean sysButtonInMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysButtonInMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/SysMenuController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.service.ISysMenuService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 菜单表 不同系统,菜单不一致 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysMenuController.class);
+
+    @Autowired
+    public ISysMenuService iSysMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysMenu",method= RequestMethod.GET)
+    public ResponseBean sysMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysMenu> result = iSysMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysMenu",method= RequestMethod.POST)
+    public ResponseBean sysMenuAdd(@RequestBody SysMenu sysMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysMenuService.save(sysMenu)){
+                responseBean.addSuccess(sysMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody SysMenu sysMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysMenuService.updateById(sysMenu)){
+                responseBean.addSuccess(sysMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean sysMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaMiniappController.java

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.ITaMiniappService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 小程序表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaMiniappController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappController.class);
+
+    @Autowired
+    public ITaMiniappService iTaMiniappService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.GET)
+    public ResponseBean taMiniappList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMiniapp> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMiniapp> result = iTaMiniappService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
+    public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappService.save(taMiniapp)){
+                responseBean.addSuccess(taMiniapp);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMiniapp/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappUpdate(@PathVariable String id,
+                                        @RequestBody TaMiniapp taMiniapp){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taMiniapp.setMiniappId(id);
+            if (iTaMiniappService.updateById(taMiniapp)){
+                responseBean.addSuccess(taMiniapp);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaMiniappTemplateController.java

@@ -0,0 +1,146 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.service.ITaMiniappTemplateService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 小程序消息模板  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaMiniappTemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappTemplateController.class);
+
+    @Autowired
+    public ITaMiniappTemplateService iTaMiniappTemplateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{miniAppId}",method= RequestMethod.GET)
+    public ResponseBean taMiniappTemplateList(@PathVariable String miniappId,
+                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMiniappTemplate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("miniapp_id",miniappId);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMiniappTemplate> result = iTaMiniappTemplateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniappTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate",method= RequestMethod.POST)
+    public ResponseBean taMiniappTemplateAdd(@RequestBody TaMiniappTemplate taMiniappTemplate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappTemplateService.save(taMiniappTemplate)){
+                responseBean.addSuccess(taMiniappTemplate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/center/taMiniappTemplate/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappTemplateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappTemplateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniappTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappTemplateUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMiniappTemplate taMiniappTemplate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taMiniappTemplate.setSerialNo(id);
+            if (iTaMiniappTemplateService.updateById(taMiniappTemplate)){
+                responseBean.addSuccess(taMiniappTemplate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappTemplateGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappTemplateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaOrgController.java

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.service.ITaOrgService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 公司表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgController.class);
+
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.GET)
+    public ResponseBean taOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrg> result = iTaOrgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.POST)
+    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgService.save(taOrg)){
+                responseBean.addSuccess(taOrg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrg/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrg/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrg taOrg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrg.setOrgId(id);
+            if (iTaOrgService.updateById(taOrg)){
+                responseBean.addSuccess(taOrg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taOrg/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaRoleButtonController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.service.ITaRoleButtonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 角色按钮表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaRoleButtonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleButtonController.class);
+
+    @Autowired
+    public ITaRoleButtonService iTaRoleButtonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton",method= RequestMethod.GET)
+    public ResponseBean taRoleButtonList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRoleButton> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRoleButton> result = iTaRoleButtonService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRoleButton 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton",method= RequestMethod.POST)
+    public ResponseBean taRoleButtonAdd(@RequestBody TaRoleButton taRoleButton){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleButtonService.save(taRoleButton)){
+                responseBean.addSuccess(taRoleButton);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRoleButton/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleButtonDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleButtonService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRoleButton 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleButtonUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRoleButton taRoleButton){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleButtonService.updateById(taRoleButton)){
+                responseBean.addSuccess(taRoleButton);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRoleButton/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleButtonGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleButtonService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaRoleController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.service.ITaRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaRoleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleController.class);
+
+    @Autowired
+    public ITaRoleService iTaRoleService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRole",method= RequestMethod.GET)
+    public ResponseBean taRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRole> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRole> result = iTaRoleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRole",method= RequestMethod.POST)
+    public ResponseBean taRoleAdd(@RequestBody TaRole taRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleService.save(taRole)){
+                responseBean.addSuccess(taRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRole/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRole/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRole taRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleService.updateById(taRole)){
+                responseBean.addSuccess(taRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRole/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaRoleMenuController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaRoleMenu;
+import com.huiju.estateagents.service.ITaRoleMenuService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 角色菜单表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaRoleMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleMenuController.class);
+
+    @Autowired
+    public ITaRoleMenuService iTaRoleMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu",method= RequestMethod.GET)
+    public ResponseBean taRoleMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRoleMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRoleMenu> result = iTaRoleMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRoleMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu",method= RequestMethod.POST)
+    public ResponseBean taRoleMenuAdd(@RequestBody TaRoleMenu taRoleMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleMenuService.save(taRoleMenu)){
+                responseBean.addSuccess(taRoleMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRoleMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRoleMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRoleMenu taRoleMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleMenuService.updateById(taRoleMenu)){
+                responseBean.addSuccess(taRoleMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRoleMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -0,0 +1,50 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 菜单按钮表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysButtonInMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 按钮ID
+     */
+    @TableId(value = "btn_id", type = IdType.AUTO)
+    private Integer btnId;
+
+    /**
+     * 菜单ID
+     */
+    private Integer menuId;
+
+    /**
+     * 按钮名称
+     */
+    private String name;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    private String code;
+
+
+}

src/main/java/com/huiju/estateagents/entity/SysMenu.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 菜单ID
+     */
+    @TableId(value = "menu_id", type = IdType.AUTO)
+    private Integer menuId;
+
+    /**
+     * 菜单编码
+     */
+    private String code;
+
+    /**
+     * 菜单名称
+     */
+    private String name;
+
+    /**
+     * 父级菜单
+     */
+    private String parentCode;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 所属系统
+     */
+    private String appType;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaMiniapp.java

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 小程序表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniapp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小程序ID
+     */
+    private String miniappId;
+
+    /**
+     * secret
+     */
+    private String secret;
+
+    /**
+     * token
+     */
+    private String token;
+
+    /**
+     * 小程序名称
+     */
+    private String name;
+
+    /**
+     * 二维码
+     */
+    private String qrCode;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaMiniappTemplate.java

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 小程序消息模板 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniappTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    private Integer serialNo;
+
+    /**
+     * 小程序ID
+     */
+    private String miniappId;
+
+    /**
+     * 模板ID
+     */
+    private String tplId;
+
+    /**
+     * 模板名称
+     */
+    private String tplName;
+
+    /**
+     * 模板用途
+     */
+    private String tplType;
+
+    /**
+     * 模板字段数
+     */
+    private Integer fieldNum;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaOrg.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 公司表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公司id
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    private Integer orgId;
+
+    /**
+     * 公司名称
+     */
+    private String name;
+
+    /**
+     * 公司地址
+     */
+    private String address;
+
+    /**
+     * 公司logo
+     */
+    private String logo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaRole.java

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色id
+     */
+    @TableId(value = "role_id", type = IdType.AUTO)
+    private Integer roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaRoleButton.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色按钮表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRoleButton implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 按钮ID
+     */
+    private Integer btnId;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaRoleMenu.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色菜单表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRoleMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 菜单ID
+     */
+    private Integer menuId;
+
+
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -2,8 +2,11 @@ package com.huiju.estateagents.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.common.JWTUtils;
 import io.jsonwebtoken.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -13,13 +16,18 @@ import javax.servlet.http.HttpServletResponse;
 
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+    
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
             "/api/wx/tdCity",
             "/api/admin/signin",
             "/api/taCheckin/activity",
-            "/api/wx/qrcode/scene"
+            "/api/wx/qrcode/scene",
+		    "/api/center/signin",
     };
 
     /*
@@ -92,7 +100,17 @@ public class AccessInterceptor implements HandlerInterceptor {
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;
         }
-
+        
+        //添加如果执行了登出操作提示先进行登录
+        SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
+        if (null == sysToken){
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
+    
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+        
         return true;
     }
 

src/main/java/com/huiju/estateagents/mapper/SysButtonInMenuMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 菜单按钮表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysButtonInMenuMapper extends BaseMapper<SysButtonInMenu> {
+
+}

src/main/java/com/huiju/estateagents/mapper/SysMenuMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaMiniappMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniapp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小程序表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaMiniappTemplateMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 小程序消息模板  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaMiniappTemplateMapper extends BaseMapper<TaMiniappTemplate> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaOrgMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaOrg;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 公司表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaOrgMapper extends BaseMapper<TaOrg> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaRoleButtonMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaRoleButton;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 角色按钮表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaRoleButtonMapper extends BaseMapper<TaRoleButton> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaRoleMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaRoleMapper extends BaseMapper<TaRole> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaRoleMenuMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 角色菜单表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaRoleMenuMapper extends BaseMapper<TaRoleMenu> {
+
+}

src/main/java/com/huiju/estateagents/service/ISysButtonInMenuService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+
+/**
+ * <p>
+ * 菜单按钮表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysButtonInMenuService extends IService<SysButtonInMenu> {
+
+}

src/main/java/com/huiju/estateagents/service/ISysMenuService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysMenu;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysMenuService extends IService<SysMenu> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaMiniappService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaMiniapp;
+
+/**
+ * <p>
+ * 小程序表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaMiniappService extends IService<TaMiniapp> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaMiniappTemplateService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+
+/**
+ * <p>
+ * 小程序消息模板  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaMiniappTemplateService extends IService<TaMiniappTemplate> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaOrgService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaOrg;
+
+/**
+ * <p>
+ * 公司表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaOrgService extends IService<TaOrg> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaRoleButtonService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaRoleButton;
+
+/**
+ * <p>
+ * 角色按钮表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaRoleButtonService extends IService<TaRoleButton> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaRoleMenuService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaRoleMenu;
+
+/**
+ * <p>
+ * 角色菜单表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaRoleMenuService extends IService<TaRoleMenu> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaRoleService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaRole;
+
+/**
+ * <p>
+ * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaRoleService extends IService<TaRole> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/SysButtonInMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
+import com.huiju.estateagents.service.ISysButtonInMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 菜单按钮表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysButtonInMenuServiceImpl extends ServiceImpl<SysButtonInMenuMapper, SysButtonInMenu> implements ISysButtonInMenuService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/SysMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.mapper.SysMenuMapper;
+import com.huiju.estateagents.service.ISysMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.service.ITaMiniappService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp> implements ITaMiniappService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaMiniappTemplateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
+import com.huiju.estateagents.service.ITaMiniappTemplateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序消息模板  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaMiniappTemplateServiceImpl extends ServiceImpl<TaMiniappTemplateMapper, TaMiniappTemplate> implements ITaMiniappTemplateService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaOrgServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.service.ITaOrgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 公司表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaOrgServiceImpl extends ServiceImpl<TaOrgMapper, TaOrg> implements ITaOrgService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaRoleButtonServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.service.ITaRoleButtonService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色按钮表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaRoleButtonServiceImpl extends ServiceImpl<TaRoleButtonMapper, TaRoleButton> implements ITaRoleButtonService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaRoleMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaRoleMenu;
+import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import com.huiju.estateagents.service.ITaRoleMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色菜单表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaRoleMenuServiceImpl extends ServiceImpl<TaRoleMenuMapper, TaRoleMenu> implements ITaRoleMenuService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.ITaRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> implements ITaRoleService {
+
+}

src/main/resources/mapper/SysButtonInMenuMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.SysButtonInMenuMapper">
+
+</mapper>

src/main/resources/mapper/SysMenuMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.SysMenuMapper">
+
+</mapper>

src/main/resources/mapper/SysTokenMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper">
+
+</mapper>

src/main/resources/mapper/SysUserMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.center.sysUser.mapper.SysUserMapper">
+
+</mapper>

src/main/resources/mapper/TaMiniappMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaMiniappMapper">
+
+</mapper>

src/main/resources/mapper/TaMiniappTemplateMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaMiniappTemplateMapper">
+
+</mapper>

src/main/resources/mapper/TaOrgMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaOrgMapper">
+
+</mapper>

src/main/resources/mapper/TaRoleButtonMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaRoleButtonMapper">
+
+</mapper>

src/main/resources/mapper/TaRoleMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaRoleMapper">
+
+</mapper>

src/main/resources/mapper/TaRoleMenuMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.mapper.TaRoleMenuMapper">
+
+</mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -0,0 +1,30 @@
+<?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="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
+
+    <select id="getPageList" resultType="map">
+        SELECT
+            t.user_id AS userId,
+            t.org_id AS orgId,
+            t.user_name AS userName,
+            t.login_name AS loginName,
+            t.phone,
+            t.avatar,
+            t.create_date AS createDate,
+            o.NAME AS orgName,
+            o.address,
+            o.logo,
+            o.remark,
+            m.miniapp_id AS miniappId,
+            m.secret,
+            m.token,
+            m.NAME AS miniaooName,
+            m.qr_code AS qrCode
+        FROM
+            ta_user t
+            LEFT JOIN ta_org o ON t.org_id = o.org_id
+            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+        WHERE
+            t.is_admin =1
+    </select>
+</mapper>

src/main/resources/mapper/TaUserRoleMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper">
+
+</mapper>