删除ErrorCode

epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java

@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.GovWxmpEnteOrgFormDTO;
@@ -80,5 +82,16 @@ public class GovLoginController {
         return govLoginService.enterOrg(formDTO);
     }
 
+    /**
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 政府端小程序退出
+     * @Date 2020/4/21 22:22
+     **/
+    @PostMapping("/loginwxmp/loginout")
+    public Result loginOut(@LoginUser TokenDto tokenDto) {
+        return govLoginService.loginOut(tokenDto);
+    }
 }
 

epmet-auth/src/main/java/com/epmet/service/GovLoginService.java

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.GovWxmpEnteOrgFormDTO;
 import com.epmet.dto.form.GovWxmpFormDTO;
@@ -51,4 +52,13 @@ public interface GovLoginService {
      * @Date 2020/4/20 13:08
      **/
     Result<UserTokenResultDTO> enterOrg(GovWxmpEnteOrgFormDTO formDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param tokenDto
+     * @Author yinzuomei
+     * @Description 政府端工作人员退出登录
+     * @Date 2020/4/21 22:08
+     **/
+    Result loginOut(TokenDto tokenDto);
 }

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -3,14 +3,18 @@ package com.epmet.service.impl;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.PhoneValidatorUtils;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.StaffLatestAgencyResultDTO;
+import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.MessageFeignClient;
@@ -201,6 +205,16 @@ public class GovLoginServiceImpl implements GovLoginService {
         return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
+    @Override
+    public Result loginOut(TokenDto tokenDto) {
+        if(null == tokenDto){
+            logger.error("token解析失败,直接跳转重新登录即可");
+            throw new RenException("当前用户信息获取失败");
+        }
+        cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());
+        return new Result();
+    }
+
     //保存登录日志
     private Result saveStaffLoginRecord(GovWxmpEnteOrgFormDTO formDTO, String staffId, String openId) {
         StaffLoginAgencyRecordFormDTO staffLoginAgencyRecordFormDTO = new StaffLoginAgencyRecordFormDTO();

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -313,7 +313,7 @@ public class LoginServiceImpl implements LoginService {
 		}
 		cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());
 		//web端清空菜单栏和权限
-		return new Result().ok("退出登录！");
+		return new Result();
 	}
 
 	/**

epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/enums/ErrorCode.java

@@ -1,51 +0,0 @@
-package com.epmet.common.token.enums;
-
-
-import com.epmet.common.token.error.IErrorCode;
-
-/**
- * client token错误码
- *
- * @author rongchao
- * @Date 18-11-24
- */
-public enum ErrorCode implements IErrorCode {
-
-    SUCCESS(0, "请求成功"),
-
-    ERR10001(10001, "token解析失败"),
-    ERR10002(10002, "token失效"),
-    ERR10003(10003, "token生成失败，请重试。"),
-    ERR10004(10004, "返回的Object类型不是EsuaResponse，无法添加token!"),
-    ERR10005(10005, "token不能为空"),
-    ERR10006(10006, "登录超时，请重新登录"),
-    ERR10007(10007, "当前帐号已在别处登录"),
-
-    ERR500(500, "Internal Server Error"),
-    ERR501(501, "参数绑定异常"),
-    ERR401(401, "未授权"),
-
-
-    ERR(ErrorCode.COMMON_ERR_CODE, "其他异常");
-
-    private int code;
-
-    private String msg;
-
-    ErrorCode(final int code, final String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public static final int COMMON_ERR_CODE = -1;
-
-    @Override
-    public int getCode() {
-        return code;
-    }
-
-    @Override
-    public String getMsg() {
-        return msg;
-    }
-}

epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/error/IErrorCode.java

@@ -1,11 +0,0 @@
-package com.epmet.common.token.error;
-
-/**
- * @author rongchao
- * @Date 18-11-20
- */
-public interface IErrorCode {
-    int getCode();
-
-    String getMsg();
-}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -6,6 +6,11 @@ package com.epmet.commons.tools.exception;
  * @Description:
  */
 public enum EpmetErrorCode {
+	ERR10005(10005, "token不能为空"),
+	ERR10006(10006, "登录超时，请重新登录"),
+	ERR10007(10007, "当前帐号已在别处登录"),
+	ERR401(401, "未授权"),
+
 	SERVER_ERROR(8000, "服务器开小差了..."),
 	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -2,9 +2,9 @@
 package com.epmet.filter;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.common.token.enums.ErrorCode;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.BaseTokenDto;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
@@ -12,7 +12,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.jwt.JwtTokenUtils;
-import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +32,6 @@ import reactor.core.publisher.Mono;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * app接口权限过滤器
@@ -90,7 +88,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 				logger.info("params token：" + token);
 			}
 			if (StringUtils.isBlank(token)) {
-				return response(exchange,new Result<>().error(ErrorCode.ERR10005.getCode(),ErrorCode.ERR10005.getMsg()));
+				return response(exchange,new Result<>().error(EpmetErrorCode.ERR10005.getCode(),EpmetErrorCode.ERR10005.getMsg()));
 			}
 			try {
 				BaseTokenDto baseTokenDto = getBaseTokenDto(token, jwtTokenUtils);
@@ -199,7 +197,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 	public void validateTokenDto(BaseTokenDto tokenDto, String tokenStr) {
 		if (null == tokenDto) {
 		    //说明登录状态时效（超时）
-		    throw new RenException(ErrorCode.ERR10006.getCode(),ErrorCode.ERR10006.getMsg());
+		    throw new RenException(EpmetErrorCode.ERR10006.getCode());
 		}else{
 		    //Redis中存在数据，取出token，进行比对
 		    if(StringUtils.equals(tokenDto.getToken(),tokenStr)){
@@ -207,7 +205,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 
 		    }else{
 		        //用户携带token与Redis中不一致，说明当前用户此次会话失效，提示重新登陆
-		        throw new RenException(ErrorCode.ERR10007.getCode(),ErrorCode.ERR10007.getMsg());
+		        throw new RenException(EpmetErrorCode.ERR10007.getCode());
 		    }
 		}
 	}

epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java

@@ -1,14 +1,9 @@
 package com.epmet.filter;
 
-import com.epmet.common.token.enums.ErrorCode;
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.BaseTokenDto;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.jwt.JwtTokenUtils;
-import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java

@@ -1,9 +1,8 @@
 package com.epmet.filter;
 
-import com.epmet.common.token.enums.ErrorCode;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.BaseTokenDto;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.jwt.JwtTokenUtils;
 import io.jsonwebtoken.Claims;
@@ -17,7 +16,7 @@ public interface UserTokenFilter {
         //是否过期
         Claims claims = jwtTokenUtils.getClaimByToken(token);
         if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
-            throw new RenException(ErrorCode.ERR401.getCode(), ErrorCode.ERR401.getMsg());
+            throw new RenException(EpmetErrorCode.ERR401.getCode());
         }
         //获取用户ID
         String app = (String) claims.get("app");

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffOrgFormDTO.java

@@ -13,6 +13,10 @@ import java.util.List;
 @Data
 public class StaffOrgFormDTO implements Serializable {
     private static final long serialVersionUID = 2514896455028592288L;
+
+    /**
+     * 用户绑定的客户列表
+     * */
     private List<String> customerIdList;
 }
 

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@@ -17,10 +17,7 @@
 
 package com.epmet.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -133,8 +130,7 @@ public class CustomerController {
 	 * @Date 2020/3/11 21:58
 	 **/
 	@GetMapping("getvalidcustomerlist")
-	public Result<List<ValidCustomerResultDTO>> getValidCustomerList(@LoginUser TokenDto tokenDTO) {
+	public Result<List<ValidCustomerResultDTO>> getValidCustomerList() {
-		logger.info("getvalidcustomerlist:"+ JSON.toJSONString(tokenDTO));
 		return customerService.getValidCustomerList();
 	}
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java

@@ -30,7 +30,7 @@ public class UserMessageController {
 	/**
 	 * @param
 	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
+	 * @Author zhaoqifeng
 	 * @Description 查询我的消息
 	 * @Date 2020/3/29 20:53
 	 **/
@@ -39,33 +39,30 @@ public class UserMessageController {
                                                      @RequestBody MymessageFormDTO mymessageFormDTO) {
 		mymessageFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(mymessageFormDTO);
-		//逻辑待实现
 		return userMessageService.getMessageList(tokenDto, mymessageFormDTO);
 	}
 
 	/**
 	 * @param fromDTO
 	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
+	 * @Author zhaoqifeng
 	 * @Description 单条消息标记为已读
 	 * @Date 2020/3/29 21:05
 	 **/
 	@PostMapping("readmsg")
-	public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) {
+	public Result readMessage(@LoginUser TokenDto tokenDto,@RequestBody ReadMessageFromDTO fromDTO) {
-		//逻辑待实现
 		return userMessageService.readMessage(fromDTO.getMessageId());
 	}
 
 	/**
 	 * @param tokenDto
 	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
+	 * @Author zhaoqifeng
 	 * @Description 全部已读
 	 * @Date 2020/3/29 21:06
 	 **/
 	@PostMapping("readallmsg")
 	public Result readAllMessage(@LoginUser TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) {
-		//逻辑待实现
 		return userMessageService.readAllMessage(tokenDto, userMessageDTO);
 	}
 }