删除无用代码

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

 package cn.wisenergy.mapper;
 
 
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.Users;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -17,22 +16,22 @@ import java.util.Map;
  * @ Date       : 2021/1/6 15:32
  */
 @Mapper
-public interface UsersMapper extends BaseMapper<User> {
+public interface UsersMapper extends BaseMapper<Users> {
     /**
      * 添加
      *
-     * @param user 用户信息
+     * @param users 用户信息
      * @return 用户信息
      */
-    int add(User user);
+    int add(Users users);
 
     /**
      * 编辑
      *
-     * @param user 用户信息
+     * @param users 用户信息
      * @return 修改是否成功
      */
-    int edit(User user);
+    int edit(Users users);
 
     /**
      * 删除
@@ -42,27 +41,27 @@ public interface UsersMapper extends BaseMapper<User> {
      */
     int delById(@Param("id") Integer id);
 
-    List<User> getList();
+    List<Users> getList();
 
     /**
      * 获取所有的非普通用户列表
      *
      * @return 非普通用户列表
      */
-    List<User> findAllNotZeroUser();
+    List<Users> findAllNotZeroUser();
 
-    User findByName(String name);
+    Users findByName(String name);
 
     String findPswByName(String UserName);
 
-    void save(User user);
+    void save(Users users);
 
     /**
      * 获取用户信息
      *
      * @return 用户信息
      */
-    User getUserById(@Param("id") Long id);
+    Users getUserById(@Param("id") Long id);
 
     /**
      * 获取用户信息
@@ -70,7 +69,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userId 用户id
      * @return 用户信息
      */
-    User getByUserId(@Param("userId") String userId);
+    Users getByUserId(@Param("userId") String userId);
 
     /**
      * 获取用户信息
@@ -94,14 +93,14 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param beInvitedCode 用户被邀请码
      * @return 用户信息
      */
-    User getByBeInvitedCode(@Param("beInvitedCode") String beInvitedCode);
+    Users getByBeInvitedCode(@Param("beInvitedCode") String beInvitedCode);
 
     /**
      * 获取黄金树以上会员用户
      *
      * @return
      */
-    List<User> getAllGoldUser();
+    List<Users> getAllGoldUser();
 
     /**
      * 查询用户
@@ -109,10 +108,10 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param param
      * @return
      */
-    public List<User> getUsersListByMap(Map<String, Object> param);
+    public List<Users> getUsersListByMap(Map<String, Object> param);
 
     //根据手机号查询用户Integer
-    User queryUsersByPhone(@Param("userId") String userId);
+    Users queryUsersByPhone(@Param("userId") String userId);
 
     //根据用户的推荐人邀请码比对推荐人的本人邀请码，查询推荐人的用户ID
     Integer inviteCodeBeInvitedCode(@Param("beInvitedCode") Integer beInvitedCode);
@@ -129,7 +128,7 @@ public interface UsersMapper extends BaseMapper<User> {
 
     Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
 
-    User edit1(int userLevel, String intiveCode, String userId);
+    Users edit1(int userLevel, String intiveCode, String userId);
 
     Integer getuserIdById(@Param("userId") String userId);
 
@@ -143,7 +142,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param inviteCode 用户本人的邀请码
      * @return 所有填写此人的邀请码的用户
      */
-    List<User> getByInviteCode(@Param("inviteCode") String inviteCode, @Param("userLevel") int userLevel);
+    List<Users> getByInviteCode(@Param("inviteCode") String inviteCode, @Param("userLevel") int userLevel);
 
     /**
      * 通过邀请码，获取用户信息
@@ -151,7 +150,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param inviteCode 邀请码
      * @return 用户信息
      */
-    User queryByInviteCode(@Param("inviteCode") String inviteCode);
+    Users queryByInviteCode(@Param("inviteCode") String inviteCode);
 
     /**
      * 通过用户等级，获取该等级用户列表
@@ -159,13 +158,13 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userLevel 用户等级
      * @return 等级用户列表
      */
-    List<cn.wisenergy.model.app.User> getByLevel(@Param("userLevel") Integer userLevel);
+    List<Users> getByLevel(@Param("userLevel") Integer userLevel);
 
     /**
      * @param
      * @return
      */
-    User biInvitedCode1(@Param("inviteCode") String inviteCode);
+    Users biInvitedCode1(@Param("inviteCode") String inviteCode);
 
 
     /**
@@ -174,7 +173,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param inviteCode
      * @return
      */
-    User InvitedCode2(@Param("inviteCode") String inviteCode);
+    Users InvitedCode2(@Param("inviteCode") String inviteCode);
 
     /**
      * 根据用户的推荐人邀请码 查询上级用户的id
@@ -192,8 +191,8 @@ public interface UsersMapper extends BaseMapper<User> {
      *
      * @return
      */
-    List<User> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
-                                                  @Param("now") String now);
+    List<Users> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
+                                                   @Param("now") String now);
 
     /**
      * 随机获取一条小于当前id的用户 即： 比当前用户早注册的用户
@@ -201,7 +200,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param id
      * @return
      */
-    User randOneGetUserByUserId(Integer id);
+    Users randOneGetUserByUserId(Integer id);
 
     /**
      * 根据邀请码获取所有的下级用户
@@ -209,7 +208,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userId
      * @return
      */
-    List<User> getListByIntvitedCode(String userId);
+    List<Users> getListByIntvitedCode(String userId);
 
     /**
      * 根据当前用户的推荐人邀请码获取推荐人的用户信息(上级用户信息)
@@ -217,7 +216,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param beInvitedCode
      * @return
      */
-    User getuserByBeInvitedCode(String beInvitedCode);
+    Users getuserByBeInvitedCode(String beInvitedCode);
 
     /**
      * 获取在团队中处于同一位置的用户集合
@@ -225,7 +224,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param beInvitedCode
      * @return
      */
-    List<User> getListUserByBeInvitedCode(String beInvitedCode);
+    List<Users> getListUserByBeInvitedCode(String beInvitedCode);
 
     /**
      * 通过邀请码获取用户信息
@@ -233,7 +232,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param inviteCode
      * @return
      */
-    User getUserByInviteCode(String inviteCode);
+    Users getUserByInviteCode(String inviteCode);
 
     /**
      * 根据用户的userid查询用户对象
@@ -241,7 +240,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userId
      * @return
      */
-    User getUserByUserId(String userId);
+    Users getUserByUserId(String userId);
 
     /**
      * 分页查询所有用户信息
@@ -249,7 +248,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param map
      * @return
      */
-    List<User> getUserList(Map<String, Object> map);
+    List<Users> getUserList(Map<String, Object> map);
 
     /**
      * 统计用户总记录数

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="cn.wisenergy.mapper.UsersMapper">
-    <resultMap id="userMap" type="cn.wisenergy.model.app.User">
+    <resultMap id="userMap" type="cn.wisenergy.model.app.Users">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="password" property="password"/>
@@ -72,7 +72,7 @@
     </sql>
 
 
-    <insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
+    <insert id="add" parameterType="cn.wisenergy.model.app.Users" keyProperty="id" useGeneratedKeys="true">
         insert into
         <include refid="table"/>
         (<include refid="cols_exclude_id"/>)
@@ -81,7 +81,7 @@
         )
     </insert>
 
-    <update id="edit" parameterType="cn.wisenergy.model.app.User">
+    <update id="edit" parameterType="cn.wisenergy.model.app.Users">
         UPDATE
         <include refid="table"/>
         <set>
@@ -109,7 +109,7 @@
         order by create_time desc
     </select>
 
-    <select id="getUserById" resultType="cn.wisenergy.model.app.User" parameterType="java.lang.Long">
+    <select id="getUserById" resultType="cn.wisenergy.model.app.Users" parameterType="java.lang.Long">
         select
         <include refid="cols_all"/>
         from
@@ -119,7 +119,7 @@
         </where>
     </select>
 
-    <select id="getByUserId" resultType="cn.wisenergy.model.app.User" parameterType="string">
+    <select id="getByUserId" resultType="cn.wisenergy.model.app.Users" parameterType="string">
         select
         id,user_id,password,head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
         be_invited_code,customer_service_id,create_time,update_time
@@ -148,7 +148,7 @@
         </where>
     </select>
 
-    <select id="findAllNotZeroUser" resultType="cn.wisenergy.model.app.User">
+    <select id="findAllNotZeroUser" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -159,16 +159,16 @@
     </select>
 
     <!--查询用户-->
-    <select id="findByName" resultType="cn.wisenergy.model.app.User">
+    <select id="findByName" resultType="cn.wisenergy.model.app.Users">
         select * from User where user_id = #{userId}
     </select>
 
     <!--查询密码-->
     <select id="findPswByName" resultType="String">
-        select password from user where user_id = #{userId}
+        select password from users where user_id = #{userId}
     </select>
 
-    <select id="getByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
+    <select id="getByBeInvitedCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -178,7 +178,7 @@
         </where>
     </select>
 
-    <select id="getAllGoldUser" resultType="cn.wisenergy.model.app.User">
+    <select id="getAllGoldUser" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -197,7 +197,7 @@
         insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})
     </insert>
 
-    <select id="queryUsersByPhone" resultType="cn.wisenergy.model.app.User">
+    <select id="queryUsersByPhone" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="vals"/>
         from
@@ -227,7 +227,7 @@
         </where>
     </select>
 
-    <select id="InvitedCode2" resultType="cn.wisenergy.model.app.User" parameterType="string">
+    <select id="InvitedCode2" resultType="cn.wisenergy.model.app.Users" parameterType="string">
         select
         *
         from
@@ -271,7 +271,7 @@
 
 
     <!--分页查询所有用户信息 -->
-    <select id="getUsersListByMap" resultType="cn.wisenergy.model.app.User" parameterType="java.util.Map">
+    <select id="getUsersListByMap" resultType="cn.wisenergy.model.app.Users" parameterType="java.util.Map">
         select id as id,
         user_id as userId,
         password as password,
@@ -323,7 +323,7 @@
     </select>
 
     <!--    获取当前用户的所有直接推荐人-->
-    <select id="getByInviteCode" resultType="cn.wisenergy.model.app.User" parameterType="string">
+    <select id="getByInviteCode" resultType="cn.wisenergy.model.app.Users" parameterType="string">
         select
         <include refid="cols_all"/>
         from
@@ -334,7 +334,7 @@
         </where>
     </select>
 
-    <select id="queryByInviteCode" resultType="cn.wisenergy.model.app.User">
+    <select id="queryByInviteCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -344,7 +344,7 @@
         </where>
     </select>
 
-    <select id="getByLevel" resultType="cn.wisenergy.model.app.User">
+    <select id="getByLevel" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -370,7 +370,7 @@
         invite_code = #{outerUserId}
     </select>
 
-    <select id="getAerialDeliveryUserBeforOneMonth" resultType="cn.wisenergy.model.app.User">
+    <select id="getAerialDeliveryUserBeforOneMonth" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -381,7 +381,7 @@
         BETWEEN #{before} AND #{now}
     </select>
 
-    <select id="randOneGetUserByUserId" resultType="cn.wisenergy.model.app.User">
+    <select id="randOneGetUserByUserId" resultType="cn.wisenergy.model.app.Users">
         SELECT
         <include refid="cols_all"/>
         FROM
@@ -390,7 +390,7 @@
         ORDER BY RAND() LIMIT 1
     </select>
 
-    <select id="getListByIntvitedCode" resultType="cn.wisenergy.model.app.User">
+    <select id="getListByIntvitedCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -398,7 +398,7 @@
         where be_invited_code = #{intiveCode}
     </select>
 
-    <select id="getuserByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
+    <select id="getuserByBeInvitedCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -407,7 +407,7 @@
         invite_code = #{be_invited_code}
     </select>
 
-    <select id="getListUserByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
+    <select id="getListUserByBeInvitedCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -416,7 +416,7 @@
         be_invited_code = #{be_invited_code}
     </select>
 
-    <select id="getUserByInviteCode" resultType="cn.wisenergy.model.app.User">
+    <select id="getUserByInviteCode" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -425,7 +425,7 @@
         invite_code = #{inviteCode}
     </select>
 
-    <select id="getUserByUserId" resultType="cn.wisenergy.model.app.User">
+    <select id="getUserByUserId" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from
@@ -435,7 +435,7 @@
     </select>
 
 
-    <select id="getUserList" resultType="cn.wisenergy.model.app.User">
+    <select id="getUserList" resultType="cn.wisenergy.model.app.Users">
         select
         <include refid="cols_all"/>
         from

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java → wisenergy-model/src/main/java/cn/wisenergy/model/app/Users.java

@@ -16,9 +16,9 @@ import java.util.Date;
  * @ CreateDate    :  2020/11/8 19:59
  */
 @Data
-@ApiModel(value = "UserInfo")
-@TableName("user_info")
-public class User  implements Serializable{
+@ApiModel(value = "User")
+@TableName("users")
+public class Users implements Serializable{
     private static final long serialVersionUID = 2525339404301884673L;
 
     /**
@@ -29,16 +29,16 @@ public class User  implements Serializable{
 
 
     /**
-     * 手机号作为用户账号
+     * 父id
      */
-    @ApiModelProperty(name = "user_id", value = "用户id")
-    private String userId;
+    @ApiModelProperty(name = "parentId", value = "父id")
+    private String parentId;
 
     /**
-     * 密码
+     * 层级树
      */
-    @ApiModelProperty(name = "password", value = "用户密码")
-    private String password;
+    @ApiModelProperty(name = "path", value = "层级树")
+    private String path;
 
     /**
      * 用户头像

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.User;
-
-import com.github.pagehelper.PageInfo;
-
-import java.util.Map;
+import cn.wisenergy.model.app.Users;
 
 /**
  * @author 86187
@@ -23,19 +19,12 @@ public interface UserService {
      * @param userId 用户id
      * @return 用户信息
      */
-    User getById(String userId);
+    Users getById(String userId);
 
-    /**
-     * 获取登录用户
-     *
-     * @param token
-     * @return
-     */
-    UsersDto getLoginUser(String token);
 
     R<Integer> getById1(String userId);
 
-    User getUserById(Long id);
+    Users getUserById(Long id);
 
     /**
      * 获取用户信息
@@ -43,22 +32,17 @@ public interface UserService {
      * @param userId 用户id
      * @return 用户信息
      */
-    User getByUserId(String userId);
+    Users getByUserId(String userId);
 
     /**
      * 根据手机号查询用户
      */
-    User queryUsersByPhone(String userId);
+    Users queryUsersByPhone(String userId);
 
     /**
      * 根据OpenId查询用户
      */
-    User queryUsersByOpenId(String openId);
-
-    /**
-     * 用户注册
-     */
-    Map userByZx(String userId, String beInvitedCode);
+    Users queryUsersByOpenId(String openId);
 
     /**
      * 用户登出
@@ -70,13 +54,6 @@ public interface UserService {
 
     Integer getUserIdById(String userId);
 
-    /**
-     * 空投池
-     *
-     * @return 用户列表信息
-     */
-    R<AerialDeliveryVo> queryAerialDelivery();
-
     /**
      * 设置用户头像
      *
@@ -86,28 +63,4 @@ public interface UserService {
      */
     R<Boolean> setHeadImage(String userId, String headImage);
 
-    /**
-     * 设置页面 -邀请码填写
-     *
-     * @param userId     用户id
-     * @param inviteCode 邀请人邀请码
-     * @return true or false
-     */
-    R<Boolean> fillInInviteCode(String userId, String inviteCode);
-
-    /**
-     * 分页查询所有用户信息
-     *
-     * @param queryDto 查询参数
-     * @return 列表
-     */
-    R<PageInfo<User>> getUserList(TeamQueryDto queryDto);
-
-    /**
-     * 将普通用户等级设置为幼苗用户等级
-     * @param userId 用户的userId
-     * @return  成功失败
-     */
-    Integer setUserLevelToSeedling(String userId);
-
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -4,13 +4,10 @@ import cn.wisenergy.common.constant.RedisConsts;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.common.utils.RedisUtils;
 import cn.wisenergy.model.app.*;
-import cn.wisenergy.model.dto.*;
-import cn.wisenergy.model.vo.*;
 import cn.wisenergy.service.app.*;
 import cn.wisenergy.web.common.BaseController;
 import cn.wisenergy.web.config.JwtConfig;
 import cn.wisenergy.web.shiro.JwtUtil;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -18,9 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -34,22 +28,6 @@ public class UserController extends BaseController {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private CultivatingPrizeService cultivatingPrizeService;
-
-
-    @Autowired
-    private CultivatingPrizeInfoService cultivatingPrizeInfoService;
-
-    @Autowired
-    private UserForestStatusService userForestStatusService;
-
-    @Autowired
-    RecommendUserService recommendUserService;
-
-    @Autowired
-    TeamUserInfoService teamUserInfoService;
-
     @Autowired
     private JwtUtil jwtUtil;
 
@@ -65,7 +43,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "获取用户信息", notes = "获取用户信息", httpMethod = "GET")
     @ApiImplicitParam(name = "userId", value = "用户id", dataType = "String")
     @GetMapping("/user/getByUserId")
-    public User getByUserId(String userId) {
+    public Users getByUserId(String userId) {
         return userService.getById(userId);
     }
 
@@ -82,65 +60,15 @@ public class UserController extends BaseController {
         }
 
         //用户信息
-        User user = userService.getByUserId(id);
+        Users users = userService.getByUserId(id);
 
         // 创建token
-        String token = jwtUtil.generateToken(user);
+        String token = jwtUtil.generateToken(users);
         // 保存Redis
         redisTemplate.opsForValue().set(RedisConsts.JWT_ACCESS_TOKEN + token, token);
         return R.ok(token);
     }
 
-    @ApiOperation(value = "获取用户森林状态接口", notes = "获取用户森林状态接口", httpMethod = "GET")
-    @GetMapping("/user/forestStatus")
-    public R<Map> forestStatus(String userId) {
-        if (null == userId) {
-            return R.error("入参为空");
-        }
-
-        try {
-            Map userForestStatus = userForestStatusService.getUserForestStatus(userId);
-            return R.ok(userForestStatus);
-        } catch (Exception e) {
-            return R.error(1, "请重新尝试");
-        }
-    }
-
-    @ApiOperation(value = "获取用户我的直推信息", notes = "获取用户我的直推信息", httpMethod = "GET")
-    @GetMapping("/user/myRecommend")
-    public R<Map> getMyRecommend(String userId) {
-        //用户id
-        int userLevel = userService.getByUserId(userId).getUserLevel();
-        //用户各等级人数
-        RecommendUser myRecommed = recommendUserService.getMyRecommed(userId);
-        Map myRecommedMap = new HashMap();
-        myRecommedMap.put("userlevel", userLevel);
-        myRecommedMap.put("myRecommed", myRecommed);
-        return R.ok(myRecommedMap);
-    }
-
-    @ApiOperation(value = "获取用户我的团队信息", notes = "获取用户我的团队推信息", httpMethod = "GET")
-    @GetMapping("/user/myTeam")
-    public R<TeamUserInfo> getMyTeam(String userId) {
-        TeamUserInfo myTeam = teamUserInfoService.getOneById(userId);
-        return R.ok(myTeam);
-    }
-
-    @ApiOperation(value = "获取用户我的直推信息详情", notes = "获取用户我的直推信息详情", httpMethod = "GET")
-    @GetMapping("/user/myRecommendInfo")
-    public R<List<UserAndRecommendVo>> getMyRecommendInfo(@RequestParam("userId") String userId, @RequestParam("userlevel") int userlevel) {
-        List<UserAndRecommendVo> myRecommendInfo = recommendUserService.getMyRecommendInfo(userId, userlevel);
-        return R.ok(myRecommendInfo);
-    }
-
-    @ApiOperation(value = "查询空投池信息", notes = "查询空投池信息", httpMethod = "GET")
-    @GetMapping("/user/queryAerialDelivery")
-    public R<AerialDeliveryVo> queryAerialDelivery() {
-        log.info("shop-mall[]UserController[]queryAerialDelivery[]input.method");
-
-        return userService.queryAerialDelivery();
-    }
-
 
     @ApiOperation(value = "设置头像", notes = "设置头像", httpMethod = "POST")
     @ApiImplicitParams({
@@ -156,94 +84,4 @@ public class UserController extends BaseController {
 
         return userService.setHeadImage(userId, headImage);
     }
-
-    @ApiOperation(value = "设置页面-邀请码填写", notes = "设置页面-邀请码填写", httpMethod = "POST")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "用户id", dataType = "String"),
-            @ApiImplicitParam(name = "inviteCode", value = "邀请码", dataType = "String")
-    })
-    @PostMapping("/user/fillInInviteCode")
-    public R<Boolean> fillInInviteCode(String userId, String inviteCode) {
-        log.info("shop-mall[]UserController[]fillInInviteCode[]input.param.userId,inviteCode:" + userId, inviteCode);
-        if (StringUtils.isBlank(userId) || StringUtils.isBlank(inviteCode)) {
-            return R.error("入参不能为空!");
-        }
-
-        return userService.fillInInviteCode(userId, inviteCode);
-    }
-
-    @ApiOperation(value = "后台-用户列表", notes = "用户列表", httpMethod = "GET")
-    @ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamQueryDto")
-    @GetMapping("/admin/user/queryUserList")
-    public R<PageInfo<User>> queryUserList(TeamQueryDto queryDto) {
-        log.info("shop-mall[]UserController[]queryUserList[]input.param.query:" + queryDto);
-        return userService.getUserList(queryDto);
-    }
-
-    @ApiOperation(value = "后台-直推用户列表", notes = "直推用户列表", httpMethod = "GET")
-    @ApiImplicitParam(name = "query", value = "查询参数", dataType = "RecommendUserDto")
-    @GetMapping("/admin/user/queryRecommendUserList")
-    public R<PageInfo<RecommendUserVo>> queryRecommendUserList(RecommendUserDto recommendUserDto) {
-        log.info("shop-mall[]UserController[]queryRecommendUserList[]input.param.query:" + recommendUserDto);
-        return recommendUserService.getRecommendUserList(recommendUserDto);
-    }
-
-    @ApiOperation(value = "后台-团队用户列表", notes = "团队用户列表", httpMethod = "GET")
-    @ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamUserInfoDto")
-    @GetMapping("/admin/user/queryTeamUserInfoList")
-    public R<PageInfo<TeamUserInfoVo>> queryTeamUserInfoList(TeamUserInfoDto teamUserInfoDto) {
-        log.info("shop-mall[]UserController[]queryTeamUserInfoList[]input.param.query:" + teamUserInfoDto);
-        return teamUserInfoService.getTeamUserInfoList(teamUserInfoDto);
-    }
-
-    @ApiOperation(value = "后台-培育奖记录表", notes = "培育奖记录表", httpMethod = "GET")
-    @ApiImplicitParam(name = "query", value = "查询参数", dataType = "CultivatingPrizeInfoDto")
-    @GetMapping("/admin/user/queryCultivatingInfo")
-    public R<PageInfo<CultivatingPrizeInfoVo>> queryCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
-        log.info("shop-mall[]UserController[]queryCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
-        return cultivatingPrizeInfoService.getCultivatingPrizeInfoList(cultivatingPrizeInfoDto);
-    }
-
-    @ApiOperation(value = "后台-培育奖表列表", notes = "培育奖表列表", httpMethod = "GET")
-    @GetMapping("/admin/user/queryCultivatingPrizeInfoList")
-    public R<List<CultivatingPrize>> queryCultivatingPrizeList() {
-        log.info("shop-mall[]UserController[]queryCultivatingPrizeList[]input.param.query:");
-        return cultivatingPrizeService.getCultivatingPrizeList();
-    }
-
-    @ApiOperation(value = "后台-培育奖设置", notes = "后台-培育奖设置", httpMethod = "POST")
-    @ApiImplicitParam(name = "setVo", value = "参数信息", dataType = "SetCultivatingVo")
-    @PostMapping("/admin/setAward")
-    public R<Boolean> setAward(@RequestBody SetCultivatingVo setVo) {
-        log.info("shop-mall[]UserController[]setAward[]input.param.setVo:" + setVo);
-        if (null == setVo || null == setVo.getUserLevel() || null == setVo.getPrizeAward()) {
-            return R.error("入参不能为空!");
-        }
-        return cultivatingPrizeService.setAward(setVo);
-    }
-
-    @ApiOperation(value = "后台-设置用户等级为幼苗", notes = "后台-设置用户等级为幼苗", httpMethod = "GET")
-    @GetMapping("admin/user/setUserLevelToSeedling")
-    public R<String> setUserLevelToSeedling(String userId) {
-        if (null == userId ) {
-            return R.error("入参为空");
-        }
-
-        User userByUserId = userService.getByUserId(userId);
-        if (null == userByUserId) {
-            return R.error(1, "当前用户不存在");
-        }
-
-        if (userByUserId.getUserLevel() != 0) {
-            return R.error("用户等级不是普通用户，请查看自己等级");
-        }
-        //进行用户等级设置
-        int flag = userService.setUserLevelToSeedling(userId);
-        if (flag == 0) {
-            return R.ok(0, "设置成功");
-        } else {
-            return R.error(1, "设置失败，请重试");
-        }
-
-    }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java

 package cn.wisenergy.web.common;
 
 
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.Users;
 import cn.wisenergy.service.app.UserService;
 import cn.wisenergy.web.shiro.JwtUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,8 +32,8 @@ public abstract class BaseController {
      *
      * @return
      */
-    public User getUser() {
-        return (User) SecurityUtils.getSubject().getPrincipal();
+    public Users getUser() {
+        return (Users) SecurityUtils.getSubject().getPrincipal();
     }
 
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/JwtUtil.java

@@ -2,7 +2,7 @@ package cn.wisenergy.web.shiro;
 
 import cn.wisenergy.common.enums.RespCodeEnum;
 
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.Users;
 import cn.wisenergy.web.config.JwtConfig;
 import com.alibaba.fastjson.JSON;
 import io.jsonwebtoken.*;
@@ -71,11 +71,11 @@ public class JwtUtil {
     /**
      * 生成Jwt令牌
      *
-     * @param userDetails 用户信息
+     * @param usersDetails 用户信息
      * @return
      */
-    public String generateToken(User userDetails) {
-        return createJWT(JSON.toJSONString(userDetails));
+    public String generateToken(Users usersDetails) {
+        return createJWT(JSON.toJSONString(usersDetails));
     }
 
     /**
@@ -83,8 +83,8 @@ public class JwtUtil {
      *
      * @return
      */
-    public User getUserFromToken(Claims claims) {
-        return JSON.parseObject(claims.getSubject(), User.class);
+    public Users getUserFromToken(Claims claims) {
+        return JSON.parseObject(claims.getSubject(), Users.class);
     }
 
     /**

wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthRealm.java

@@ -2,7 +2,7 @@ package cn.wisenergy.web.shiro.filter;
 
 import cn.wisenergy.common.constant.RedisConsts;
 import cn.wisenergy.common.enums.RespCodeEnum;
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.Users;
 import cn.wisenergy.service.app.UserService;
 import cn.wisenergy.web.config.JwtConfig;
 import cn.wisenergy.web.shiro.AuthToken;
@@ -67,12 +67,12 @@ public class AuthRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
         // 获取token
         String accessToken = (String) token.getPrincipal();
-        User userEntity = null;
+        Users usersEntity = null;
         boolean refreshFlag = false;
         // 解析token
         Claims claims = jwtUtil.getClaimsFromToken(accessToken);
         // 从token中获取用户
-        userEntity = jwtUtil.getUserFromToken(claims);
+        usersEntity = jwtUtil.getUserFromToken(claims);
         // 获取redis Key
         String redisKey = RedisConsts.JWT_ACCESS_TOKEN + accessToken;
         // 从redis中获取token
@@ -98,13 +98,13 @@ public class AuthRealm extends AuthorizingRealm {
             throw new IncorrectCredentialsException(RespCodeEnum.TOKEN_IS_NOT_TIMEOUT.getMsg());
         }*/
         //查询用户信息
-        User user = authUserService.getByUserId(userEntity.getUserId());
+        Users users = authUserService.getByUserId(usersEntity.getUserId());
         // 判断请求token与redis中是否相同，如果token被刷新，则不判断
         if (!refreshFlag && !StringUtils.equals(accessToken, redisToken)) {
             throw new IncorrectCredentialsException(RespCodeEnum.NO_AUTH_REQUEST.getMsg());
         }
         // 账号不存在
-        if (user == null) {
+        if (users == null) {
             throw new UnknownAccountException("账号不存在");
         }
         // 密码错误
@@ -119,7 +119,7 @@ public class AuthRealm extends AuthorizingRealm {
             // 重置Redis中token过期时间，如果token被刷新，则不进行重置
             redisTemplate.opsForValue().set(redisKey, accessToken, jwtConfig.getExpire() + 60 * 60);
         }
-        SimpleAuthenticationInfo info = new SimpleAuthenticationInfo(user, accessToken, getName());
+        SimpleAuthenticationInfo info = new SimpleAuthenticationInfo(users, accessToken, getName());
         return info;
     }
 

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -16,9 +16,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://8.131.244.76:3306/shop-mall?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://8.140.102.52:3306/shop-mall?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
-      password: qzh@xitiansen
+      password: adm4HYservice$
       initial-size: 10
       max-active: 100
       min-idle: 10

wisenergy-web-admin/src/main/resources/application.yml

@@ -8,9 +8,9 @@ server:
     max-http-form-post-size: 1024MB
 
   #      1 073 741 824
-  port: 81
+  port: 8080
   servlet:
-    context-path: /shop-mall
+    context-path: /data
 
 spring:
   main:

xxl-job/xxl-job-admin/src/main/resources/i18n/message_en.properties

@@ -256,7 +256,7 @@ jobconf_trigger_type_api=Api trigger
 jobconf_trigger_type_retry=Fail retry trigger
 jobconf_trigger_type_misfire=Misfire compensation trigger
 
-## user
+## users
 user_manage=User Manage
 user_username=Username
 user_password=Password

xxl-job/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties

@@ -256,7 +256,7 @@ jobconf_trigger_type_api=API触发
 jobconf_trigger_type_retry=失败重试触发
 jobconf_trigger_type_misfire=调度过期补偿
 
-## user
+## users
 user_manage=用户管理
 user_username=账号
 user_password=密码

xxl-job/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties

@@ -256,7 +256,7 @@ jobconf_trigger_type_api=API觸發
 jobconf_trigger_type_retry=失敗重試觸發
 jobconf_trigger_type_misfire=調度過期補償
 
-## user
+## users
 user_manage=用户管理
 user_username=帳號
 user_password=密碼

xxl-job/xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg

@@ -70,7 +70,7 @@ l502 -73q56 -9 56 -46z" />
     <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
 d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+    <glyph glyph-name="users" unicode="&#xf007;" horiz-adv-x="1280"
 d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
 t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
     <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 

xxl-job/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

@@ -6,7 +6,7 @@
 	<meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <!-- Tell the browser to be responsive to screen width -->
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, users-scalable=no" name="viewport">
     <!-- Bootstrap -->
     <link rel="stylesheet" href="${request.contextPath}/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css">
     <!-- Font Awesome -->
@@ -81,7 +81,7 @@
 
           	<div class="navbar-custom-menu">
 				<ul class="nav navbar-nav">
-					<#-- login user -->
+					<#-- login users -->
                     <li class="dropdown">
                         <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                             ${I18n.system_welcome} ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
@@ -139,7 +139,7 @@
 				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-green"></i><span>${I18n.joblog_name}</span></a></li>
 				<#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1>
                     <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-red"></i><span>${I18n.jobgroup_name}</span></a></li>
-                    <li class="nav-click <#if pageName == "user">active</#if>" ><a href="${request.contextPath}/user"><i class="fa fa-circle-o text-purple"></i><span>${I18n.user_manage}</span></a></li>
+                    <li class="nav-click <#if pageName == "users">active</#if>" ><a href="${request.contextPath}/users"><i class="fa fa-circle-o text-purple"></i><span>${I18n.user_manage}</span></a></li>
 				</#if>
 				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>${I18n.job_help}</span></a></li>
 			</ul>
@@ -173,7 +173,7 @@
 					</li>
 					<li>
 						<a href="javascript::;"> 
-							<i class="menu-icon fa fa-user bg-yellow"></i>
+							<i class="menu-icon fa fa-users bg-yellow"></i>
 							<div class="menu-info">
 								<h4 class="control-sidebar-subheading">Frodo 更新了资料</h4>
 								<p>更新手机号码 +1(800)555-1234</p>

xxl-job/xxl-job-admin/src/main/resources/templates/user/user.index.ftl

@@ -12,7 +12,7 @@
 	<!-- header -->
 	<@netCommon.commonHeader />
 	<!-- left -->
-	<@netCommon.commonLeft "user" />
+	<@netCommon.commonLeft "users" />
 	
 	<!-- Content Wrapper. Contains page content -->
 	<div class="content-wrapper">
@@ -183,6 +183,6 @@
 <!-- DataTables -->
 <script src="${request.contextPath}/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-<script src="${request.contextPath}/static/js/user.index.1.js"></script>
+<script src="${request.contextPath}/static/js/users.index.1.js"></script>
 </body>
 </html>