fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionCashLogController.java

@@ -4,7 +4,6 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionCashWithdrawalController.java

@@ -7,7 +7,6 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -7,7 +7,6 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.distribution.bo.DistributionSellerAddBo;
@@ -88,7 +87,7 @@ public class DistributionSellerController extends BaseController {
     @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionSellerEditBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
+        bo.setSysUserId(loginUser.getUser().getUserId());
         return toAjax(iDistributionSellerService.updateByEditBo(bo) ? 1 : 0);
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/SellerLoginController.java

@@ -3,7 +3,6 @@ package com.zhongzheng.controller.distribution;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.modules.distribution.bo.SellerAppAccountLoginBo;
 import com.zhongzheng.modules.distribution.bo.SellerAppRegisterBo;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
@@ -30,7 +29,6 @@ public class SellerLoginController extends BaseController {
 
     private final IDistributionSellerService iDistributionSellerService;
 
-    private final SellerTokenService sellerTokenService;
 
     /**
      * 用户注册
@@ -65,7 +63,7 @@ public class SellerLoginController extends BaseController {
     @GetMapping("/refreshToken/{userAccount}")
     public AjaxResult refreshToken(@PathVariable("userAccount") String userAccount)
     {
-        String token = sellerTokenService.refreshSellerToken(userAccount);
+        String token = iDistributionSellerService.refreshSellerToken(userAccount);
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN, token);
         return AjaxResult.success(map);

zhongzheng-common/src/main/java/com/zhongzheng/common/constant/Constants.java

@@ -64,7 +64,6 @@ public class Constants
 
     public static final String WX_LOGIN_TOKEN_KEY = "wx_login_tokens:";
 
-    public static final String SELLER_LOGIN_TOKEN_KEY = "se_login_tokens:";
 
     /**
      * 防重提交 redis key
@@ -98,7 +97,6 @@ public class Constants
      */
     public static final String WX_TOKEN_PREFIX = "WX ";
 
-    public static final String SELLER_TOKEN_PREFIX = "SE ";
 
     public static final String REGISTER_SMS = "REGISTER-";
     public static final String FORGET_SMS = "FORGET-";
@@ -114,7 +112,6 @@ public class Constants
 
     public static final String WX_LOGIN_USER_KEY = "wx_login_user_key";
 
-    public static final String SELLER_LOGIN_USER_KEY = "seller_login_user_key";
 
 
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -4,10 +4,6 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.http.HttpStatus;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ip.IpUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.user.entity.ClientLoginSeller;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -47,9 +43,6 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
     @Autowired
     private TopTokenService topTokenService;
 
-    @Autowired
-    private SellerTokenService sellerTokenService;
-
     @Value("${mybatis-plus.tenant.enabled-tenant:true}")
     private boolean enabledTenant;
 
@@ -79,31 +72,18 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
                         SecurityContextHolder.getContext().setAuthentication(authenticationToken);
                     }
                 }else{
-                    String sellerToken = sellerTokenService.getToken(request);
-                    if(StringUtils.isNoneEmpty(sellerToken)){
-                        //业务员系统
-                        ClientLoginSeller clientLoginSeller = sellerTokenService.getLoginUser(request);
-                        if(clientLoginSeller!=null){
-                            sellerTokenService.verifyToken(clientLoginSeller);
-                            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(clientLoginSeller, null,null);
-                            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
-                        }
-                    }else{
-                        //子系统
-                        LoginUser loginUser = null;
+                    //子系统
+                    LoginUser loginUser = null;
 
-                        loginUser = tokenService.getLoginUser(request);
+                    loginUser = tokenService.getLoginUser(request);
 
-                        if (Validator.isNotNull(loginUser) && Validator.isNull(SecurityUtils.getAuthentication()))
-                        {
-                            tokenService.verifyToken(loginUser);
-                            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
-                            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
-                        }
+                    if (Validator.isNotNull(loginUser) && Validator.isNull(SecurityUtils.getAuthentication()))
+                    {
+                        tokenService.verifyToken(loginUser);
+                        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
+                        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                        SecurityContextHolder.getContext().setAuthentication(authenticationToken);
                     }
-
                 }
 
             }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/DistributionSellerServiceImpl.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
@@ -21,6 +20,7 @@ import com.zhongzheng.common.exception.BaseException;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.*;
+import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.modules.distribution.bo.*;
 import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.mapper.DistributionSellerMapper;
@@ -30,7 +30,7 @@ import com.zhongzheng.modules.system.service.ISysRoleService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -112,6 +112,7 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
         inertData.setCreateTime(DateUtils.getNowTime());
         inertData.setUpdateTime(DateUtils.getNowTime());
         inertData.setShareCode(ToolsUtils.getRandomString(8));
+        inertData.setRegisterFrom(1);
         if(Validator.isNotEmpty(bo.getShareCode())){
             DistributionSeller sellerShare = getOne(new LambdaQueryWrapper<DistributionSeller>()
                     .eq(DistributionSeller::getShareCode,bo.getShareCode()).last("limit 1"));
@@ -129,6 +130,7 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             SysUser sysUser = new SysUser();
             sysUser.setUserName(bo.getTel());
             sysUser.setPhonenumber(bo.getTel());
+            sysUser.setIdCard(bo.getIdcard());
             sysUser.setAvatar(bo.getAvatar());
             sysUser.setPassword(SecurityUtils.encryptPassword(bo.getPwd()));
             sysUser.setPwdTime(DateUtils.getNowTime());
@@ -339,40 +341,62 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(DistributionSellerAddBo bo) {
-
-   /*     DistributionSeller add = BeanUtil.toBean(bo, DistributionSeller.class);
+        if(Validator.isEmpty(bo.getIdCard())){
+            throw new CustomException("没有身份证信息");
+        }
+        if(Validator.isEmpty(bo.getPhonenumber())){
+            throw new CustomException("没有手机号码");
+        }
+        if(Validator.isEmpty(bo.getRealname())){
+            throw new CustomException("没有真实姓名");
+        }
+        SysUser sellerIdCard = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getIdCard,bo.getIdCard()));
+        if(Validator.isNotNull(sellerIdCard)){
+            if(Validator.isNotEmpty(sellerIdCard.getSellerId())){
+                throw new CustomException("该身份证已注册业务员");
+            }
+        }
+        DistributionSeller add = BeanUtil.toBean(bo, DistributionSeller.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
 
         DistributionSeller inertData = new DistributionSeller();
-        //密码身份证后六位
-        String pwd =  bo.getIdCard().substring(bo.getIdCard().length() - 6);
-        inertData.setPassword(SecurityUtils.encryptPassword(pwd));
-        inertData.setTelphone(bo.getTelphone());
-        inertData.setIdCard(bo.getIdCard());
         inertData.setRealname(bo.getRealname());
-        inertData.setAvatar(Constants.DEFAULT_AVATAR);
         inertData.setUserAccount(ServletUtils.getEncoded("YW"));
         inertData.setCreateTime(DateUtils.getNowTime());
         inertData.setUpdateTime(DateUtils.getNowTime());
         inertData.setShareCode(ToolsUtils.getRandomString(8));
-        inertData.setAvatar(bo.getAvatar());
-        User userIdCard = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getIdCard,EncryptHandler.encrypt(bo.getIdCard())).last("limit 1"));
-        if(Validator.isNotEmpty(userIdCard)){
-            inertData.setUserId(userIdCard.getUserId());
+        inertData.setRegisterFrom(2);
+        if(!save(inertData)){
+            throw new CustomException("注册失败");
         }
-        if(Validator.isNotEmpty(bo.getShareCode())){
-            DistributionSeller sellerShare = getOne(new LambdaQueryWrapper<DistributionSeller>()
-                    .eq(DistributionSeller::getShareCode,bo.getShareCode()).last("limit 1"));
-            if(Validator.isNotEmpty(sellerShare)){
-                inertData.setParentId(sellerShare.getSellerId());
+        if(Validator.isNotEmpty(sellerIdCard)){
+            sellerIdCard.setSellerId(inertData.getSellerId());
+            iSysUserService.updateById(sellerIdCard);
+        }else{
+            SysUser sysUser = new SysUser();
+            sysUser.setUserName(bo.getPhonenumber());
+            sysUser.setPhonenumber(bo.getPhonenumber());
+            sysUser.setIdCard(bo.getIdCard());
+            //密码身份证后六位
+            String pwd =  bo.getIdCard().substring(bo.getIdCard().length() - 6);
+            sysUser.setPassword(SecurityUtils.encryptPassword(pwd));
+            sysUser.setPwdTime(DateUtils.getNowTime());
+            sysUser.setSellerId(inertData.getSellerId());
+            SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
+                    .eq(SysRole::getRoleKey, "seller")
+                    .eq(SysRole::getStatus, 1).last("limit 1"));
+            if(Validator.isNotEmpty(role)){
+                sysUser.setRoleIds(new Long[]{role.getRoleId()});
             }
+            iSysUserService.insertUser(sysUser);
         }
-        return this.save(inertData);*/
-        return null;
+
+        return true;
     }
 
     @Override
@@ -398,6 +422,7 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             inertData.setCreateTime(DateUtils.getNowTime());
             inertData.setUpdateTime(DateUtils.getNowTime());
             inertData.setShareCode(ToolsUtils.getRandomString(8));
+            inertData.setRegisterFrom(3);
             if(this.save(inertData)){
                 user.setSellerId(inertData.getSellerId());
             }
@@ -407,10 +432,11 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
 
     @Override
     public Boolean updateByEditBo(DistributionSellerEditBo bo) {
-        DistributionSeller update = BeanUtil.toBean(bo, DistributionSeller.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        SysUser user = new SysUser();
+        user.setAvatar(bo.getAvatar());
+        user.setUserId(bo.getSysUserId());
+        user.setUpdateTime(DateUtils.getNowDate());
+        return iSysUserService.updateById(user);
     }
 
     /**
@@ -429,6 +455,21 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
         }
         return this.removeByIds(ids);
     }
-
+    @Override
+    public String refreshSellerToken(String userAccount) {
+        DistributionSeller seller = getOne(new LambdaQueryWrapper<DistributionSeller>()
+                .eq(DistributionSeller::getUserAccount, userAccount).last("limit 1"));
+        if (seller == null) {
+            throw new CustomException("userAccount不存在");
+        }
+        SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getSellerId, seller.getSellerId()).last("limit 1"));
+        if(Validator.isEmpty(sysUser)){
+            throw new CustomException("非法账号");
+        }
+        LoginUser loginSeller = new LoginUser();
+        loginSeller.setUser(sysUser);
+        return tokenService.createToken(loginSeller);
+    }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SellerTokenService.java

@@ -1,267 +0,0 @@
-package com.zhongzheng.framework.web.service;
-
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.redis.RedisCache;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ip.AddressUtils;
-import com.zhongzheng.common.utils.ip.IpUtils;
-import com.zhongzheng.modules.distribution.domain.DistributionSeller;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.order.domain.Order;
-import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
-import com.zhongzheng.modules.user.service.IUserService;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * token验证处理
- *
- * @author zhongzheng
- */
-@Component
-public class SellerTokenService
-{
-    // 令牌自定义标识
-    @Value("${token.header}")
-    private String header;
-
-    // 令牌秘钥
-    @Value("${token.secret}")
-    private String secret;
-
-    // 令牌有效期（默认30分钟）
-    @Value("${token.expireTime}")
-    private int expireTime;
-
-    protected static final long MILLIS_SECOND = 1000;
-
-    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
-
-    private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
-
-    @Autowired
-    private RedisCache redisCache;
-
-    @Autowired
-    private IDistributionSellerService iDistributionSellerService;
-
-
-
-    @Resource
-    private AuthenticationManager authenticationManager;
-
-    /**
-     * 获取用户身份信息
-     *
-     * @return 用户信息
-     */
-    public ClientLoginSeller getLoginUser(HttpServletRequest request)
-    {
-        //测试用户
-        String test_token = request.getHeader("X-Auth-Token");
-        if("test-seller".equals(test_token)){
-            return getTestUser();
-        }
-        // 获取请求携带的令牌
-        String token = getToken(request);
-        if (Validator.isNotEmpty(token))
-        {
-            Claims claims = parseToken(token);
-            // 解析对应的权限以及用户信息
-            String uuid = (String) claims.get(Constants.SELLER_LOGIN_USER_KEY);
-            String userKey = getTokenKey(uuid);
-            ClientLoginSeller user = redisCache.getCacheObject(userKey);
-            return user;
-        }
-        return null;
-    }
-
-    private ClientLoginSeller getTestUser(){
-        DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>().eq(DistributionSeller::getSellerId, 1L));
-        ClientLoginSeller loginUser = new ClientLoginSeller();
-        loginUser.setSeller(seller);
-        loginUser.setExpireTime(System.currentTimeMillis()+200);
-        return loginUser;
-    }
-
-    /**
-     * 设置用户身份信息
-     */
-    public void setLoginUser(ClientLoginSeller loginUser)
-    {
-        if (Validator.isNotNull(loginUser) && Validator.isNotEmpty(loginUser.getToken()))
-        {
-            refreshToken(loginUser);
-        }
-    }
-
-    /**
-     * 删除用户身份信息
-     */
-    public void delLoginUser(String token)
-    {
-        if (Validator.isNotEmpty(token))
-        {
-            String userKey = getTokenKey(token);
-            redisCache.deleteObject(userKey);
-        }
-    }
-
-    /**
-     * 创建令牌
-     *
-     * @param loginUser 用户信息
-     * @return 令牌
-     */
-    public String createToken(ClientLoginSeller loginUser)
-    {
-        String token = IdUtil.simpleUUID()+loginUser.getSeller().getUserAccount();
-        loginUser.setToken(token);
-        setUserAgent(loginUser);
-        refreshToken(loginUser);
-        Map<String, Object> claims = new HashMap<>();
-        claims.put(Constants.SELLER_LOGIN_USER_KEY, token);
-        return createToken(claims);
-    }
-
-    /**
-     * 验证令牌有效期，相差不足20分钟，自动刷新缓存
-     *
-     * @param loginUser
-     * @return 令牌
-     */
-    public void verifyToken(ClientLoginSeller loginUser)
-    {
-        long expireTime = loginUser.getExpireTime();
-        long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
-        {
-            refreshToken(loginUser);
-        }
-    }
-
-    /**
-     * 刷新令牌有效期
-     *
-     * @param loginUser 登录信息
-     */
-    public void refreshToken(ClientLoginSeller loginUser)
-    {
-        loginUser.setLoginTime(System.currentTimeMillis());
-        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
-        // 根据uuid将loginUser缓存
-        String userKey = getTokenKey(loginUser.getToken());
-        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
-    }
-
-    /**
-     * 设置用户代理信息
-     *
-     * @param loginUser 登录信息
-     */
-    public void setUserAgent(ClientLoginSeller loginUser)
-    {
-        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
-        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
-        loginUser.setIpaddr(ip);
-        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
-        loginUser.setBrowser(userAgent.getBrowser().getName());
-        loginUser.setOs(userAgent.getOs().getName());
-    }
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     * @return 令牌
-     */
-    private String createToken(Map<String, Object> claims)
-    {
-        String token = Jwts.builder()
-                .setClaims(claims)
-                .signWith(SignatureAlgorithm.HS512, secret).compact();
-        return token;
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     * @return 数据声明
-     */
-    private Claims parseToken(String token)
-    {
-        return Jwts.parser()
-                .setSigningKey(secret)
-                .parseClaimsJws(token)
-                .getBody();
-    }
-
-    /**
-     * 从令牌中获取用户名
-     *
-     * @param token 令牌
-     * @return 用户名
-     */
-    public String getUsernameFromToken(String token)
-    {
-        Claims claims = parseToken(token);
-        return claims.getSubject();
-    }
-
-    /**
-     * 获取请求token
-     *
-     * @param request
-     * @return token
-     */
-    public String getToken(HttpServletRequest request)
-    {
-        String token = request.getHeader(header);
-        if (Validator.isNotEmpty(token) && token.startsWith(Constants.SELLER_TOKEN_PREFIX))
-        {
-            token = token.replace(Constants.SELLER_TOKEN_PREFIX, "");
-            return token;
-        }else{
-            return null;
-        }
-
-    }
-
-    private String getTokenKey(String uuid)
-    {
-        return Constants.SELLER_LOGIN_TOKEN_KEY + uuid;
-    }
-
-
-    public String refreshSellerToken(String userAccount) {
-        DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>().eq(DistributionSeller::getUserAccount, userAccount));
-        if (seller == null) {
-            throw new CustomException("userAccount不存在");
-        }
-
-        ClientLoginSeller loginUser = new ClientLoginSeller();
-        loginUser.setSeller(seller);
-        return createToken(loginUser);
-    }
-}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -15,6 +15,7 @@ import com.zhongzheng.common.utils.ip.AddressUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -248,6 +249,7 @@ public class TokenService
         return claims.getSubject();
     }
 
+
     /**
      * 获取请求token
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSellerAddBo.java

@@ -59,4 +59,11 @@ public class DistributionSellerAddBo {
     /** 冻结金额 */
     @ApiModelProperty("冻结金额")
     private BigDecimal freezeCash;
+    /** 1招募注册 2后台添加 3关联注册 */
+    @ApiModelProperty("1招募注册 2后台添加 3关联注册")
+    private Integer registerFrom;
+    @ApiModelProperty("身份证")
+    private String idCard;
+    @ApiModelProperty("手机")
+    private String phonenumber;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSellerEditBo.java

@@ -27,7 +27,8 @@ public class DistributionSellerEditBo {
     @ApiModelProperty("真实姓名")
     private String realname;
 
-
+    @ApiModelProperty("头像")
+    private String avatar;
 
     /** 1有效 0禁用 */
     @ApiModelProperty("1有效 0禁用")
@@ -63,5 +64,9 @@ public class DistributionSellerEditBo {
     *//** 分享码 *//*
     @ApiModelProperty("分享码")
     private String shareCode;*/
-
+    @ApiModelProperty("系统用户ID")
+    private Long sysUserId;
+    /** 1招募注册 2后台添加 3关联注册 */
+    @ApiModelProperty("1招募注册 2后台添加 3关联注册")
+    private Integer registerFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionSeller.java

@@ -53,4 +53,6 @@ private static final long serialVersionUID=1L;
     private BigDecimal usedCash;
     /** 冻结金额 */
     private BigDecimal freezeCash;
+    /** 1招募注册 2后台添加 3关联注册 */
+    private Integer registerFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionSellerService.java

@@ -76,4 +76,6 @@ public interface IDistributionSellerService extends IService<DistributionSeller>
 
 	List<DistributionSellerVo> getSellerListByTenant(DistributionSellerQuery query);
 
+	String refreshSellerToken(String userAccount);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSellerVo.java

@@ -95,4 +95,8 @@ public class DistributionSellerVo {
 	private String idCard;
 	@ApiModelProperty("头像")
 	private String avatar;
+	/** 1招募注册 2后台添加 3关联注册 */
+	@Excel(name = "1招募注册 2后台添加 3关联注册")
+	@ApiModelProperty("1招募注册 2后台添加 3关联注册")
+	private Integer registerFrom;
 }

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionSellerMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unionId" column="union_id"/>
         <result property="parentId" column="parent_id"/>
         <result property="shareCode" column="share_code"/>
+        <result property="registerFrom" column="register_from"/>
     </resultMap>