feats

src/main/java/com/yunzhi/demo/common/JWTUtils.java

@@ -23,8 +23,8 @@ import java.util.Map;
 @Slf4j
 public class JWTUtils {
 
-    // 过期时间 5 分钟
-    public static final long EXPIRE_TIME = 5 * 60;
+    // 过期时间 10 分钟
+    public static final long EXPIRE_TIME = 10 * 60;
 
     // 私钥
     static final SecretKey SECRET_KEY = Keys.hmacShaKeyFor(Base64.getEncoder().encode("Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes()));
@@ -43,7 +43,11 @@ public class JWTUtils {
         Date exp = datePair[1];
 
         if (null != claims.get("exp")) {
-            exp = (Date) claims.get("exp");
+            Integer milliSecond = (Integer) claims.get("exp");
+            int oneMinute = 1 * 60 * 1000;
+            if (milliSecond - exp.getTime() > oneMinute) {
+                exp.setTime(milliSecond);
+            }
         }
 
         return Jwts.builder().setIssuer(claims.get("userId").toString()).setIssuedAt(iat).setExpiration(exp).addClaims(claims).signWith(SECRET_KEY).compact();

src/main/java/com/yunzhi/demo/common/MathUtils.java

@@ -0,0 +1,11 @@
+package com.yunzhi.demo.common;
+
+import java.util.Random;
+
+public class MathUtils {
+
+    public static Integer getRand(int min, int max) {
+        Random random = new Random();
+        return random.nextInt(max) % (max - min + 1) + min;
+    }
+}

src/main/java/com/yunzhi/demo/common/ResponseBean.java

@@ -1,6 +1,7 @@
 package com.yunzhi.demo.common;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * 接口统一状态返回BEAN.
@@ -19,8 +20,12 @@ public class ResponseBean<T> implements Serializable {
     private int code;
     private String message;
     private T data;
+    private String token;
 
-    public ResponseBean() {
+    /**
+     * 禁止外部 new
+     */
+    private ResponseBean() {
         code = ResponseBean.CODE_SUCCESS;
     }
 
@@ -28,6 +33,7 @@ public class ResponseBean<T> implements Serializable {
         ResponseBean responseBean = new ResponseBean();
         responseBean.code = ResponseBean.CODE_SUCCESS;
         responseBean.data = data;
+        responseBean.token = getContextToken();
 
         if (null != msgs && msgs.length > 0) {
             responseBean.message = msgs[0];
@@ -36,6 +42,11 @@ public class ResponseBean<T> implements Serializable {
         return responseBean;
     }
 
+    private static String getContextToken() {
+        Map<String, Object> tokenParam = CurrentContext.getTokenParam();
+        return null != tokenParam ? (String) tokenParam.get("token") : null;
+    }
+
     public static <T> ResponseBean error(String msg, int code, T ...datas) {
         ResponseBean responseBean = new ResponseBean();
         responseBean.code = code;
@@ -59,6 +70,10 @@ public class ResponseBean<T> implements Serializable {
     public T getData() {
         return data;
     }
+
+    public String getToken() {
+        return token;
+    }
     
     @Override
     public String toString() {

src/main/java/com/yunzhi/demo/controller/SysConfigController.java

@@ -12,14 +12,9 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ISysConfigService;
 import com.yunzhi.demo.entity.SysConfig;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -92,4 +87,10 @@ public class SysConfigController extends BaseController {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
+    @GetMapping("/admin/sys-config/value")
+    public ResponseBean getValueByCode(@RequestParam String code) throws Exception {
+        String val = iSysConfigService.getValByCode(code);
+        return ResponseBean.success(val);
+    }
 }

src/main/java/com/yunzhi/demo/controller/TaPostController.java

@@ -3,15 +3,13 @@ package com.yunzhi.demo.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.demo.common.BaseController;
-import com.yunzhi.demo.common.Constants;
-import com.yunzhi.demo.common.ResponseBean;
-import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.common.*;
 import com.yunzhi.demo.entity.*;
 import com.yunzhi.demo.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -181,7 +179,7 @@ public class TaPostController extends BaseController {
         // 分享信息
         TaShareSetting taShareSetting = iTaShareSettingService.getSettingBy(Constants.RESOURCE_TYPE_POST, id);
         if (!"admin".equals(client)) {
-            if (Constants.STATUS_NORMAL.equals(taShareSetting.getStatus())) {
+            if (null != taShareSetting && Constants.STATUS_NORMAL.equals(taShareSetting.getStatus())) {
                 taPost.setShareSetting(taShareSetting);
             }
         } else {
@@ -189,10 +187,11 @@ public class TaPostController extends BaseController {
         }
 
         // 获取试题
-        List<TaPostTest> postTestList = new ArrayList<>();
-        if ("admin".equals(client)) {
-            postTestList = iTaPostTestService.getListByPostId(id);
-        } else {
+        List<TaPostTest> postTestList = iTaPostTestService.getListByPostId(id);
+        taPost.setPostTestList(postTestList);
+
+        // 小程序端
+        if (!"admin".equals(client)) {
             // 当前人员是否收藏过
             TaPerson taPerson = getCurrentPerson();
             boolean saved = iTaPostSaveService.checkSaved(taPerson.getPersonId(), id);
@@ -201,16 +200,21 @@ public class TaPostController extends BaseController {
             // 埋点数据
             iTaPostDataService.recordBy(id, taPerson);
 
+            iTaPostTestService.getListByPostId(id);
+
             // 随机取题目
-            if (null != taPost.getAnswerNum() && taPost.getAnswerNum() > 0) {
+            List<TaPostTest> testList = new ArrayList<>();
+            if (null != taPost.getAnswerNum() && postTestList.size() >= taPost.getAnswerNum()) {
                 for (int i = 0; i < taPost.getAnswerNum(); i++) {
-                    TaPostTest taPostTest = iTaPostTestService.getRandRowBy(id);
+                    int rand = MathUtils.getRand(0, postTestList.size());
+                    TaPostTest taPostTest = postTestList.get(rand);
+                    postTestList.remove(rand);
                     taPostTest.setCorrectAnswers(null);
-                    postTestList.add(taPostTest);
+                    testList.add(taPostTest);
                 }
             }
+            taPost.setPostTestList(testList);
         }
-        taPost.setPostTestList(postTestList);
 
         return ResponseBean.success(taPost);
     }

src/main/java/com/yunzhi/demo/controller/TaPostTestController.java

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,7 +49,8 @@ public class TaPostTestController extends BaseController {
     ITaPointsLogService iTaPointsLogService;
 
     @PostMapping("/ma/answer-test")
-    public ResponseBean answerPostTest(@ApiParam("答题内容") @RequestBody List<TaPostTest> postTestList) throws Exception {
+    public ResponseBean answerPostTest(@ApiParam("答题内容") @RequestBody String paramStr) throws Exception {
+        List<TaPostTest> postTestList = JSONObject.parseArray(paramStr, TaPostTest.class);
         if (null == postTestList || postTestList.size() == 0) {
             throw new Exception("未发现答题内容");
         }

src/main/java/com/yunzhi/demo/controller/TaTestLogController.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +48,20 @@ public class TaTestLogController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taTestLog",method= RequestMethod.GET)
+    @RequestMapping(value="/ma/test-log",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taTestLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
 
-		    IPage<TaTestLog> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaTestLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaTestLog> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaTestLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaTestLog> result = iTaTestLogService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaTestLog> result = iTaTestLogService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -72,6 +77,7 @@ public class TaTestLogController extends BaseController {
 
         IPage<TaTestLog> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaTestLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaTestLog> result = iTaTestLogService.page(pg, queryWrapper);

src/main/java/com/yunzhi/demo/controller/WxMaController.java

@@ -79,7 +79,7 @@ public class WxMaController extends BaseController {
 
         taPerson.setAvatar(userInfo.getAvatarUrl());
         taPerson.setNickName(userInfo.getNickName());
-        taPerson.setSex("1".equals(userInfo.getGender()) ? 1 : 2);
+        taPerson.setSex(Integer.parseInt(userInfo.getGender()));
 
         iTaPersonService.updateById(taPerson);
 
@@ -89,7 +89,7 @@ public class WxMaController extends BaseController {
     @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
     @PutMapping("/auth-phone")
     public ResponseBean updateUserPhone(@ApiParam("授权手机的参数") @RequestBody WxMaAuthParam params) throws Exception {
-        checkAuthParams(params);
+//        checkAuthParams(params);
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = wxUtils.getService().getUserService().getPhoneNoInfo(params.getSessionKey(), params.getEncryptedData(), params.getIv());

src/main/java/com/yunzhi/demo/interceptor/PermissionInterceptor.java

@@ -37,6 +37,11 @@ public class PermissionInterceptor implements HandlerInterceptor {
 
         try {
             Map<String, Object> tokenMap = JWTUtils.decode(jws);
+
+            // 基于原始 token 构造新的 token
+            String newToken = JWTUtils.refresh(jws);
+            tokenMap.put("token", newToken);
+
             CurrentContext.setTokenParam(tokenMap);
         } catch (Exception e) {
             log.error("鉴权失败: {}", e.getMessage());
@@ -47,13 +52,6 @@ public class PermissionInterceptor implements HandlerInterceptor {
         return true;
     }
 
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object obj, ModelAndView mv) throws Exception {
-        // 刷新 TOKEN
-        String jws = JWTUtils.getToken(request);
-        JWTUtils.refresh(jws, response);
-    }
-
     private void responseTokenError(HttpServletResponse response, String error) throws IOException {
         response.addHeader("Content-type", "application/json");
         response.getOutputStream().write(

src/main/java/com/yunzhi/demo/mapper/SysConfigMapper.java

@@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysConfigMapper extends BaseMapper<SysConfig> {
 
+    String getValueOf(String paramCode);
 }

src/main/java/com/yunzhi/demo/service/ISysConfigService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysConfigService extends IService<SysConfig> {
 
+    String getValByCode(String code);
 }

src/main/java/com/yunzhi/demo/service/impl/SysConfigServiceImpl.java

@@ -4,6 +4,7 @@ import com.yunzhi.demo.entity.SysConfig;
 import com.yunzhi.demo.mapper.SysConfigMapper;
 import com.yunzhi.demo.service.ISysConfigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +18,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
 
+    @Autowired
+    SysConfigMapper sysConfigMapper;
+
+    @Override
+    public String getValByCode(String code) {
+        return sysConfigMapper.getValueOf(code);
+    }
 }

src/main/java/com/yunzhi/demo/service/impl/TaPointsLogServiceImpl.java

@@ -3,9 +3,11 @@ package com.yunzhi.demo.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.SysConfig;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPointsLog;
 import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.mapper.SysConfigMapper;
 import com.yunzhi.demo.mapper.TaPersonDataMapper;
 import com.yunzhi.demo.mapper.TaPointsLogMapper;
 import com.yunzhi.demo.service.ITaPointsLogService;
@@ -30,6 +32,9 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
     @Autowired
     TaPersonDataMapper taPersonDataMapper;
 
+    @Autowired
+    SysConfigMapper sysConfigMapper;
+
     @Async
     @Override
     public void sendPoints(TaPost taPost, TaPerson taPerson) {
@@ -50,8 +55,7 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
         }
 
         // 查询积分-学分转换规则
-        // TODO 此处需要查询系统参数
-        String ratio = "1";
+        String ratio = sysConfigMapper.getValueOf(Constants.SYS_PARAM_POINT_CREDIT_RATIO);
         String creditNum = points.toString();
 
         taPointsLog = new TaPointsLog();
@@ -80,10 +84,10 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
         }
     }
 
-    private TaPointsLog getByPersonPost(String personId, String postId) {
+    private TaPointsLog getByPersonPost(String personId, String targetId) {
         QueryWrapper<TaPointsLog> queryWrapper = new QueryWrapper<TaPointsLog>()
                 .eq("person_id", personId)
-                .eq("post_id", postId)
+                .eq("target_id", targetId)
                 .eq("status", Constants.STATUS_NORMAL);
 
         return getOne(queryWrapper);

src/main/resources/mapper/SysConfigMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.SysConfigMapper">
 
+    <select id="getValueOf" resultType="java.lang.String">
+        SELECT
+            t.`value`
+        FROM
+            `sys_config` t
+        WHERE
+            t.`code` = #{paramCode}
+    </select>
 </mapper>