Merge remote-tracking branch 'origin/master'

yt-app/app-service/src/main/java/com/ytpm/service/impl/AdServiceImpl.java

@@ -11,6 +11,7 @@ import com.ytpm.dao.AppUserMapper;
 import com.ytpm.feign.RiskFeign;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
+import com.ytpm.general.StatusCode;
 import com.ytpm.handle.CustomerException;
 import com.ytpm.service.AdService;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +43,9 @@ public class AdServiceImpl implements AdService {
         if(Objects.isNull(user)){
             return Result.resultOk(RepMessage.SAVE_SUCCESS);
         }
+        if(!UserStatusEnum.NORMAL.getCode().equals(user.getUserStatus())){
+            return new Result<>(StatusCode.ACCESS_ERR,"当前用户处于风控中");
+        }
         //增加广告记录
         YtDyzAdRecord adRecord = new YtDyzAdRecord();
         BeanUtils.copyProperties(param, adRecord);

yt-app/app-service/src/main/java/com/ytpm/service/impl/QuestionServiceImpl.java

@@ -3,7 +3,9 @@ package com.ytpm.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
+import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzAnswerRecord;
+import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AnswerRecordParam;
 import com.ytpm.app.view.QuestionListView;
 import com.ytpm.dao.AppUserMapper;
@@ -12,12 +14,14 @@ import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.app.model.YtDyzPowerRecord;
+import com.ytpm.general.StatusCode;
 import com.ytpm.service.QuestionService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.Objects;
 
 @Service
 public class QuestionServiceImpl implements QuestionService {
@@ -40,6 +44,13 @@ public class QuestionServiceImpl implements QuestionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<String> answerQuestion(AnswerRecordParam param) {
+        YtDyzUser user = appUserMapper.selectPrimaryKey(param.getUserId());
+        if(Objects.isNull(user)){
+            return Result.resultOk(RepMessage.TOKEN_EXPIRE);
+        }
+        if(!UserStatusEnum.NORMAL.getCode().equals(user.getUserStatus())){
+            return new Result<>(StatusCode.ACCESS_ERR,"当前用户处于风控中");
+        }
         YtDyzAnswerRecord record = new YtDyzAnswerRecord();
         BeanUtil.copyProperties(param,record);
         record.setRecordId(IdUtil.fastSimpleUUID());

yt-app/app-service/src/main/java/com/ytpm/util/MyRedisManager.java

@@ -1,41 +0,0 @@
-package com.ytpm.util;
-
-import org.crazycake.shiro.RedisManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Base64;
-
-/**
- *  单独封装redisManager
- * @Author :  LeeM
- * @Date :  2020/7/15   11:15
- */
-@Component
-public class MyRedisManager extends RedisManager {
-
-    @Autowired
-    RedisService redisService;
-
-
-    @Override
-    public byte[] set(byte[] key, byte[] value, int expire) {
-        String val = Base64.getEncoder().encodeToString(value);
-        expire=12000;
-        redisService.setTimeOutStr(new String(key),val,expire);
-        return value;
-    }
-
-
-    @Override
-    public byte[] get(byte[] key){
-        String s = redisService.getStr(new String(key));
-        if (s == null){
-            return null;
-        }
-        return Base64.getDecoder().decode(s);
-    }
-
-
-
-}

yt-app/app-service/src/main/java/com/ytpm/util/ShiroFilterUtils.java

@@ -1,70 +0,0 @@
-package com.ytpm.util;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ytpm.general.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-
-/**
- * 
- * @项目名称：zld-xdxt
- * @类名称：ShiroFilterUtils
- * @类描述：shiro工具类
- * @创建人：deng.qj
- * @创建时间：2020-07-07 13:33
- * @version：
- */
-public class ShiroFilterUtils {
-	private static final Logger logger = LoggerFactory
-			.getLogger(ShiroFilterUtils.class);
-	private final static ObjectMapper objectMapper = new ObjectMapper();
-    /**
-     * 
-     * @描述：判断请求是否是ajax
-     * @创建人：wyait
-     * @创建时间：2018年4月24日 下午5:00:22
-     * @param request
-     * @return
-     */
-    public static boolean isAjax(ServletRequest request){
-    	String header = ((HttpServletRequest) request).getHeader("X-Requested-With");
-    	if("XMLHttpRequest".equalsIgnoreCase(header)){
-    		logger.debug("shiro工具类【zld-xdxt-->ShiroFilterUtils.isAjax】当前请求,为Ajax请求");
-    		return Boolean.TRUE;
-    	}
-    	logger.debug("shiro工具类【zld-xdxt-->ShiroFilterUtils.isAjax】当前请求,非Ajax请求");
-    	return Boolean.FALSE;
-    }
-
-	/**
-	 *
-	 * @描述：response输出json
-	 * @创建人：wyait
-	 * @创建时间：2018年4月24日 下午5:14:22
-	 * @param response
-	 * @param result
-	 */
-	public static void out(HttpServletResponse response, Result result){
-		PrintWriter out = null;
-		try {
-			response.setCharacterEncoding("UTF-8");//设置编码
-			response.setContentType("application/json");//设置返回类型
-			out = response.getWriter();
-			out.println(objectMapper.writeValueAsString(result));//输出
-			logger.error("用户登出提示");
-		} catch (Exception e) {
-			logger.error("用户登出提示信息出错", e);
-		}finally{
-			if(null != out){
-				out.flush();
-				out.close();
-			}
-		}
-	}
-
-}

yt-app/app-service/src/main/java/com/ytpm/util/ShiroSubjectUtil.java

@@ -1,58 +0,0 @@
-package com.ytpm.util;
-
-import com.ytpm.app.model.ActiveUser;
-import com.ytpm.app.model.YtDyzUser;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
-
-import java.util.Collection;
-
-/**
- * Shiro 身份信息
- */
-public class ShiroSubjectUtil {
-
-    /**
-     * 获取当前登录的用户
-     * @return
-     */
-    public static YtDyzUser getLoginUser(){
-        Subject subject = SecurityUtils.getSubject();
-        ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
-        YtDyzUser user = activeUser.getUser();
-        return user;
-    }
-
-    /**
-     * 获取当前登录的用户ID
-     * 也可直接使用 request.getAttribute("userId")
-     * @return
-     */
-    public static String getLoginUserId(){
-        Subject subject = SecurityUtils.getSubject();
-        ActiveUser activeUser = (ActiveUser) subject.getPrincipal();
-        YtDyzUser user = activeUser.getUser();
-        return user.getUserId();
-    }
-
-    /**
-     * 让指定用户退出登录
-     * @param user
-     */
-    public static void loginOut(YtDyzUser user){
-        //处理session
-        DefaultWebSecurityManager securityManager = (DefaultWebSecurityManager) SecurityUtils.getSecurityManager();
-        DefaultWebSessionManager sessionManager = (DefaultWebSessionManager)securityManager.getSessionManager();
-        Collection<Session> sessions = sessionManager.getSessionDAO().getActiveSessions();//获取当前已登录的用户session列表
-        for(Session session:sessions) {
-            //清除该用户以前登录时保存的session
-            if (user.equals(session.getAttribute("user"))){
-                sessionManager.getSessionDAO().delete(session);
-            }
-        }
-    }
-
-}

yt-app/app-service/src/main/java/com/ytpm/util/WebUtils.java

@@ -1,29 +0,0 @@
-package com.ytpm.util;
-
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-public class WebUtils {
-	
-	
-	/**
-	 * 得到requset
-	 */
-	public static HttpServletRequest getRequest() {
-		ServletRequestAttributes requestAttributes = (ServletRequestAttributes) 
-				RequestContextHolder.getRequestAttributes();
-		HttpServletRequest request = requestAttributes.getRequest();
-		return request;
-	}
-	
-	/**
-	 * 得到session
-	 */
-	public static HttpSession getSession() {
-		return getRequest().getSession();
-	}
-
-}

yt-common/src/main/java/com/ytpm/handle/CustomerExceptionHandler.java

@@ -165,6 +165,6 @@ public class CustomerExceptionHandler implements HandlerExceptionResolver {
         log.error("自定义校验异常信息捕获，异常信息为：ex={}", ex);
         ex.printStackTrace();
         String msg = ex.getMessage();
-        return new Result(StatusCode.PARAMETER_CHECK_ERR, msg);
+        return new Result(StatusCode.ACCESS_ERR, msg);
     }
 }