Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -150,7 +150,7 @@ handouts:
 
 Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: 39149760
+    APPkey: SD39149760
     APPSecret: 07168A248B2844E0
 
 oldOrder:

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -136,7 +136,7 @@ oldStudySys:
     updateInvoicePath: http://gdxypx.xy.com/system/BussinessApi/UpdateInvoiceData
 
 officialPush:
-    infoPath: https://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
+    infoPath: closehttps://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
     periodPath: https://jypt-dev.gdcic.net/organjxjy/XueshiShenqing
     infoAccount: peixunjigou
     token: 0ca175b9c0f726a831d895e26933246

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -65,9 +65,9 @@ public class QuestionController extends BaseController {
     @ApiOperation("查询用户拥有题库商品")
     @GetMapping("/listGoodsUserQuestion")
     public TableDataInfo<GoodsUserQuestionVo> listGoodsUserQuestionVo(GoodsQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<GoodsUserQuestionVo> list = iQuestionService.listGoodsUserQuestionVo(bo);
         for (GoodsUserQuestionVo g : list) {
             UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
@@ -88,9 +88,9 @@ public class QuestionController extends BaseController {
     @ApiOperation("查询用户拥有免费题库商品")
     @GetMapping("/listFreeGoodsList")
     public TableDataInfo<GoodsUserQuestionVo> listFreeGoodsList(GoodsQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<GoodsUserQuestionVo> list = iQuestionService.listUserFreeGoodsList(bo);
         for (GoodsUserQuestionVo g : list) {
             UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
@@ -110,9 +110,9 @@ public class QuestionController extends BaseController {
     @ApiOperation("查询用户拥有免费+自购题库商品")
     @GetMapping("/listUserFreeUnionBuyGoodsList")
     public TableDataInfo<GoodsUserQuestionVo> listUserFreeUnionBuyGoodsList(GoodsQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<GoodsUserQuestionVo> list = iQuestionService.listUserFreeUnionBuyGoodsList(bo);
         if (!CollectionUtils.isEmpty(list)){
             for (GoodsUserQuestionVo g : list) {

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/ProfileTpController.java

@@ -126,10 +126,10 @@ public class ProfileTpController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:profile:list')")
     @GetMapping("/listProfile")
     public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         bo.setTypeStatus(1L);
+        startPage();
         List<UserProfileVo> list = iUserProfileService.queryList(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -114,11 +114,11 @@ public class UserProfileStampController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:profile:list')")
     @GetMapping("/listProfile")
     public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
-        startPage();
         //2为承诺书审核
         bo.setTypeStatus(2L);
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserProfileVo> list = iUserProfileService.queryList(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -7,6 +7,7 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 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.ToolsUtils;
@@ -47,6 +48,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -368,4 +370,9 @@ public class CommonController extends BaseController {
         List<ActivityGoodsPriceVo> list = iDistributionActivityGoodsService.getGoodsList(bo);
         return getDataTable(list);
     }
+
+    @RequestMapping("/token_offline")
+    public void loginAuthFailOffLine() {
+        throw new CustomException("用户验证错误",409);
+    }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -47,9 +47,9 @@ public class CourseController extends BaseController {
     @ApiOperation("查询商品下的课程列表")
     @GetMapping("/courseList")
     public TableDataInfo<CourseUserVo> courseList(CourseQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<CourseUserVo> list = iCourseService.courseList(bo);
         return getDataTable(list);
     }
@@ -69,9 +69,9 @@ public class CourseController extends BaseController {
     @ApiOperation("查询用户拥有的商品")
     @GetMapping("/goodsList")
     public TableDataInfo<GoodsUserVo> goodsList(CourseQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<GoodsUserVo> list = iCourseService.goodsList(bo);
         return getDataTable(list);
     }
@@ -90,9 +90,9 @@ public class CourseController extends BaseController {
     @ApiOperation("查询课程目录结构列表")
     @GetMapping("/menuList")
     public TableDataInfo<CourseUserMenuVo> menuList(CourseMenuQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<CourseUserMenuVo> list = iCourseMenuService.menuList(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/exam/ExamApplyController.java

@@ -133,9 +133,9 @@ public class ExamApplyController extends BaseController {
     @ApiOperation("查询报考数据列表")
     @GetMapping("/list")
     public TableDataInfo<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -259,9 +259,9 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询用户拥有直播商品")
     @GetMapping("/listGoodsUserLive")
     public TableDataInfo<OrderGoodsVo> listGoodsUserQuestionVo(GoodsQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<OrderGoodsVo> list = iOrderGoodsService.listGoodsUserLive(bo);
         return getDataTable(list);
     }
@@ -272,9 +272,9 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询用户拥有视频+直播商品")
     @GetMapping("/listUserVideoLive")
     public TableDataInfo<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<OrderGoodsVo> list = iOrderGoodsService.listUserVideoLive(bo);
         return getDataTable(list);
     }
@@ -295,8 +295,8 @@ public class GoodsController extends BaseController {
     @ApiOperation("获取直播提醒列表")
     @GetMapping("/getLiveList")
     public TableDataInfo<CourseLiveVo> liveList() {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        startPage();
         List<CourseLiveVo> list = iOrderGoodsService.getLiveList(loginUser.getUser().getUserId());
         return getDataTable(list);
     }
@@ -330,9 +330,9 @@ public class GoodsController extends BaseController {
     @ApiOperation("获取用户所有购买商品")
     @PostMapping("/user/all")
     public TableDataInfo<GoodsListAllVo> getUserGoodsListAll(@RequestBody UserGoodsListAllBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<GoodsListAllVo> result = iGoodsService.getUserGoodsListAll(bo);
         return getDataTable(result);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/inform/InformUserController.java

@@ -53,9 +53,9 @@ public class InformUserController extends BaseController {
     @ApiOperation("查询通知学员列表")
     @GetMapping("/list")
     public TableDataInfo<InformUserVo> list(InformUserQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         bo.setStatus(1);
         List<InformUserVo> list = iInformUserService.queryList(bo);
         return getDataTable(list);

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -33,7 +33,7 @@ import java.util.List;
 
 /**
  * 模考安排Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-05-24
  */
@@ -122,9 +122,9 @@ public class MockApplyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/listApply")
     public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo){
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<MockApplyVo> list = iMockApplyService.queryApplyList(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -51,9 +51,9 @@ public class OrderController extends BaseController {
     @ApiOperation("查询订单列表")
     @GetMapping("/list")
     public TableDataInfo<OrderListVo> list(OrderQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<OrderListVo> list = iOrderService.selectListApp(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/plan/UserPlanController.java

@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
 
 /**
  * 学习计划Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-12-08
  */
@@ -57,13 +57,13 @@ public class UserPlanController extends BaseController {
     @ApiOperation("查询学习计划列表")
     @GetMapping("/list")
     public TableDataInfo<UserPlanVo> list(UserPlanQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserPlanVo> list = iUserPlanService.queryList(bo);
         return getDataTable(list);
     }
-    
+
 
     /**
      * 获取学习计划详细信息

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserBankRecordController.java

@@ -57,9 +57,9 @@ public class UserBankRecordController extends BaseController {
     @ApiOperation("视频商品查询用户的做题历史列表")
     @GetMapping("/list")
     public TableDataInfo<UserBankRecordVo> list(UserBankRecordQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserBankRecordVo> list = iUserBankRecordService.queryList(bo);
         return getDataTable(list);
     }
@@ -70,9 +70,9 @@ public class UserBankRecordController extends BaseController {
     @ApiOperation("视频商品查询用户的做题历史列表")
     @GetMapping("/bankList")
     public TableDataInfo<UserBankRecordVo> getUserBankList(UserBankRecordQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserBankRecordVo> list = iUserBankRecordService.getUserBankList(bo);
         return getDataTable(list);
     }

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserWxFollow;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserLoginKeyService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.service.IUserWxFollowService;
@@ -56,6 +57,8 @@ public class UserController extends BaseController {
 
     private final ISysTenantService sysTenantService;
 
+    private final IUserLoginKeyService iUserLoginKeyService;
+
     private static Logger log = LoggerFactory.getLogger(UserController.class);
     /**
      * 修改客户端用户
@@ -191,4 +194,15 @@ public class UserController extends BaseController {
         UserVo userVo = iUserService.queryById(loginUser.getUser().getUserId());
         return AjaxResult.success("成功",userVo.getGzhOpenId());
     }
+
+    @ApiOperation("把其他用户踢下线")
+    @Log(title = "把其他用户踢下线", businessType = BusinessType.UPDATE)
+    @PostMapping("/offline")
+    public AjaxResult<Void> offline(){
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        UserLoginKeyEditBo editBo = new UserLoginKeyEditBo();
+        editBo.setUserId(loginUser.getUser().getUserId());
+        editBo.setUserKey(loginUser.getToken());
+        return toAjax(iUserLoginKeyService.offline(editBo) ? 1 : 0);
+    }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserNoteController.java

@@ -54,9 +54,9 @@ public class UserNoteController extends BaseController {
     @ApiOperation("查询用户笔记记录列表")
     @GetMapping("/listDate")
     public TableDataInfo<UserDateNoteVo> listDate(UserNoteQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
         List<UserDateNoteVo> list = iUserNoteService.listDate(bo);
         return getDataTable(list);
     }

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

@@ -4,6 +4,7 @@ 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.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.user.entity.ClientLoginSeller;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -55,10 +56,15 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
             if(StringUtils.isNoneEmpty(wxToken)){
                 ClientLoginUser clientLoginUser = wxTokenService.getLoginUser(request);
                 if(clientLoginUser!=null){
-                    wxTokenService.verifyToken(clientLoginUser);
-                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(clientLoginUser, null,null);
-                    authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                    SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+                    if(Validator.isNull(clientLoginUser.getUser())){
+                        request.getRequestDispatcher("/app/common/token_offline").forward(request, response);
+                        return;
+                    }else{
+                        wxTokenService.verifyToken(clientLoginUser);
+                        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(clientLoginUser, null,null);
+                        authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                        SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+                    }
                 }
             }else{
                 if(!enabledTenant){

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

@@ -0,0 +1,128 @@
+package com.zhongzheng.framework.web.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+import com.zhongzheng.modules.user.mapper.UserLoginKeyMapper;
+import com.zhongzheng.modules.user.service.IUserLoginKeyService;
+import com.zhongzheng.modules.user.vo.UserLoginKeyVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户登录KEYService业务层处理
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Service
+public class UserLoginKeyServiceImpl extends ServiceImpl<UserLoginKeyMapper, UserLoginKey> implements IUserLoginKeyService {
+
+    @Override
+    public UserLoginKeyVo queryById(Long id){
+        UserLoginKey db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserLoginKeyVo.class);
+    }
+
+    @Override
+    public Boolean queryByUserKey(String userKey) {
+        UserLoginKey loginKey = getOne(new LambdaQueryWrapper<UserLoginKey>()
+                .eq(UserLoginKey::getUserKey, userKey).last("limit 1"));
+        if(Validator.isNotEmpty(loginKey)&&loginKey.getStatus()==0){
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public List<UserLoginKeyVo> queryList(UserLoginKeyQueryBo bo) {
+        LambdaQueryWrapper<UserLoginKey> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserLoginKey::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getUserKey()), UserLoginKey::getUserKey, bo.getUserKey());
+        lqw.eq(bo.getStatus() != null, UserLoginKey::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getIp()), UserLoginKey::getIp, bo.getIp());
+        lqw.eq(StrUtil.isNotBlank(bo.getBrowser()), UserLoginKey::getBrowser, bo.getBrowser());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserLoginKeyVo> entity2Vo(Collection<UserLoginKey> collection) {
+        List<UserLoginKeyVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserLoginKeyVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserLoginKey> page = (Page<UserLoginKey>)collection;
+            Page<UserLoginKeyVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserLoginKeyAddBo bo) {
+        UserLoginKey add = BeanUtil.toBean(bo, UserLoginKey.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserLoginKeyEditBo bo) {
+        UserLoginKey update = BeanUtil.toBean(bo, UserLoginKey.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserLoginKey entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public Boolean offline(UserLoginKeyEditBo bo) {
+        if(Validator.isEmpty(bo.getUserId())||Validator.isEmpty(bo.getUserKey())){
+            throw new CustomException("参数错误");
+        }
+        LambdaUpdateWrapper<UserLoginKey> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(UserLoginKey::getUserId, bo.getUserId());
+        objectLambdaUpdateWrapper.ne(UserLoginKey::getUserKey, bo.getUserKey());
+        objectLambdaUpdateWrapper.set(UserLoginKey::getStatus, 0);
+        this.update(null, objectLambdaUpdateWrapper);
+        return true;
+    }
+}

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

@@ -6,23 +6,27 @@ import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.exception.BaseException;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
 import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.AddressUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.user.service.IUserLoginKeyService;
 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.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -30,7 +34,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -67,6 +74,9 @@ public class WxTokenService
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private IUserLoginKeyService iUserLoginKeyService;
+
     @Resource
     private AuthenticationManager authenticationManager;
 
@@ -75,8 +85,7 @@ public class WxTokenService
      *
      * @return 用户信息
      */
-    public ClientLoginUser getLoginUser(HttpServletRequest request)
-    {
+    public ClientLoginUser getLoginUser(HttpServletRequest request) {
         //测试用户
         String test_token = request.getHeader("X-Auth-Token");
         if("test".equals(test_token)){
@@ -89,6 +98,10 @@ public class WxTokenService
             Claims claims = parseToken(token);
             // 解析对应的权限以及用户信息
             String uuid = (String) claims.get(Constants.WX_LOGIN_USER_KEY);
+            if(!iUserLoginKeyService.queryByUserKey(uuid)){
+                ClientLoginUser errorUser =  new ClientLoginUser();
+                return errorUser;
+            }
             String userKey = getTokenKey(uuid);
             ClientLoginUser user = redisCache.getCacheObject(userKey);
             return user;
@@ -142,7 +155,17 @@ public class WxTokenService
         refreshToken(loginUser);
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.WX_LOGIN_USER_KEY, token);
-        return createToken(claims);
+        String secret = createToken(claims);
+        if(Validator.isNotEmpty(token)){
+            UserLoginKeyAddBo addBo = new UserLoginKeyAddBo();
+            addBo.setUserId(loginUser.getUser().getUserId());
+            addBo.setUserKey(token);
+            addBo.setIp(loginUser.getIpaddr());
+            addBo.setBrowser(loginUser.getBrowser());
+            addBo.setSecret(secret);
+            iUserLoginKeyService.insertByAddBo(addBo);
+        }
+        return secret;
     }
 
     /**

zhongzheng-generator/src/main/java/com/zhongzheng/generator/controller/FilterController.java

@@ -15,4 +15,6 @@ public class FilterController {
     public void loginAuthFail(HttpServletRequest request) {
         throw new AccessDeniedException("用户验证错误");
     }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -467,6 +467,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setLearnStatus(classGradeVo.getLearnStatus());
             goodsUserVo.setPeriodPlush(classGradeVo.getPeriodPlush());
             goodsUserVo.setOfficialName(classGradeVo.getOfficialName());
+            goodsUserVo.setPeriodWaitTime(classGradeVo.getPeriodWaitTime());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -391,4 +391,7 @@ public class GoodsUserVo {
 	private String externalLink;
 	@ApiModelProperty("是否外链商品：0否 1是")
 	private Integer externalLinkStatus;
+	@Excel(name = "学时变为待审核时间")
+	@ApiModelProperty("学时变为待审核时间")
+	private Long periodWaitTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -573,6 +573,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 goodsVo.setLearningStatus(classGradeVo.getLearningStatus());
                 goodsVo.setInterfaceAccountId(classGradeVo.getInterfaceAccountId());
                 goodsVo.setLearnStatus(classGradeVo.getLearnStatus());
+                goodsVo.setPeriodWaitTime(classGradeVo.getPeriodWaitTime());
 
                 LambdaQueryWrapper<UserSubscribe> lq = Wrappers.lambdaQuery();
                 lq.eq(UserSubscribe::getOrderGoodsId, goodsVo.getOrderGoodsId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -336,4 +336,7 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("是否外链商品：0否 1是")
 	private String distributionLinkCode;
+	@Excel(name = "学时变为待审核时间")
+	@ApiModelProperty("学时变为待审核时间")
+	private Long periodWaitTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -207,7 +207,10 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                         String status = String.valueOf(itemObject.get("status"));
                         String pdfUrl = String.valueOf(itemObject.get("pdfUrl"));
                         String failCause = String.valueOf(itemObject.get("failCause"));
-                        String xmlUrl = String.valueOf(itemObject.get("xmlUrl"));
+                        String xmlUrl = "";
+                        if(itemObject.containsKey("xmlUrl")){
+                            xmlUrl = String.valueOf(itemObject.get("xmlUrl"));
+                        }
                         String oldStatus = "1";
                         objectLambdaUpdateWrapper.eq(TopNuoMplatformLog::getInvoiceSerialNum, serialNo);
                         //开单完成状态
@@ -224,7 +227,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, Integer.parseInt(status));
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getFailCause, failCause);
                         }
-                        TopNuoMplatformLog mplatformLog = getOne(new LambdaQueryWrapper<TopNuoMplatformLog>().eq(TopNuoMplatformLog::getOrderNo, orderNo));
+                        TopNuoMplatformLog mplatformLog = getOne(new LambdaQueryWrapper<TopNuoMplatformLog>().eq(TopNuoMplatformLog::getInvoiceSerialNum, serialNo));
                         if(mplatformLog.getFromPlat()==1){
                             this.update(null, objectLambdaUpdateWrapper);
                             iTopOldOrderService.orderInvoice(orderNo);
@@ -239,6 +242,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             params.put("status", oldStatus);
                             params.put("orderno", orderNo);
                             params.put("pdfurl", pdfUrl);
+                            params.put("xmlurl", xmlUrl);
                             String respone = "";
                             log.info("发票推送系统"+params,"");
                             try {
@@ -246,6 +250,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                                 objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushTime, DateUtils.getNowTime());
                                 respone = HttpUtils.postFormBody(UpdateInvoice_PATH, params);
                                 objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushResult, respone);
+                                System.out.println("结果"+respone);
                                 if (!respone.contains("\"Status\":true")) {
                                     objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
                                     this.update(null, objectLambdaUpdateWrapper);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyAddBo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录KEY添加对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY添加对象")
+public class UserLoginKeyAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String userKey;
+    /** 状态 1正常 0禁止使用 */
+    @ApiModelProperty("状态 1正常 0禁止使用")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String ip;
+    /** 浏览器 */
+    @ApiModelProperty("浏览器")
+    private String browser;
+    private String secret;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户登录KEY编辑对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY编辑对象")
+public class UserLoginKeyEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String userKey;
+
+    /** 状态 1正常 0禁止使用 */
+    @ApiModelProperty("状态 1正常 0禁止使用")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String ip;
+
+    /** 浏览器 */
+    @ApiModelProperty("浏览器")
+    private String browser;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户登录KEY分页查询对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户登录KEY分页查询对象")
+public class UserLoginKeyQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String userKey;
+	/** 状态 1正常 0禁止使用 */
+	@ApiModelProperty("状态 1正常 0禁止使用")
+	private Integer status;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String ip;
+	/** 浏览器 */
+	@ApiModelProperty("浏览器")
+	private String browser;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserLoginKey.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户登录KEY对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_login_key")
+public class UserLoginKey implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long userId;
+    /** $column.columnComment */
+    private String userKey;
+    /** 状态 1正常 0禁止使用 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private String ip;
+    /** 浏览器 */
+    private String browser;
+    private String secret;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserLoginKeyMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+
+/**
+ * 用户登录KEYMapper接口
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+public interface UserLoginKeyMapper extends BaseMapper<UserLoginKey> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserLoginKeyService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+import com.zhongzheng.modules.user.vo.UserLoginKeyVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户登录KEYService接口
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+public interface IUserLoginKeyService extends IService<UserLoginKey> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserLoginKeyVo queryById(Long id);
+
+	Boolean queryByUserKey(String userKey);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserLoginKeyVo> queryList(UserLoginKeyQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户登录KEY
+	 * @param bo 用户登录KEY新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserLoginKeyAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户登录KEY
+	 * @param bo 用户登录KEY编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserLoginKeyEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Boolean offline(UserLoginKeyEditBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -323,6 +323,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Transactional(rollbackFor = Exception.class)
     public Integer insertByAddBo(UserStudyRecordAddBo bo) {
         CourseSectionVo courseSectionVo =iCourseSectionService.queryById(bo.getSectionId());
+        if(Validator.isEmpty(courseSectionVo)){
+            throw new CustomException("节数据错误");
+        }
         //判断录播拍照是否达标
         if(courseSectionVo.getSectionType()==1&&Validator.isNotEmpty(bo.getStatus())&&bo.getStatus()==1){
             GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
@@ -358,12 +361,12 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                 if(photoList.size()>0){
                                     UserStudyRecordPhoto photo = photoList.get(0);
                                     if((DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())<(videoTime.longValue()-20)){
-                                        log.info("视频学习时长不达标",JSON.toJSONString(bo));
-                                        throw new CustomException("视频学习时长不达标",558);
+                                        log.info("视频学习时长不达标"+JSON.toJSONString(bo));
+                                        throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-20-(DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())),558);
                                     }
                                 }
                                 if(photoList.size()<num){
-                                    log.info("拍照次数不达标",JSON.toJSONString(bo));
+                                    log.info("拍照次数不达标"+JSON.toJSONString(bo));
                                     throw new CustomException("拍照次数不达标",559);
                                 }
                             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserLoginKeyVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录KEY视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY视图对象")
+public class UserLoginKeyVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private String userKey;
+	/** 状态 1正常 0禁止使用 */
+	@Excel(name = "状态 1正常 0禁止使用")
+	@ApiModelProperty("状态 1正常 0禁止使用")
+	private Integer status;
+	/** $column.columnComment */
+	@Excel(name = "状态 1正常 0禁止使用")
+	@ApiModelProperty("$column.columnComment")
+	private String ip;
+	/** 浏览器 */
+	@Excel(name = "浏览器")
+	@ApiModelProperty("浏览器")
+	private String browser;
+}

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -248,6 +248,7 @@
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="officialName" column="official_name"/>
         <result property="userId" column="user_id"/>
+        <result property="periodWaitTime" column="period_wait_time"/>
     </resultMap>
 
 
@@ -671,7 +672,8 @@
             cgu.official_status,
             cgu.period_plush,
             cgu.order_goods_id,
-            cg.official_name
+            cg.official_name,
+            cgu.period_wait_time
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id

zhongzheng-system/src/main/resources/mapper/modules/user/UserLoginKeyMapper.xml

@@ -0,0 +1,19 @@
+<?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.zhongzheng.modules.user.mapper.UserLoginKeyMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserLoginKey" id="UserLoginKeyResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userKey" column="userKey"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="ip" column="ip"/>
+        <result property="browser" column="browser"/>
+    </resultMap>
+
+
+</mapper>