Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide

# Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java # epmet-gateway/pom.xml # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java # epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java # epmet-user/epmet-user-server/pom.xml
6 years ago · 76a5fadeed
202 changed files with 9849 additions and 185 deletions
--- a/doc/开发规范/命名规范.txt
+++ b/doc/开发规范/命名规范.txt
@ -0,0 +1,19 @@
+dao层：
+1、结果集是集合用selectListXXX
+2、结果集为一个实例用selectOneXXX
+3、更新：updateXXX
+4、插入：insertXXX
+5、删除：deleteXXX
+6、获取统计值的方法用 selectCount
+service层：
+1、结果集是集合：listXXX
+2、结果集是一个实例：getXXX
+3、插入：saveXXX
+5、修改：modifyXXX
+4、删除：removeXXX
+5、获取统计值的方法用 countXXX
+
+
+数据传输对象：xxxDTO，xxx 为业务领域相关的名称
+
+controller层根据接口定义来取名，接口定的什么就取什么
--- a/doc/开发规范/阿里巴巴java开发规范1.4.pdf
+++ b/doc/开发规范/阿里巴巴java开发规范1.4.pdf
--- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
@ -84,6 +84,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
@ -102,6 +106,7 @@ feign:
  httpclient:
    enabled: true

+
 hystrix:
  command:
    default:
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@ -63,6 +63,29 @@
            <artifactId>feign-httpclient</artifactId>
            <version>10.3.0</version>
        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-common-clienttoken</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>3.6.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools-wx-ma</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
    </dependencies>

    <build>
@ -111,6 +134,15 @@
                <nacos.config.group></nacos.config.group>
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
+
+                <!--公众号配置-->
+                <wx.mp.configs.appId>wx67fdf7da3fee1890</wx.mp.configs.appId>
+                <wx.mp.configs.secret>ae15094f485af9e5c6b5a8a55945332a</wx.mp.configs.secret>
+                <wx.mp.configs.token>111</wx.mp.configs.token>
+                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
+                <!--居民端小程序配置-->
+                <resi.wx.ma.appId>wx9b6102a8ee5add65</resi.wx.ma.appId>
+                <resi.wx.ma.secret>16fdb68bc2b3e732324ba5d8b8a9b5e2</resi.wx.ma.secret>
            </properties>
        </profile>

@ -136,6 +168,15 @@
                <nacos.config.group></nacos.config.group>
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
+
+                <!--公众号配置-->
+                <wx.mp.configs.appId>wx67fdf7da3fee1890</wx.mp.configs.appId>
+                <wx.mp.configs.secret>ae15094f485af9e5c6b5a8a55945332a</wx.mp.configs.secret>
+                <wx.mp.configs.token>111</wx.mp.configs.token>
+                <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
+                <!--居民端小程序配置-->
+                <resi.wx.ma.appId>wx9b6102a8ee5add65</resi.wx.ma.appId>
+                <resi.wx.ma.secret>16fdb68bc2b3e732324ba5d8b8a9b5e2</resi.wx.ma.secret>
            </properties>
        </profile>
    </profiles>
--- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
@ -0,0 +1,100 @@
+package com.epmet.controller;
+
+import com.epmet.common.token.dto.form.LoginByPassWordFormDTO;
+import com.epmet.common.token.dto.form.LoginByWxCodeFormDTO;
+import com.epmet.common.token.dto.result.UserTokenResultDTO;
+import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.service.CaptchaService;
+import com.epmet.service.LoginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+/**
+ * @Description 通用登录接口
+ * @Author yinzuomei
+ * @Date 2020/3/14 13:58
+ */
+@RestController
+@RequestMapping("login")
+public class LoginController {
+	@Autowired
+	private CaptchaService captchaService;
+
+	@Autowired
+	private LoginService loginService;
+
+	/**
+	 * @return void
+	 * @param response
+	 * @param uuid
+	 * @Author yinzuomei
+	 * @Description 生成验证码
+	 * @Date 2020/3/17 16:08
+	 **/
+	@GetMapping("captcha")
+	public void captcha(HttpServletResponse response, String uuid) throws IOException {
+		//uuid不能为空
+		AssertUtils.isBlank(uuid, ErrorCode.IDENTIFIER_NOT_NULL);
+		//生成图片验证码
+		BufferedImage image = captchaService.create(uuid);
+		response.setHeader("Cache-Control", "no-store, no-cache");
+		response.setContentType("image/jpeg");
+		ServletOutputStream out = response.getOutputStream();
+		ImageIO.write(image, "jpg", out);
+		out.close();
+	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+	 * @Author yinzuomei
+	 * @Description 微信小程序登录
+	 * @Date 2020/3/14 14:35
+	 **/
+	@PostMapping("loginbywxcode")
+	public Result<UserTokenResultDTO> loginByWxCode(@RequestBody LoginByWxCodeFormDTO formDTO) {
+		//效验数据
+		ValidatorUtils.validateEntity(formDTO);
+		return loginService.loginByWxCode(formDTO);
+	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserTokenResultDTO>
+	 * @Author yinzuomei
+	 * @Description 手机号+密码登录接口
+	 * @Date 2020/3/14 19:46
+	 **/
+	@PostMapping("loginbypassword")
+	public Result<UserTokenResultDTO> loginByPassword(@RequestBody LoginByPassWordFormDTO formDTO) {
+		//效验数据
+		ValidatorUtils.validateEntity(formDTO);
+		Result<UserTokenResultDTO> result = loginService.loginByPassword(formDTO);
+		return result;
+	}
+
+	/**
+	 * @param request
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 退出登录
+	 * @Date 2020/3/18 22:43
+	 **/
+	@PostMapping(value = "logout")
+	public Result logout(HttpServletRequest request) {
+		String token = request.getParameter(Constant.TOKEN_HEADER);
+		return loginService.logoutByToken(token);
+	}
+
+}
--- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@ -0,0 +1,53 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerUserDTO;
+import com.epmet.dto.form.PasswordLoginUserInfoFormDTO;
+import com.epmet.dto.form.WxLoginUserInfoFormDTO;
+import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/16 14:48
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
+public interface EpmetUserFeignClient {
+
+	/**
+	 * 获取用户信息
+	 *
+	 * @param loginUserInfoFormDTO
+	 * @return java.lang.String
+	 * @author yinzuomei
+	 * @date 2020/3/16 14:48
+	 */
+	@PostMapping(value = "epmetuser/customeruser/selecWxLoginUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO);
+
+	/**
+	 * 获取居民微信信息，保存到customer_user表,返回主键
+	 *
+	 * @param customerUserDTO
+	 * @return java.lang.String
+	 * @author yinzuomei
+	 * @date 2020/3/16 14:48
+	 */
+	@PostMapping(value = "epmetuser/customeruser/saveCustomerUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result saveCustomerUser(CustomerUserDTO customerUserDTO);
+
+	/**
+	 * @param passwordLoginUserInfoFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PasswordLoginUserInfoResultDTO>
+	 * @Author yinzuomei
+	 * @Description 根据手机号查询用户信息
+	 * @Date 2020/3/16 16:14
+	 **/
+	@PostMapping(value = "epmetuser/customeruser/selectLoginUserInfoByPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<PasswordLoginUserInfoResultDTO> selectLoginUserInfoByPassword(PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO);
+}
--- a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
@ -0,0 +1,36 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerUserDTO;
+import com.epmet.dto.form.PasswordLoginUserInfoFormDTO;
+import com.epmet.dto.form.WxLoginUserInfoFormDTO;
+import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/16 14:53
+ */
+@Component
+public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
+
+	@Override
+	public Result<String> selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selecWxLoginUserInfo", loginUserInfoFormDTO);
+	}
+
+	@Override
+	public Result saveCustomerUser(CustomerUserDTO customerUserDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveCustomerUser", customerUserDTO);
+	}
+
+	@Override
+	public Result<PasswordLoginUserInfoResultDTO> selectLoginUserInfoByPassword(PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectLoginUserInfoByPassword", passwordLoginUserInfoFormDTO);
+	}
+
+}
--- a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenProperties.java
+++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenProperties.java
@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.jwt;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Jwt
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "jwt.token")
+public class JwtTokenProperties {
+    private String secret;
+    private int expire;
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public int getExpire() {
+        return expire;
+    }
+
+    public void setExpire(int expire) {
+        this.expire = expire;
+    }
+}
--- a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java
+++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java
@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.jwt;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.apache.commons.codec.binary.Base64;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Jwt工具类
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class JwtTokenUtils {
+    private static final Logger logger = LoggerFactory.getLogger(JwtTokenUtils.class);
+
+    @Autowired
+    private JwtTokenProperties jwtProperties;
+
+    /**
+     * 生成jwt token 弃用
+     */
+    @Deprecated
+    public String generateToken(String userId) {
+        return Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setSubject(userId)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(jwtProperties.getExpire()).toDate())
+                .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
+                .compact();
+    }
+
+    public Claims getClaimByToken(String token) {
+        try {
+            return Jwts.parser()
+                    .setSigningKey(jwtProperties.getSecret())
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            logger.debug("validate is token error, token = " + token, e);
+            return null;
+        }
+    }
+
+    /**
+     * @return java.util.Date
+     * @param token
+     * @Author yinzuomei
+     * @Description 获取token的有效期截止时间
+     * @Date 2020/3/18 22:17
+     **/
+    public Date getExpiration(String token){
+        try {
+            return Jwts.parser()
+                    .setSigningKey(jwtProperties.getSecret())
+                    .parseClaimsJws(token)
+                    .getBody().getExpiration();
+        } catch (Exception e) {
+            logger.debug("validate is token error, token = " + token, e);
+            return null;
+        }
+    }
+
+    /**
+     * @param map
+     * @return java.lang.String
+     * @Author yinzuomei
+     * @Description 根据app+client+userId生成token
+     * @Date 2020/3/18 22:29
+     **/
+    public String createToken(Map<String, Object> map) {
+        return Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setClaims(map)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(jwtProperties.getExpire()).toDate())
+                .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
+                .compact();
+    }
+
+    /**
+     * token是否过期
+     *
+     * @return true：过期
+     */
+    public boolean isTokenExpired(Date expiration) {
+        return expiration.before(new Date());
+    }
+
+    public static void main(String[] args) {
+        Map<String, Object> map=new HashMap<>();
+        map.put("app","gov");
+        map.put("client","wxmp");
+        map.put("userId","100526ABC");
+        String tokenStr=Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setClaims(map)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(604800).toDate())
+                .signWith(SignatureAlgorithm.HS512, "7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]")
+                .compact();
+        System.out.println(tokenStr);
+        Claims claims= Jwts.parser()
+                .setSigningKey("7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]")
+                .parseClaimsJws(tokenStr)
+                .getBody();
+        System.out.println("app="+ claims.get("app"));
+        System.out.println("client="+ claims.get("client"));
+        System.out.println("userId="+ claims.get("userId"));
+    }
+
+}
--- a/epmet-auth/src/main/java/com/epmet/jwt/JwtUtils.java
+++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtUtils.java
@ -29,9 +29,10 @@ import java.util.Date;
 public class JwtUtils {
    private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);

+   /* @Autowired
+    private JwtProperties jwtProperties;*/
    @Autowired
-    private JwtProperties jwtProperties;
-
+    private JwtTokenProperties jwtProperties;
    /**
     * 生成jwt token
     */
--- a/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java
+++ b/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java
@ -10,6 +10,8 @@ package com.epmet.redis;

 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

@ -21,6 +23,7 @@ import org.springframework.stereotype.Component;
 */
@Component
 public class CaptchaRedis {
+    private Logger logger = LogManager.getLogger(CaptchaRedis.class);
    /**
     * 验证码5分钟过期
     */
@ -30,13 +33,14 @@ public class CaptchaRedis {

    public void set(String uuid, String captcha){
        String key = RedisKeys.getLoginCaptchaKey(uuid);
+        logger.info("保存验证码key=["+key+"]");
        redisUtils.set(key, captcha, EXPIRE);
    }

    public String get(String uuid){
        String key = RedisKeys.getLoginCaptchaKey(uuid);
        String captcha = (String)redisUtils.get(key);
-
+        //logger.info("获取验证码key=["+key+"]captcha=["+captcha+"]");
        //删除验证码
        if(captcha != null){
            redisUtils.delete(key);
--- a/epmet-auth/src/main/java/com/epmet/service/LoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/LoginService.java
@ -0,0 +1,40 @@
+package com.epmet.service;
+
+import com.epmet.common.token.dto.form.LoginByPassWordFormDTO;
+import com.epmet.common.token.dto.form.LoginByWxCodeFormDTO;
+import com.epmet.common.token.dto.result.UserTokenResultDTO;
+import com.epmet.commons.tools.utils.Result;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/14 20:21
+ */
+public interface LoginService {
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserTokenResultDTO>
+	 * @Author yinzuomei
+	 * @Description 微信小程序登录
+	 * @Date 2020/3/14 19:34
+	 **/
+	Result<UserTokenResultDTO> loginByWxCode(LoginByWxCodeFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserTokenResultDTO>
+	 * @Author yinzuomei
+	 * @Description 手机号+密码登录接口
+	 * @Date 2020/3/14 19:54
+	 **/
+	Result<UserTokenResultDTO> loginByPassword(LoginByPassWordFormDTO formDTO);
+
+	/**
+	 * @param token
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 退出登录
+	 * @Date 2020/3/18 22:44
+	 **/
+	Result logoutByToken(String token);
+}
--- a/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java
@ -11,6 +11,8 @@ package com.epmet.service.impl;
 import com.google.code.kaptcha.Producer;
 import com.epmet.redis.CaptchaRedis;
 import com.epmet.service.CaptchaService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -24,6 +26,7 @@ import java.awt.image.BufferedImage;
 */
@Service
 public class CaptchaServiceImpl implements CaptchaService {
+    private Logger logger = LogManager.getLogger(CaptchaServiceImpl.class);
    @Autowired
    private Producer producer;
    @Autowired
@ -33,7 +36,7 @@ public class CaptchaServiceImpl implements CaptchaService {
    public BufferedImage create(String uuid) {
        //生成验证码
        String captcha = producer.createText();
-
+        //logger.info("uuid:"+uuid+",生成的验证码:"+captcha);
        //保存验证码
        captchaRedis.set(uuid, captcha);

--- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
@ -0,0 +1,289 @@
+package com.epmet.service.impl;
+
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.common.token.dto.form.LoginByPassWordFormDTO;
+import com.epmet.common.token.dto.form.LoginByWxCodeFormDTO;
+import com.epmet.common.token.dto.result.UserTokenResultDTO;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.password.PasswordUtils;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerUserDTO;
+import com.epmet.dto.form.PasswordLoginUserInfoFormDTO;
+import com.epmet.dto.form.WxLoginUserInfoFormDTO;
+import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.jwt.JwtTokenProperties;
+import com.epmet.jwt.JwtTokenUtils;
+import com.epmet.service.CaptchaService;
+import com.epmet.service.LoginService;
+import com.epmet.utils.WxMaServiceUtils;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/14 20:31
+ */
+@Slf4j
+@Service
+public class LoginServiceImpl implements LoginService {
+	private static final Logger logger = LoggerFactory.getLogger(AuthServiceImpl.class);
+
+	@Autowired
+	private EpmetUserFeignClient epmetUserFeignClient;
+
+	@Autowired
+	private WxMaServiceUtils wxMaServiceUtils;
+
+	@Autowired
+	private JwtTokenUtils jwtTokenUtils;
+
+	@Autowired
+	private JwtTokenProperties jwtTokenProperties;
+
+	@Autowired
+	private CpUserDetailRedis cpUserDetailRedis;
+
+	@Autowired
+	private CaptchaService captchaService;
+
+	/**
+	 * 微信小程序登录
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserTokenResultDTO>
+	 * @author yinzuomei
+	 * @since 2020/3/14 19:34
+	 */
+	@Override
+	public Result<UserTokenResultDTO> loginByWxCode(LoginByWxCodeFormDTO formDTO) {
+		//1、根据wxCode获取微信信息
+		WxMaJscode2SessionResult wxMaJscode2SessionResult = this.getWxMaUser(formDTO);
+		logger.info("openId=[" + wxMaJscode2SessionResult.getOpenid() + "]unionId=[" + wxMaJscode2SessionResult.getUnionid() + "]");
+		//2、根据openId查询数据库，没有则直接插入一条记录
+		String userId = this.getUserId(formDTO, wxMaJscode2SessionResult);
+		if (StringUtils.isNotBlank(userId)) {
+			//3、封装token且存到redis
+			UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+			userTokenResultDTO.setToken(this.packagingUserToken(formDTO, userId, wxMaJscode2SessionResult));
+			return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+		}
+		return new Result<UserTokenResultDTO>().error("登录失败");
+	}
+
+	/**
+	 * 解析微信code获取小程序用户信息
+	 *
+	 * @param formDTO
+	 * @return cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult
+	 * @author yinzuomei
+	 * @date 2020/3/14 20:16
+	 */
+	private WxMaJscode2SessionResult getWxMaUser(LoginByWxCodeFormDTO formDTO) {
+		WxMaJscode2SessionResult wxMaJscode2SessionResult = null;
+		try {
+			if (LoginConstant.APP_GOV.equals(formDTO.getApp())) {
+				wxMaJscode2SessionResult = wxMaServiceUtils.govWxMaService().jsCode2SessionInfo(formDTO.getWxCode());
+			} else if (LoginConstant.APP_OPER.equals(formDTO.getApp())) {
+				wxMaJscode2SessionResult = wxMaServiceUtils.operWxMaService().jsCode2SessionInfo(formDTO.getWxCode());
+			} else if (LoginConstant.APP_RESI.equals(formDTO.getApp())) {
+				wxMaJscode2SessionResult = wxMaServiceUtils.resiWxMaService().jsCode2SessionInfo(formDTO.getWxCode());
+			}
+		} catch (WxErrorException e) {
+			log.error("->[getMaOpenId]::error[{}]", "解析微信code失败");
+		}
+		if (null == wxMaJscode2SessionResult) {
+			throw new RenException("解析微信用户信息失败");
+		} else if (StringUtils.isBlank(wxMaJscode2SessionResult.getOpenid())) {
+			throw new RenException("获取微信openid失败");
+		}
+		return wxMaJscode2SessionResult;
+	}
+
+	/**
+	 * 根据openId查询用户id
+	 *
+	 * @param formDTO
+	 * @param wxMaJscode2SessionResult
+	 * @return java.lang.String
+	 * @author yinzuomei
+	 * @since 2020/3/14 19:34
+	 */
+	private String getUserId(LoginByWxCodeFormDTO formDTO, WxMaJscode2SessionResult wxMaJscode2SessionResult) {
+		WxLoginUserInfoFormDTO wxLoginUserInfoFormDTO=new WxLoginUserInfoFormDTO();
+		wxLoginUserInfoFormDTO.setApp(formDTO.getApp());
+		wxLoginUserInfoFormDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
+		Result<String> userResult=epmetUserFeignClient.selecWxLoginUserInfo(wxLoginUserInfoFormDTO);
+		String userId="";
+		if(!userResult.success()){
+			throw new RenException("获取用户信息失败"+userResult.getMsg());
+		}
+		userId= (String) userResult.getData();
+		if (StringUtils.isBlank(userId)&&LoginConstant.APP_GOV.equals(formDTO.getApp())) {
+			//查询customer_staff待完善
+		} else if (StringUtils.isBlank(userId)&&LoginConstant.APP_OPER.equals(formDTO.getApp())) {
+			//查询oper_user待完善
+		} else if (StringUtils.isBlank(userId)&&LoginConstant.APP_RESI.equals(formDTO.getApp())) {
+			//查询customer_user
+			WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.resiWxMaService().getUserService()
+					.getUserInfo(wxMaJscode2SessionResult.getSessionKey(),
+							formDTO.getEncryptedData(),
+							formDTO.getIv());
+			CustomerUserDTO customerUserDTO=this.packageCustomerUserDTO(wxMaUserInfo);
+			Result<String> saveCustomerUserResult=epmetUserFeignClient.saveCustomerUser(customerUserDTO);
+			if(!saveCustomerUserResult.success()){
+				throw new RenException("创建用户失败"+userResult.getMsg());
+			}
+			userId = saveCustomerUserResult.getData();
+		}
+		return userId;
+	}
+
+	/**
+	 * @param wxMaUserInfo
+	 * @return com.epmet.dto.CustomerUserDTO
+	 * @Author yinzuomei
+	 * @Description 微信信息封装为customer_user记录
+	 * @Date 2020/3/17 18:22
+	 **/
+	private CustomerUserDTO packageCustomerUserDTO(WxMaUserInfo wxMaUserInfo) {
+		CustomerUserDTO customerUserDTO = new CustomerUserDTO();
+		customerUserDTO.setCity(wxMaUserInfo.getCity());
+		customerUserDTO.setWxOpenId(wxMaUserInfo.getOpenId());
+		customerUserDTO.setNickname(wxMaUserInfo.getNickName());
+		customerUserDTO.setCountry(wxMaUserInfo.getCountry());
+		customerUserDTO.setHeadImgUrl(wxMaUserInfo.getAvatarUrl());
+		customerUserDTO.setCountry(wxMaUserInfo.getCountry());
+		customerUserDTO.setProvince(wxMaUserInfo.getProvince());
+		customerUserDTO.setSex(Integer.valueOf(wxMaUserInfo.getGender()));
+		return customerUserDTO;
+	}
+
+	/**
+	 * 封装用户token值
+	 *
+	 * @param formDTO
+	 * @param userId
+	 * @param wxMaJscode2SessionResult
+	 * @return java.lang.String
+	 * @author yinzuomei
+	 * @since 2020/3/14 19:34
+	 */
+	private String packagingUserToken(LoginByWxCodeFormDTO formDTO,
+									  String userId,
+									  WxMaJscode2SessionResult wxMaJscode2SessionResult) {
+		// 生成token
+		Map<String, Object> map = new HashMap<>();
+		map.put("app", formDTO.getApp());
+		map.put("client", formDTO.getClient());
+		map.put("userId", userId);
+		String token = jwtTokenUtils.createToken(map);
+//		logger.info("app:"+formDTO.getApp()+";client:"+formDTO.getClient()+";userId:"+userId+";生成token["+token+"]");
+		int expire = jwtTokenProperties.getExpire();
+		TokenDto tokenDto = new TokenDto();
+		tokenDto.setApp(formDTO.getApp());
+		tokenDto.setClient(formDTO.getClient());
+		tokenDto.setUserId(userId);
+		tokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid());
+		tokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey());
+		tokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid());
+		tokenDto.setToken(token);
+		tokenDto.setUpdateTime(System.currentTimeMillis());
+		tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+		cpUserDetailRedis.set(tokenDto, expire);
+//		logger.info("token过期时间:"+tokenUtil.getExpire(tokenDto.getApp(),tokenDto.getClient(),tokenDto.getUserId()));
+//		logger.info("截止时间："+ DateUtils.format(jwtTokenUtils.getExpiration(token),"yyyy-MM-dd HH:mm:ss"));
+		return token;
+	}
+
+	/**
+	 * 手机号+密码登录接口
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserTokenResultDTO>
+	 * @author yinzuomei
+	 * @since 2020/3/14 19:34
+	 */
+	@Override
+	public Result<UserTokenResultDTO> loginByPassword(LoginByPassWordFormDTO formDTO) {
+		//1、验证码是否正确
+		boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
+		if(!flag){
+			return new Result<UserTokenResultDTO>().error(ErrorCode.CAPTCHA_ERROR);
+		}
+		//2、账号是否存在
+		//获取用户信息
+		PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO=new PasswordLoginUserInfoFormDTO();
+		passwordLoginUserInfoFormDTO.setApp(formDTO.getApp());
+		passwordLoginUserInfoFormDTO.setPhone(formDTO.getPhone());
+		Result<PasswordLoginUserInfoResultDTO> userInfoResult=epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
+		logger.info(userInfoResult.getCode()+userInfoResult.getMsg());
+		if(!userInfoResult.success()||null==userInfoResult.getData()){
+			return new Result<UserTokenResultDTO>().error("账号不存在");
+		}
+		//3、密码是否正确
+		//密码错误
+		if(!PasswordUtils.matches(formDTO.getPassword(),userInfoResult.getData().getPassWord())){
+			throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
+		}
+		//4、生成token返回，且将TokenDto存到redis
+		UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+		userTokenResultDTO.setToken(this.packagingUserToken(formDTO, userInfoResult.getData().getUserId()));
+		return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+	}
+
+	/**
+	 * 封装用户token值
+	 *
+	 * @param formDTO
+	 * @param userId
+	 * @return java.lang.String
+	 * @author yinzuomei
+	 * @since 2020/3/14 19:34
+	 */
+	private String packagingUserToken(LoginByPassWordFormDTO formDTO,
+									  String userId) {
+		// 生成token
+		Map<String, Object> map = new HashMap<>();
+		map.put("app", formDTO.getApp());
+		map.put("client", formDTO.getClient());
+		map.put("userId", userId);
+		String token = jwtTokenUtils.createToken(map);
+//		logger.info("app:"+formDTO.getApp()+";client:"+formDTO.getClient()+";userId:"+userId+";生成token["+token+"]");
+		int expire = jwtTokenProperties.getExpire();
+		TokenDto tokenDto = new TokenDto();
+		tokenDto.setApp(formDTO.getApp());
+		tokenDto.setClient(formDTO.getClient());
+		tokenDto.setUserId(userId);
+		tokenDto.setToken(token);
+		tokenDto.setUpdateTime(System.currentTimeMillis());
+		tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+		cpUserDetailRedis.set(tokenDto, expire);
+//		logger.info("token过期时间:"+tokenUtil.getExpire(tokenDto.getApp(),tokenDto.getClient(),tokenDto.getUserId()));
+//		logger.info("截止时间："+ DateUtils.format(jwtTokenUtils.getExpiration(token),"yyyy-MM-dd HH:mm:ss"));
+		return token;
+	}
+
+
+	@Override
+	public Result logoutByToken(String token) {
+		//记录登出日志
+		//删除redis
+		//web端清空菜单栏和权限，小程序目前又
+		return null;
+	}
+}
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@ -85,8 +85,39 @@ ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 300000
 jwt:
-  #秘钥
-  #  secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
-  secret: f4e2e52034348f86b67cde5[www.renren.io]
-  #token有效时长，默认7天，单位秒
-  expire: 604800
+  token:
+    #秘钥
+    secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
+    #token有效时长，默认7天，单位秒
+    expire: 604800
+wx:
+  mp:
+    configs:
+      - appId: @wx.mp.configs.appId@
+        secret: @wx.mp.configs.secret@
+        token: @wx.mp.configs.token@
+        aesKey: @wx.mp.configs.aesKey@
+  ma:
+    configs:
+      - appid: @resi.wx.ma.appId@
+        secret: @resi.wx.ma.secret@
+        token: #微信小程序消息服务器配置的token
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
+#      - appid: @gov.wx.ma.appId@
+#        secret: @gov.wx.ma.secret@
+#        token: #微信小程序消息服务器配置的token
+#        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+#        msgDataFormat: JSON
+#      - appid: @oper.wx.ma.appId@
+#        secret: @oper.wx.ma.secret@
+#        token: #微信小程序消息服务器配置的token
+#        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+#        msgDataFormat: JSON
+    appId:
+      # 党群e事通-居民端小程序配置appId
+      resi: @resi.wx.ma.appId@
+      # 党群e事通-政府端小程序配置的appId
+      #gov: @gov.wx.ma.appId@
+      # 党群e事通-运营端小程序配置的appId
+      #oper: @oper.wx.ma.appId@
--- a/epmet-cloud-generator/src/main/resources/application.yml
+++ b/epmet-cloud-generator/src/main/resources/application.yml
@ -9,7 +9,7 @@ spring:
    type: com.alibaba.druid.pool.DruidDataSource
    #MySQL配置
    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.104.224.45:3308/epmet_oper_crm?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://47.104.224.45:3308/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: epmet
    password: elink@833066
    #oracle配置
--- a/epmet-commons/epmet-common-clienttoken/pom.xml
+++ b/epmet-commons/epmet-common-clienttoken/pom.xml
@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-commons</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epmet-common-clienttoken</artifactId>
+    <packaging>jar</packaging>
+
+    <name>epmet-common-clienttoken</name>
+    <url>http://www.example.com</url>
+    <description>客户端token</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure-processor</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+            </plugin>
+            <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                    <source>${maven.compiler.source}</source> <!-- 源代码使用的开发版本 -->
+                    <target>${maven.compiler.target}</target> <!-- 需要生成的目标class文件的编译版本 -->
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+
+            <!-- jar插件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+    </build>
+</project>
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/Login.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/Login.java
@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 http://www.renren.io
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.epmet.common.token.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 登录效验
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2017/9/23 14:30
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Login {
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/NeedClientToken.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/NeedClientToken.java
@ -0,0 +1,13 @@
+package com.epmet.common.token.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)//生命注释保留时长，这里无需反射使用，使用CLASS级别
+@Target(ElementType.METHOD)//生命可以使用此注解的元素级别类型（如类、方法变量等）
+public @interface NeedClientToken {
+
+    boolean value() default true;
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/constant/LoginConstant.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/constant/LoginConstant.java
@ -0,0 +1,33 @@
+package com.epmet.common.token.constant;
+
+/**
+ * @Description app、client
+ * @Author yinzuomei
+ * @Date 2020/3/14 20:12
+ */
+public interface LoginConstant {
+	/**
+	 * 政府端
+	 */
+	String APP_GOV = "gov";
+
+	/**
+	 * 居民端
+	 */
+	String APP_RESI = "resi";
+
+	/**
+	 * 运营端
+	 */
+	String APP_OPER = "oper";
+
+	/**
+	 * web
+	 */
+	String CLIENT_WEB = "web";
+
+	/**
+	 * 微信小程序
+	 */
+	String CLIENT_WXMP = "wxmp";
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginByPassWordFormDTO.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginByPassWordFormDTO.java
@ -0,0 +1,40 @@
+package com.epmet.common.token.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 手机号+密码登录接口入参
+ * @Author yinzuomei
+ * @Date 2020/3/14 19:46
+ */
+@Data
+public class LoginByPassWordFormDTO extends LoginCommonFormDTO implements Serializable {
+	private static final long serialVersionUID = -7507437651048051183L;
+
+	/**
+	 * 手机号
+	 */
+	@NotBlank(message = "手机号不能为空")
+	private String phone;
+
+	/**
+	 * 密码
+	 */
+	@NotBlank(message = "密码不能为空")
+	private String password;
+
+	/**
+	 * 验证码
+	 */
+	@NotBlank(message="验证码不能为空")
+	private String captcha;
+
+	/**
+	 * 唯一标识
+	 */
+	@NotBlank(message="唯一标识不能为空")
+	private String uuid;
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginByWxCodeFormDTO.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginByWxCodeFormDTO.java
@ -0,0 +1,34 @@
+package com.epmet.common.token.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 微信小程序登录接口入参
+ * @Author yinzuomei
+ * @Date 2020/3/14 14:39
+ */
+@Data
+public class LoginByWxCodeFormDTO extends LoginCommonFormDTO implements Serializable {
+	private static final long serialVersionUID = 7950477424010655108L;
+
+	/**
+	 * 微信code
+	 */
+	@NotBlank(message = "wxCode不能为空")
+	private String wxCode;
+
+	/**
+	 * 用户信息
+	 */
+	@NotBlank(message = "用户信息不能为空")
+	private String encryptedData;
+
+	/**
+	 * 加密算法的初始向量
+	 */
+	@NotBlank(message = "初始向量不能为空")
+	private String iv;
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginCommonFormDTO.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/form/LoginCommonFormDTO.java
@ -0,0 +1,28 @@
+package com.epmet.common.token.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 登录接口通用入参
+ * @Author yinzuomei
+ * @Date 2020/3/14 19:47
+ */
+@Data
+public class LoginCommonFormDTO implements Serializable {
+	private static final long serialVersionUID = -5582224784914714820L;
+
+	/**
+	 * 政府端:gov、居民端:resi、运营端:oper
+	 */
+	@NotBlank(message = "app不能为空(政府端:gov、居民端:resi、运营端:oper)")
+	private String app;
+
+	/**
+	 * PC端:web、微信小程序:wxmp
+	 */
+	@NotBlank(message = "client不能为空(PC端:web、微信小程序:wxmp)")
+	private String client;
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/result/UserTokenResultDTO.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/result/UserTokenResultDTO.java
@ -0,0 +1,20 @@
+package com.epmet.common.token.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 登录接口返参DTO
+ * @Author yinzuomei
+ * @Date 2020/3/14 15:10
+ */
+@Data
+public class UserTokenResultDTO implements Serializable {
+	private static final long serialVersionUID = 5214475907074876716L;
+
+	/**
+	 * 令牌
+	 */
+	private String token;
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/enums/ErrorCode.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/enums/ErrorCode.java
@ -0,0 +1,47 @@
+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不能为空"),
+
+    ERR500(500, "Internal Server Error"),
+    ERR501(501, "参数绑定异常"),
+
+    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;
+    }
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/error/IErrorCode.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/error/IErrorCode.java
@ -0,0 +1,11 @@
+package com.epmet.common.token.error;
+
+/**
+ * @author rongchao
+ * @Date 18-11-20
+ */
+public interface IErrorCode {
+    int getCode();
+
+    String getMsg();
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/property/TokenPropertise.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/property/TokenPropertise.java
@ -0,0 +1,23 @@
+package com.epmet.common.token.property;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author rongchao
+ * @Date 18-12-3
+ */
+@Component
+@ConfigurationProperties(prefix = "token")
+public class TokenPropertise {
+
+    private long expire = 7200L;
+
+    public long getExpire() {
+        return expire;
+    }
+
+    public void setExpire(long expire) {
+        this.expire = expire;
+    }
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
@ -0,0 +1,54 @@
+package com.epmet.common.token.util;
+
+import com.epmet.common.token.property.TokenPropertise;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * token服务类
+ *
+ * @author rongchao
+ * @Date 18-10-31
+ */
+@Component
+public class TokenUtil {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private TokenPropertise tokenPropertise;
+
+    @Autowired
+    private CpUserDetailRedis redisUtils;
+
+    public TokenDto getTokenInfo(String app, String client, String userId) {
+        TokenDto tokenDto = redisUtils.get(app,client,userId);
+        return tokenDto;
+    }
+
+    public void expireToken(String app,String client,String userId) {
+        redisUtils.logout(app,client,userId);
+    }
+
+    public boolean delayToken(String app,String client,String userId) {
+        return redisUtils.expire(app, client,userId,tokenPropertise.getExpire());
+    }
+
+    /**
+     * 获取token过期时间
+     *
+     * @param app
+     * @param client
+     * @param userId
+     * @return long
+     * @author yujintao
+     * @date 2019/9/9 14:19
+     */
+    public long getExpire(String app,String client,String userId) {
+        return redisUtils.getExpire(app,client,userId);
+    }
+}
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java
@ -0,0 +1,55 @@
+package com.epmet.common.token.util;
+
+import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.WebUtil;
+
+/**
+ * 用户工具类
+ *
+ * @author rongchao
+ * @Date 18-11-20
+ */
+public class UserUtil {
+
+    /**
+     * 获取当前用户信息
+     *
+     * @return
+     */
+    public static TokenDto getCurrentUser() {
+        return (TokenDto) WebUtil.getAttributesFromRequest(Constant.APP_USER_KEY);
+    }
+
+    /**
+     * 获取当前用户信息
+     *
+     * @return com.elink.esua.common.token.dto.UserTokenDto
+     * @author yujintao
+     * @date 2018/12/5 9:24
+     */
+    public static TokenDto getCurrentUserInfo() {
+        TokenDto tokenDto = getCurrentUser();
+        if (tokenDto == null) {
+            return null;
+        }
+        return tokenDto;
+    }
+
+    /**
+     * 获取当前用户ID
+     *
+     * @return
+     */
+    public static String getCurrentUserId() {
+        TokenDto tokenDto = getCurrentUser();
+        if (tokenDto == null) {
+            return null;
+        }
+        return tokenDto.getUserId();
+    }
+
+    public static void setCurrentUser(TokenDto user) {
+        WebUtil.setAttributesFromRequest(Constant.APP_USER_KEY, user);
+    }
+}
--- a/epmet-commons/epmet-commons-tools-phone/pom.xml
+++ b/epmet-commons/epmet-commons-tools-phone/pom.xml
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-commons</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epmet-commons-tools-phone</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.googlecode.libphonenumber</groupId>
+            <artifactId>libphonenumber</artifactId>
+            <version>8.8.8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.libphonenumber</groupId>
+            <artifactId>carrier</artifactId>
+            <version>1.75</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.libphonenumber</groupId>
+            <artifactId>geocoder</artifactId>
+            <version>2.85</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.libphonenumber</groupId>
+            <artifactId>prefixmapper</artifactId>
+            <version>2.85</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>
--- a/epmet-commons/epmet-commons-tools-phone/src/main/java/com/epmet/commons/tools/utils/PhoneDto.java
+++ b/epmet-commons/epmet-commons-tools-phone/src/main/java/com/epmet/commons/tools/utils/PhoneDto.java
@ -0,0 +1,79 @@
+package com.epmet.commons.tools.utils;
+
+/**
+ * 电话DTO
+ *
+ * @author rongchao
+ * @Date 18-12-11
+ */
+public class PhoneDto {
+
+    /**
+     * 省份名称
+     */
+    private String provinceName;
+
+    /**
+     * 城市名称
+     */
+    private String cityName;
+
+    /**
+     * 运营商：移动/电信/联通
+     */
+    private String carrier;
+
+    /**
+     * 省份名称
+     *
+     * @return 获取provinceName属性值
+     */
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    /**
+     * 省份名称
+     *
+     * @param provinceName 设置 provinceName 属性值为参数值 provinceName
+     */
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    /**
+     * 城市名称
+     *
+     * @return 获取cityName属性值
+     */
+    public String getCityName() {
+        return cityName;
+    }
+
+    /**
+     * 城市名称
+     *
+     * @param cityName 设置 cityName 属性值为参数值 cityName
+     */
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    /**
+     * 运营商：移动/电信/联通
+     *
+     * @return 获取carrier属性值
+     */
+    public String getCarrier() {
+        return carrier;
+    }
+
+    /**
+     * 运营商：移动/电信/联通
+     *
+     * @param carrier 设置 carrier 属性值为参数值 carrier
+     */
+    public void setCarrier(String carrier) {
+        this.carrier = carrier;
+    }
+}
--- a/epmet-commons/epmet-commons-tools-phone/src/main/java/com/epmet/commons/tools/utils/PhoneUtil.java
+++ b/epmet-commons/epmet-commons-tools-phone/src/main/java/com/epmet/commons/tools/utils/PhoneUtil.java
@ -0,0 +1,178 @@
+package com.epmet.commons.tools.utils;
+
+/**
+ * @author rongchao
+ * @Date 18-12-11
+ */
+
+
+
+import com.google.i18n.phonenumbers.PhoneNumberToCarrierMapper;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
+
+import java.util.Locale;
+
+/**
+ * 手机号归属地查询
+ * jar依赖：com.googlecode.libphonenumber(Libphonenumber、Geocoder、Prefixmapper
+ * 、Carrier) pom依赖：http://mvnrepository.com/search?q=libphonenumber
+ * 项目地址：https://github.com/googlei18n/libphonenumber
+ *
+ * @author rongchao
+ * @Date 18-12-11
+ */
+public class PhoneUtil {
+
+    /**
+     * 直辖市
+     */
+    private final static String[] MUNICIPALITY = {"北京市", "天津市", "上海市", "重庆市"};
+
+    /**
+     * 自治区
+     */
+    private final static String[] AUTONOMOUS_REGION = {"新疆", "内蒙古", "西藏", "宁夏", "广西"};
+
+    private static PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil
+            .getInstance();
+
+    /**
+     * 提供与电话号码相关的运营商信息
+     */
+    private static PhoneNumberToCarrierMapper carrierMapper = PhoneNumberToCarrierMapper
+            .getInstance();
+
+    /**
+     * 提供与电话号码有关的地理信息
+     */
+    private static PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder
+            .getInstance();
+
+    /**
+     * 中国大陆区区号
+     */
+    private final static int COUNTRY_CODE = 86;
+
+    /**
+     * 根据手机号 判断手机号是否有效
+     *
+     * @param phoneNumber 手机号码
+     * @return true-有效 false-无效
+     */
+    public static boolean checkPhoneNumber(String phoneNumber) {
+        long phone = Long.parseLong(phoneNumber);
+
+        PhoneNumber pn = new PhoneNumber();
+        pn.setCountryCode(COUNTRY_CODE);
+        pn.setNationalNumber(phone);
+
+        return phoneNumberUtil.isValidNumber(pn);
+
+    }
+
+    /**
+     * 根据手机号 判断手机运营商
+     *
+     * @param phoneNumber 手机号码
+     * @return 如：广东省广州市移动
+     */
+    public static String getCarrier(String phoneNumber) {
+
+        long phone = Long.parseLong(phoneNumber);
+
+        PhoneNumber pn = new PhoneNumber();
+        pn.setCountryCode(COUNTRY_CODE);
+        pn.setNationalNumber(phone);
+        // 返回结果只有英文，自己转成成中文
+        String carrierEn = carrierMapper.getNameForNumber(pn, Locale.ENGLISH);
+        String carrierZh = "";
+        switch (carrierEn) {
+            case "China Mobile":
+                carrierZh += "移动";
+                break;
+            case "China Unicom":
+                carrierZh += "联通";
+                break;
+            case "China Telecom":
+                carrierZh += "电信";
+                break;
+            default:
+                break;
+        }
+        return carrierZh;
+    }
+
+    /**
+     * 根据手机号 获取手机归属地
+     *
+     * @param phoneNumber 手机号码
+     * @return 如：广东省广州市
+     */
+    public static String getGeo(String phoneNumber) {
+        long phone = Long.parseLong(phoneNumber);
+
+        Phonenumber.PhoneNumber pn = new Phonenumber.PhoneNumber();
+        pn.setCountryCode(COUNTRY_CODE);
+        pn.setNationalNumber(phone);
+        return geocoder.getDescriptionForNumber(pn, Locale.CHINESE);
+    }
+
+    /**
+     * 根据手机号 获取手机信息模型
+     *
+     * <pre>
+     * 若返回值为null，则说明该号码无效
+     * </pre>
+     *
+     * @param phoneNumber 手机号码
+     * @return 手机信息模型PhoneModel
+     */
+    public static PhoneDto getPhoneDto(String phoneNumber) {
+        if (checkPhoneNumber(phoneNumber)) {
+            String geo = getGeo(phoneNumber);
+            PhoneDto phoneDto = new PhoneDto();
+            String carrier = getCarrier(phoneNumber);
+            phoneDto.setCarrier(carrier);
+            // 直辖市
+            for (String val : MUNICIPALITY) {
+                if (geo.equals(val)) {
+                    phoneDto.setProvinceName(val.replace("市", ""));
+                    phoneDto.setCityName(val);
+                    return phoneDto;
+                }
+            }
+            // 自治区
+            for (String val : AUTONOMOUS_REGION) {
+                if (geo.startsWith(val)) {
+                    phoneDto.setProvinceName(val);
+                    phoneDto.setCityName(geo.replace(val, ""));
+                    return phoneDto;
+                }
+            }
+
+            // 其它
+            String[] splitArr = geo.split("省");
+            if (splitArr != null && splitArr.length == 2) {
+                phoneDto.setProvinceName(splitArr[0]);
+                phoneDto.setCityName(splitArr[1]);
+                return phoneDto;
+            }
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        PhoneDto phoneDto = PhoneUtil.getPhoneDto("13701001254");
+        if (phoneDto != null) {
+            System.out.println(phoneDto.getProvinceName());
+            System.out.println(phoneDto.getCityName());
+            System.out.println(phoneDto.getCarrier());
+        } else {
+            System.err.println("该号码无效");
+        }
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-ma/pom.xml
+++ b/epmet-commons/epmet-commons-tools-wx-ma/pom.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-commons</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <version>1.0.0</version>
+    <artifactId>epmet-commons-tools-wx-ma</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>3.6.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
--- a/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/utils/WxMaServiceUtils.java
+++ b/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/utils/WxMaServiceUtils.java
@ -0,0 +1,65 @@
+package com.epmet.utils;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.epmet.wx.ma.WxMaConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 获取小程序业务工具
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/25 13:29
+ */
+@Component
+public class WxMaServiceUtils {
+
+    @Value("${wx.ma.appId.resi}")
+    private String APPID_RESI;
+
+    /*@Value("${wx.ma.appId.gov}")
+    private String APPID_GOV;
+
+    @Value("${wx.ma.appId.oper}")
+    private String APPID_OPER;*/
+
+    /**
+     * 获取党群e事通-居民端小程序配置
+     *
+     * @return cn.binarywang.wx.miniapp.api.WxMaService
+     * @author yinzuomei
+     * @date 2020/03/13 10:44
+     */
+    public final WxMaService resiWxMaService() {
+        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_RESI);
+        return wxMaService;
+    }
+
+    /**
+     * 获取党群e事通-政府端小程序配置
+     *
+     * @return cn.binarywang.wx.miniapp.api.WxMaService
+     * @author yinzuomei
+     * @date 2020/03/13 10:44
+     */
+    public final WxMaService govWxMaService() {
+//        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_GOV);
+        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_RESI);
+        return wxMaService;
+    }
+
+    /**
+     *
+     * 获取党群e事通-运营端小程序配置
+     *
+     * @params []
+     * @return cn.binarywang.wx.miniapp.api.WxMaService
+     * @author yinzuomei
+     * @since 2020/03/13 10:44
+     */
+    public final WxMaService operWxMaService() {
+//        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_OPER);
+        final WxMaService wxMaService = WxMaConfig.getMaService(APPID_RESI);
+        return wxMaService;
+    }
+}
--- a/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/wx/ma/WxMaConfig.java
+++ b/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/wx/ma/WxMaConfig.java
@ -0,0 +1,148 @@
+package com.epmet.wx.ma;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
+import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
+import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
+import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Configuration
+@EnableConfigurationProperties(WxMaProperties.class)
+public class WxMaConfig {
+
+    private WxMaProperties properties;
+
+    private static Map<String, WxMaMessageRouter> routers = Maps.newHashMap();
+    private static Map<String, WxMaService> maServices = Maps.newHashMap();
+
+    @Autowired
+    public WxMaConfig(WxMaProperties properties) {
+        this.properties = properties;
+    }
+
+    public static WxMaService getMaService(String appid) {
+        WxMaService wxService = maServices.get(appid);
+        if (wxService == null) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
+
+        return wxService;
+    }
+
+    public static WxMaMessageRouter getRouter(String appid) {
+        return routers.get(appid);
+    }
+
+    @PostConstruct
+    public void init() {
+        List<WxMaProperties.Config> configs = this.properties.getConfigs();
+        if (configs == null) {
+            throw new RuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
+        }
+
+        maServices = configs.stream()
+                .map(a -> {
+                    WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+                    config.setAppid(a.getAppid());
+                    config.setSecret(a.getSecret());
+                    config.setToken(a.getToken());
+                    config.setAesKey(a.getAesKey());
+                    config.setMsgDataFormat(a.getMsgDataFormat());
+
+                    WxMaService service = new WxMaServiceImpl();
+                    service.setWxMaConfig(config);
+                    routers.put(a.getAppid(), this.newRouter(service));
+                    return service;
+                }).collect(Collectors.toMap(s -> s.getWxMaConfig().getAppid(), a -> a));
+    }
+
+    private WxMaMessageRouter newRouter(WxMaService service) {
+        final WxMaMessageRouter router = new WxMaMessageRouter(service);
+        router
+                .rule().handler(logHandler).next()
+                .rule().async(false).content("模板").handler(templateMsgHandler).end()
+                .rule().async(false).content("文本").handler(textHandler).end()
+                .rule().async(false).content("图片").handler(picHandler).end()
+                .rule().async(false).content("二维码").handler(qrcodeHandler).end();
+        return router;
+    }
+
+    private final WxMaMessageHandler templateMsgHandler = (wxMessage, context, service, sessionManager) -> {
+        service.getMsgService().sendTemplateMsg(WxMaTemplateMessage.builder()
+                .templateId("此处更换为自己的模板id")
+                .formId("自己替换可用的formid")
+                .data(Lists.newArrayList(
+                        new WxMaTemplateData("keyword1", "339208499", "#173177")))
+                .toUser(wxMessage.getFromUser())
+                .build());
+        return null;
+    };
+
+    private final WxMaMessageHandler logHandler = (wxMessage, context, service, sessionManager) -> {
+        System.out.println("收到消息：" + wxMessage.toString());
+        service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("收到信息为：" + wxMessage.toJson())
+                .toUser(wxMessage.getFromUser()).build());
+        return null;
+    };
+
+    private final WxMaMessageHandler textHandler = (wxMessage, context, service, sessionManager) -> {
+        service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("回复文本消息")
+                .toUser(wxMessage.getFromUser()).build());
+        return null;
+    };
+
+    private final WxMaMessageHandler picHandler = (wxMessage, context, service, sessionManager) -> {
+        try {
+            WxMediaUploadResult uploadResult = service.getMediaService()
+                    .uploadMedia("image", "png",
+                            ClassLoader.getSystemResourceAsStream("tmp.png"));
+            service.getMsgService().sendKefuMsg(
+                    WxMaKefuMessage
+                            .newImageBuilder()
+                            .mediaId(uploadResult.getMediaId())
+                            .toUser(wxMessage.getFromUser())
+                            .build());
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    };
+
+    private final WxMaMessageHandler qrcodeHandler = (wxMessage, context, service, sessionManager) -> {
+        try {
+            final File file = service.getQrcodeService().createQrcode("123", 430);
+            WxMediaUploadResult uploadResult = service.getMediaService().uploadMedia("image", file);
+            service.getMsgService().sendKefuMsg(
+                    WxMaKefuMessage
+                            .newImageBuilder()
+                            .mediaId(uploadResult.getMediaId())
+                            .toUser(wxMessage.getFromUser())
+                            .build());
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    };
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/wx/ma/WxMaProperties.java
+++ b/epmet-commons/epmet-commons-tools-wx-ma/src/main/java/com/epmet/wx/ma/WxMaProperties.java
@ -0,0 +1,48 @@
+package com.epmet.wx.ma;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * 微信小程序框架配置类
+ *
+ * @author rongchao
+ * @Date 19-5-13
+ */
+@Data
+@ConfigurationProperties(prefix = "wx.ma")
+public class WxMaProperties {
+
+    private List<Config> configs;
+
+    @Data
+    public static class Config {
+        /**
+         * 设置微信小程序的appid
+         */
+        private String appid;
+
+        /**
+         * 设置微信小程序的Secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信小程序消息服务器配置的token
+         */
+        private String token;
+
+        /**
+         * 设置微信小程序消息服务器配置的EncodingAESKey
+         */
+        private String aesKey;
+
+        /**
+         * 消息格式，XML或者JSON
+         */
+        private String msgDataFormat;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/.editorconfig
+++ b/epmet-commons/epmet-commons-tools-wx-mp/.editorconfig
@ -0,0 +1,14 @@
+# EditorConfig: http://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
--- a/epmet-commons/epmet-commons-tools-wx-mp/.travis.yml
+++ b/epmet-commons/epmet-commons-tools-wx-mp/.travis.yml
@ -0,0 +1,13 @@
+language: java
+jdk:
+  - openjdk8
+
+script: "mvn clean package -Dmaven.test.skip=true"
+
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - binarywang@vip.qq.com
--- a/epmet-commons/epmet-commons-tools-wx-mp/README.md
+++ b/epmet-commons/epmet-commons-tools-wx-mp/README.md
@ -0,0 +1,58 @@
+[![码云Gitee](https://gitee.com/binary/weixin-java-mp-demo-springboot/badge/star.svg?theme=blue)](https://gitee.com/binary/weixin-java-mp-demo-springboot)
+[![Github](http://github-svg-buttons.herokuapp.com/star.svg?user=binarywang&repo=weixin-java-mp-demo-springboot&style=flat&background=1081C1)](https://github.com/binarywang/weixin-java-mp-demo-springboot)
+[![Build Status](https://travis-ci.org/binarywang/weixin-java-mp-demo-springboot.svg?branch=master)](https://travis-ci.org/binarywang/weixin-java-mp-demo-springboot)
+-----------------------
+
+### 本Demo基于Spring Boot构建，实现微信公众号后端开发功能。
+### 本项目为WxJava的Demo演示程序，更多Demo请[查阅此处](https://github.com/Wechat-Group/WxJava/blob/master/demo.md)。
+#### 如有问题请[【在此提问】](https://github.com/binarywang/weixin-java-mp-demo-springboot/issues)，谢谢配合。
+
+<table border="0">
+	<tbody>
+		<tr>
+			<td align="left" valign="middle">
+        <a href="http://mp.weixin.qq.com/mp/homepage?__biz=MzI3MzAwMzk4OA==&hid=1&sn=f31af3bf562b116b061c9ab4edf70b61&scene=18#wechat_redirect" target="_blank">
+				  <img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/qrcodes/mp.png">
+        </a>
+			</td>
+			<td align="center" valign="middle">
+				<a href="https://cloud.tencent.com/redirect.php?redirect=1014&cps_key=a4c06ffe004dbcda44036daa1bf8f876&from=console" target="_blank">
+					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/banners/tcloud.jpg">
+				</a>
+			</td>
+			<td align="right" valign="middle">
+				<a href="https://coding.net/?utm_source=WxJava" target="_blank">
+					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/banners/coding.jpg">
+				</a>
+			</td>
+			<td align="center" valign="middle">
+				<a href="https://promotion.aliyun.com/ntms/act/qwbk.html?userCode=7makzf5h" target="_blank">
+					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/banners/aliyun.jpg">
+				</a>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+## 使用步骤：
+1. 请注意，本demo为简化代码编译时加入了lombok支持，如果不了解lombok的话，请先学习下相关知识，比如可以阅读[此文章](https://mp.weixin.qq.com/s/cUc-bUcprycADfNepnSwZQ)；
+1. 另外，新手遇到问题，请务必先阅读[【开发文档首页】](https://github.com/Wechat-Group/WxJava/wiki)的常见问题部分，可以少走很多弯路，节省不少时间。
+1. 配置：复制 `/src/main/resources/application.yml.template` 或修改其扩展名生成 `application.yml` 文件，根据自己需要填写相关配置（需要注意的是：yml文件内的属性冒号后面的文字之前需要加空格，可参考已有配置，否则属性会设置不成功）；
+2. 主要配置说明如下：
+```
+wx:
+  mp:
+    configs:
+      - appId: 1111 （一个公众号的appid）
+        secret: 1111（公众号的appsecret）
+        token: 111 （接口配置里的Token值）
+        aesKey: 111 （接口配置里的EncodingAESKey值）
+      - appId: 2222 （另一个公众号的appid，以下同上）
+        secret: 1111
+        token: 111
+        aesKey: 111
+```
+3. 运行Java程序：`WxMpDemoApplication`；
+4. 配置微信公众号中的接口地址：http://公网可访问域名/wx/portal/xxxxx （注意，xxxxx为对应公众号的appid值）；
+5. 根据自己需要修改各个handler的实现，加入自己的业务逻辑。
+	
--- a/epmet-commons/epmet-commons-tools-wx-mp/pom.xml
+++ b/epmet-commons/epmet-commons-tools-wx-mp/pom.xml
@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>epmet-commons</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <version>1.0.0</version>
+    <artifactId>epmet-commons-tools-wx-mp</artifactId>
+    <packaging>jar</packaging>
+
+<!--    <name>Wechat mp demo with Spring Boot and WxJava</name>-->
+<!--    <description>基于 WxJava 和 Spring Boot 实现的微信公众号后端开发演示项目</description>-->
+
+    <properties>
+        <weixin-java-mp.version>3.6.0</weixin-java-mp.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.locales>zh_CN</project.build.locales>
+        <docker.image.prefix>wechat-mp-demo</docker.image.prefix>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>${weixin-java-mp.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure-processor</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/AbstractBuilder.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/AbstractBuilder.java
@ -0,0 +1,17 @@
+package com.epmet.wx.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public abstract class AbstractBuilder {
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+    public abstract WxMpXmlOutMessage build(String content,
+                                            WxMpXmlMessage wxMessage, WxMpService service);
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/ImageBuilder.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/ImageBuilder.java
@ -0,0 +1,24 @@
+package com.epmet.wx.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public class ImageBuilder extends AbstractBuilder {
+
+    @Override
+    public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage,
+                                   WxMpService service) {
+
+        WxMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId(content)
+            .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+            .build();
+
+        return m;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/TextBuilder.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/builder/TextBuilder.java
@ -0,0 +1,22 @@
+package com.epmet.wx.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public class TextBuilder extends AbstractBuilder {
+
+    @Override
+    public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage,
+                                   WxMpService service) {
+        WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content(content)
+            .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+            .build();
+        return m;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/config/WxMpConfiguration.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/config/WxMpConfiguration.java
@ -0,0 +1,113 @@
+package com.epmet.wx.mp.config;
+
+import com.epmet.wx.mp.handler.*;
+import lombok.AllArgsConstructor;
+import me.chanjar.weixin.mp.api.WxMpMessageRouter;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static me.chanjar.weixin.common.api.WxConsts.EventType;
+import static me.chanjar.weixin.common.api.WxConsts.EventType.SUBSCRIBE;
+import static me.chanjar.weixin.common.api.WxConsts.EventType.UNSUBSCRIBE;
+import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType.CLICK;
+import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType.VIEW;
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType.EVENT;
+import static me.chanjar.weixin.mp.constant.WxMpEventConstants.CustomerService.*;
+import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY;
+
+/**
+ * wechat mp configuration
+ *
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@AllArgsConstructor
+@Configuration
+@EnableConfigurationProperties(WxMpProperties.class)
+public class WxMpConfiguration {
+    private final LogHandler logHandler;
+    private final NullHandler nullHandler;
+    private final KfSessionHandler kfSessionHandler;
+    private final StoreCheckNotifyHandler storeCheckNotifyHandler;
+    private final LocationHandler locationHandler;
+    private final MenuHandler menuHandler;
+    private final MsgHandler msgHandler;
+    private final UnsubscribeHandler unsubscribeHandler;
+    private final SubscribeHandler subscribeHandler;
+    private final ScanHandler scanHandler;
+    private final WxMpProperties properties;
+
+    @Bean
+    public WxMpService wxMpService() {
+        // 代码里 getConfigs()处报错的同学，请注意仔细阅读项目说明，你的IDE需要引入lombok插件！！！！
+        final List<WxMpProperties.MpConfig> configs = this.properties.getConfigs();
+        if (configs == null) {
+            throw new RuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
+        }
+
+        WxMpService service = new WxMpServiceImpl();
+        service.setMultiConfigStorages(configs
+            .stream().map(a -> {
+                WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl();
+                configStorage.setAppId(a.getAppId());
+                configStorage.setSecret(a.getSecret());
+                configStorage.setToken(a.getToken());
+                configStorage.setAesKey(a.getAesKey());
+                return configStorage;
+            }).collect(Collectors.toMap(WxMpDefaultConfigImpl::getAppId, a -> a, (o, n) -> o)));
+        return service;
+    }
+
+    @Bean
+    public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
+        final WxMpMessageRouter newRouter = new WxMpMessageRouter(wxMpService);
+
+        // 记录所有事件的日志 （异步执行）
+        newRouter.rule().handler(this.logHandler).next();
+
+        // 接收客服会话管理事件
+        newRouter.rule().async(false).msgType(EVENT).event(KF_CREATE_SESSION)
+            .handler(this.kfSessionHandler).end();
+        newRouter.rule().async(false).msgType(EVENT).event(KF_CLOSE_SESSION)
+            .handler(this.kfSessionHandler).end();
+        newRouter.rule().async(false).msgType(EVENT).event(KF_SWITCH_SESSION)
+            .handler(this.kfSessionHandler).end();
+
+        // 门店审核事件
+        newRouter.rule().async(false).msgType(EVENT).event(POI_CHECK_NOTIFY).handler(this.storeCheckNotifyHandler).end();
+
+        // 自定义菜单事件
+        newRouter.rule().async(false).msgType(EVENT).event(CLICK).handler(this.menuHandler).end();
+
+        // 点击菜单连接事件
+        newRouter.rule().async(false).msgType(EVENT).event(VIEW).handler(this.nullHandler).end();
+
+        // 关注事件
+        newRouter.rule().async(false).msgType(EVENT).event(SUBSCRIBE).handler(this.subscribeHandler).end();
+
+        // 取消关注事件
+        newRouter.rule().async(false).msgType(EVENT).event(UNSUBSCRIBE).handler(this.unsubscribeHandler).end();
+
+        // 上报地理位置事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.LOCATION).handler(this.locationHandler).end();
+
+        // 接收地理位置消息
+        newRouter.rule().async(false).msgType(XmlMsgType.LOCATION).handler(this.locationHandler).end();
+
+        // 扫码事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.SCAN).handler(this.scanHandler).end();
+
+        // 默认
+        newRouter.rule().async(false).handler(this.msgHandler).end();
+
+        return newRouter;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/config/WxMpProperties.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/config/WxMpProperties.java
@ -0,0 +1,46 @@
+package com.epmet.wx.mp.config;
+
+import com.epmet.wx.mp.utils.JsonUtils;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * wechat mp properties
+ *
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Data
+@ConfigurationProperties(prefix = "wx.mp")
+public class WxMpProperties {
+    private List<MpConfig> configs;
+
+    @Data
+    public static class MpConfig {
+        /**
+         * 设置微信公众号的appid
+         */
+        private String appId;
+
+        /**
+         * 设置微信公众号的app secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信公众号的token
+         */
+        private String token;
+
+        /**
+         * 设置微信公众号的EncodingAESKey
+         */
+        private String aesKey;
+    }
+
+    @Override
+    public String toString() {
+        return JsonUtils.toJson(this);
+    }
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/AbstractHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/AbstractHandler.java
@ -0,0 +1,12 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.mp.api.WxMpMessageHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public abstract class AbstractHandler implements WxMpMessageHandler {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/KfSessionHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/KfSessionHandler.java
@ -0,0 +1,25 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class KfSessionHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        //TODO 对会话做处理
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/LocationHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/LocationHandler.java
@ -0,0 +1,44 @@
+package com.epmet.wx.mp.handler;
+
+import com.epmet.wx.mp.builder.TextBuilder;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class LocationHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        if (wxMessage.getMsgType().equals(XmlMsgType.LOCATION)) {
+            //TODO 接收处理用户发送的地理位置消息
+            try {
+                String content = "感谢反馈，您的的地理位置已收到！";
+                return new TextBuilder().build(content, wxMessage, null);
+            } catch (Exception e) {
+                this.logger.error("位置消息接收处理失败", e);
+                return null;
+            }
+        }
+
+        //上报地理位置事件
+        this.logger.info("上报地理位置，纬度 : {}，经度 : {}，精度 : {}",
+            wxMessage.getLatitude(), wxMessage.getLongitude(), String.valueOf(wxMessage.getPrecision()));
+
+        //TODO  可以将用户地理位置信息保存到本地数据库，以便以后使用
+
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/LogHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/LogHandler.java
@ -0,0 +1,25 @@
+package com.epmet.wx.mp.handler;
+
+import com.epmet.wx.mp.utils.JsonUtils;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class LogHandler extends AbstractHandler {
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        this.logger.info("\n接收到请求消息，内容：{}", JsonUtils.toJson(wxMessage));
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/MenuHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/MenuHandler.java
@ -0,0 +1,36 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class MenuHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService weixinService,
+                                    WxSessionManager sessionManager) {
+
+        String msg = String.format("type:%s, event:%s, key:%s",
+            wxMessage.getMsgType(), wxMessage.getEvent(),
+            wxMessage.getEventKey());
+        if (MenuButtonType.VIEW.equals(wxMessage.getEvent())) {
+            return null;
+        }
+
+        return WxMpXmlOutMessage.TEXT().content(msg)
+            .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+            .build();
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/MsgHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/MsgHandler.java
@ -0,0 +1,52 @@
+package com.epmet.wx.mp.handler;
+
+import com.epmet.wx.mp.builder.TextBuilder;
+import com.epmet.wx.mp.utils.JsonUtils;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class MsgHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService weixinService,
+                                    WxSessionManager sessionManager) {
+
+        if (!wxMessage.getMsgType().equals(XmlMsgType.EVENT)) {
+            //TODO 可以选择将消息保存到本地
+        }
+
+        //当用户输入关键词如“你好”，“客服”等，并且有客服在线时，把消息转发给在线客服
+        try {
+            if (StringUtils.startsWithAny(wxMessage.getContent(), "你好", "客服")
+                && weixinService.getKefuService().kfOnlineList()
+                .getKfOnlineList().size() > 0) {
+                return WxMpXmlOutMessage.TRANSFER_CUSTOMER_SERVICE()
+                    .fromUser(wxMessage.getToUser())
+                    .toUser(wxMessage.getFromUser()).build();
+            }
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+
+        //TODO 组装回复消息
+        String content = "收到信息内容：" + JsonUtils.toJson(wxMessage);
+
+        return new TextBuilder().build(content, wxMessage, weixinService);
+
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/NullHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/NullHandler.java
@ -0,0 +1,24 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class NullHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java
@ -0,0 +1,25 @@
+package com.epmet.wx.mp.handler;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class ScanHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMpXmlMessage, Map<String, Object> map,
+                                    WxMpService wxMpService, WxSessionManager wxSessionManager) throws WxErrorException {
+        // 扫码事件处理
+        return null;
+    }
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/StoreCheckNotifyHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/StoreCheckNotifyHandler.java
@ -0,0 +1,27 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 门店审核事件处理
+ *
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class StoreCheckNotifyHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        // TODO 处理门店审核事件
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java
@ -0,0 +1,71 @@
+package com.epmet.wx.mp.handler;
+
+import java.util.Map;
+
+import com.epmet.wx.mp.builder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class SubscribeHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService weixinService,
+                                    WxSessionManager sessionManager) throws WxErrorException {
+
+        this.logger.info("新关注用户 OPENID: " + wxMessage.getFromUser());
+
+        // 获取微信用户基本信息
+        try {
+            WxMpUser userWxInfo = weixinService.getUserService()
+                .userInfo(wxMessage.getFromUser(), null);
+            if (userWxInfo != null) {
+                // TODO 可以添加关注用户到本地数据库
+            }
+        } catch (WxErrorException e) {
+            if (e.getError().getErrorCode() == 48001) {
+                this.logger.info("该公众号没有获取用户信息权限！");
+            }
+        }
+
+
+        WxMpXmlOutMessage responseResult = null;
+        try {
+            responseResult = this.handleSpecial(wxMessage);
+        } catch (Exception e) {
+            this.logger.error(e.getMessage(), e);
+        }
+
+        if (responseResult != null) {
+            return responseResult;
+        }
+
+        try {
+            return new TextBuilder().build("感谢关注", wxMessage, weixinService);
+        } catch (Exception e) {
+            this.logger.error(e.getMessage(), e);
+        }
+
+        return null;
+    }
+
+    /**
+     * 处理特殊请求，比如如果是扫码进来的，可以做相应处理
+     */
+    private WxMpXmlOutMessage handleSpecial(WxMpXmlMessage wxMessage)
+        throws Exception {
+        //TODO
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/UnsubscribeHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/UnsubscribeHandler.java
@ -0,0 +1,27 @@
+package com.epmet.wx.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class UnsubscribeHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        String openId = wxMessage.getFromUser();
+        this.logger.info("取消关注用户 OPENID: " + openId);
+        // TODO 可以更新本地数据库为取消关注状态
+        return null;
+    }
+
+}
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/utils/JsonUtils.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/utils/JsonUtils.java
@ -0,0 +1,16 @@
+package com.epmet.wx.mp.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public class JsonUtils {
+    public static String toJson(Object obj) {
+        Gson gson = new GsonBuilder()
+            .setPrettyPrinting()
+            .create();
+        return gson.toJson(obj);
+    }
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java
@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 http://www.renren.io
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.epmet.commons.tools.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 登录用户信息
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2017-03-23 20:39
+ */
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface LoginUser {
+
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
@ -104,8 +104,4 @@ public interface Constant {
     * 版本控制用
     */
    String VERSION_CONTROL = "/{version}";
-    /**
-     * 移动端接口标识
-     */
-    String EPDC_APP = "epdc-app/";
 }
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
@ -49,6 +49,11 @@ public interface ServiceConstant {
     */
    String RESI_GUIDE_SERVER = "resi-guide-server";

+    /**
+     * 政府机构组织管理
+     */
+    String GOV_ORG_SERVER = "gov-org-server";
+
    /**
     * 政府端组织架构
     */
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ModuleErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ModuleErrorCode.java
@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.exception;
+
+
+/**
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ * <p>
+ * 如：100001001（100001代表模块，001代表业务代码）
+ * </p>
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ModuleErrorCode extends ErrorCode {
+    int TOKEN_NOT_EMPTY = 100005001;
+    int TOKEN_INVALID = 100005002;
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@ -1,8 +1,8 @@
 /**
 * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
 * https://www.renren.io
- *
+ * <p>
 * 版权所有，侵权必究！
 */

@ -13,59 +13,114 @@ package com.epmet.commons.tools.redis;
 * @since 1.0.0
 */
 public class RedisKeys {
-    /**
-     * 系统参数Key
-     */
-    public static String getSysParamsKey(){
-        return "sys:params";
-    }
-
-    /**
-     * 登录验证码Key
-     */
-    public static String getLoginCaptchaKey(String uuid){
-        return "sys:captcha:" + uuid;
-    }
-
-    /**
-     * 登录用户Key
-     */
-    public static String getSecurityUserKey(Long id){
-        return "sys:security:user:" + id;
-    }
-
-    /**
-     * 系统日志Key
-     */
-    public static String getSysLogKey(){
-        return "sys:log";
-    }
-
-    /**
-     * 系统资源Key
-     */
-    public static String getSysResourceKey(){
-        return  "sys:resource";
-    }
-
-    /**
-     * 用户菜单导航Key
-     */
-    public static String getUserMenuNavKey(Long userId, String language){
-        return "sys:user:nav:" + userId + "_" + language;
-    }
-
-    /**
-     * 用户菜单导航Key
-     */
-    public static String getUserMenuNavKey(Long userId){
-        return "sys:user:nav:" + userId + "_*";
-    }
-
-    /**
-     * 用户权限标识Key
-     */
-    public static String getUserPermissionsKey(Long userId){
-        return "sys:user:permissions:" + userId;
-    }
+
+	/**
+	 * 党群e事通redis前缀
+	 */
+	private static String rootPrefix = "epmet:";
+
+	/**
+	 * 系统参数Key
+	 */
+	public static String getSysParamsKey() {
+		return rootPrefix.concat("sys:params");
+	}
+
+	/**
+	 * 登录验证码Key
+	 */
+	public static String getLoginCaptchaKey(String uuid) {
+		return rootPrefix.concat("sys:captcha:").concat(uuid);
+	}
+
+	/**
+	 * 登录用户Key
+	 */
+	public static String getSecurityUserKey(Long id) {
+		return rootPrefix.concat("sys:security:user:").concat(String.valueOf(id));
+	}
+
+	/**
+	 * 系统日志Key
+	 */
+	public static String getSysLogKey() {
+		return rootPrefix.concat("sys:log");
+	}
+
+	/**
+	 * 系统资源Key
+	 */
+	public static String getSysResourceKey() {
+		return rootPrefix.concat("sys:resource");
+	}
+
+	/**
+	 * 用户菜单导航Key
+	 */
+	public static String getUserMenuNavKey(Long userId, String language) {
+		return rootPrefix.concat("sys:user:nav:").concat(String.valueOf(userId)).concat("_").concat(language);
+	}
+
+	/**
+	 * 用户菜单导航Key
+	 */
+	public static String getUserMenuNavKey(String userId, String app, String client, String language) {
+		return rootPrefix.concat("oper:access:nav:").concat(userId).concat("_").concat(app).concat("_").concat(client).concat("_").concat(language);
+	}
+
+	/**
+	 * 用户菜单导航Key
+	 */
+	public static String getUserMenuNavKey(Long userId) {
+		return rootPrefix.concat("sys:user:nav:").concat(String.valueOf(userId)).concat("_*");
+	}
+
+	/**
+	 * 用户权限标识Key
+	 */
+	public static String getUserPermissionsKey(Long userId) {
+		return rootPrefix.concat("sys:user:permissions:").concat(String.valueOf(userId));
+	}
+
+	/**
+	 * 用户权限标识Key
+	 */
+	public static String getUserPermissionsKey(String userId, String app, String client) {
+		return rootPrefix.concat("oper:access:permissions:").concat(userId).concat("_").concat(app).concat("_").concat(client);
+	}
+
+	/**
+	 * epmet用户token对应redis中的Key
+	 * epmet:sys:security:user:token字符串
+	 */
+	public static String getCpUserKey(String app, String client, String userId) {
+		return rootPrefix.concat("sys:security:user:").concat(app).concat(":").concat(client).concat(":").concat(userId);
+	}
+
+	/**
+	 * 拼接手机验证码key---后面需要改！！！
+	 *
+	 * @param phone
+	 * @return java.lang.String
+	 * @author yujintao
+	 * @date 2019/9/6 17:03
+	 */
+	public static String getPhoneSmsCodeKey(String phone) {
+		return rootPrefix.concat("phone:sms:code:").concat(phone);
+	}
+
+	/**
+	 * 用户请求发送短信接口，记录本次请求时间，保存一分钟
+	 * ---后面需要改！！！
+	 *
+	 * @param phone
+	 * @return java.lang.String
+	 * @author work@yujt.net.cn
+	 * @date 2019/12/6 19:05
+	 */
+	public static String getPhoneSmsHistoryKey(String phone) {
+		return rootPrefix.concat("phone:sms:history:").concat(phone);
+	}
+
+
 }
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@ -29,29 +29,53 @@ public class RedisUtils {
    @Autowired
    private RedisTemplate<String, Object> redisTemplate;

-    /**  默认过期时长为24小时，单位：秒 */
+    /**
+     * 默认过期时长为24小时，单位：秒
+     */
    public final static long DEFAULT_EXPIRE = 60 * 60 * 24L;
-    /**  过期时长为1小时，单位：秒 */
+    /**
+     * 过期时长为1小时，单位：秒
+     */
    public final static long HOUR_ONE_EXPIRE = 60 * 60 * 1L;
-    /**  过期时长为6小时，单位：秒 */
+    /**
+     * 过期时长为6小时，单位：秒
+     */
    public final static long HOUR_SIX_EXPIRE = 60 * 60 * 6L;
-    /**  不设置过期时长 */
+    /**
+     * 过期时长为5分钟，单位：秒
+     */
+    public final static long MINUTE_FIVE_EXPIRE = 60 * 5 * 1L;
+    /**
+     * 过期时长为1分钟，单位：秒
+     */
+    public final static long MINUTE_ONE_EXPIRE = 60 * 1 * 1L;
+    /**
+     * 过期时长为10分钟，单位：秒
+     */
+    public final static long MINUTE_TEN_EXPIRE = 60 * 10 * 1L;
+    /**
+     * 过期时长为30分钟，单位：秒
+     */
+    public final static long MINUTE_THIRTY_EXPIRE = 60 * 30 * 1L;
+    /**
+     * 不设置过期时长
+     */
    public final static long NOT_EXPIRE = -1L;

-    public void set(String key, Object value, long expire){
+    public void set(String key, Object value, long expire) {
        redisTemplate.opsForValue().set(key, value);
-        if(expire != NOT_EXPIRE){
+        if (expire != NOT_EXPIRE) {
            expire(key, expire);
        }
    }

-    public void set(String key, Object value){
+    public void set(String key, Object value) {
        set(key, value, DEFAULT_EXPIRE);
    }

    public Object get(String key, long expire) {
        Object value = redisTemplate.opsForValue().get(key);
-        if(expire != NOT_EXPIRE){
+        if (expire != NOT_EXPIRE) {
            expire(key, expire);
        }
        return value;
@ -61,7 +85,7 @@ public class RedisUtils {
        return get(key, NOT_EXPIRE);
    }

-    public Set<String> keys(String pattern){
+    public Set<String> keys(String pattern) {
        return redisTemplate.keys(pattern);
    }

@ -81,19 +105,19 @@ public class RedisUtils {
        return redisTemplate.opsForHash().get(key, field);
    }

-    public Map<String, Object> hGetAll(String key){
+    public Map<String, Object> hGetAll(String key) {
        HashOperations<String, String, Object> hashOperations = redisTemplate.opsForHash();
        return hashOperations.entries(key);
    }

-    public void hMSet(String key, Map<String, Object> map){
+    public void hMSet(String key, Map<String, Object> map) {
        hMSet(key, map, DEFAULT_EXPIRE);
    }

-    public void hMSet(String key, Map<String, Object> map, long expire){
+    public void hMSet(String key, Map<String, Object> map, long expire) {
        redisTemplate.opsForHash().putAll(key, map);

-        if(expire != NOT_EXPIRE){
+        if (expire != NOT_EXPIRE) {
            expire(key, expire);
        }
    }
@ -105,32 +129,37 @@ public class RedisUtils {
    public void hSet(String key, String field, Object value, long expire) {
        redisTemplate.opsForHash().put(key, field, value);

-        if(expire != NOT_EXPIRE){
+        if (expire != NOT_EXPIRE) {
            expire(key, expire);
        }
    }

-    public void expire(String key, long expire){
-        redisTemplate.expire(key, expire, TimeUnit.SECONDS);
+    public boolean expire(String key, long expire) {
+        return redisTemplate.expire(key, expire, TimeUnit.SECONDS);
    }

-    public void hDel(String key, Object... fields){
+    public long getExpire(String key) {
+        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
+    }
+
+    public void hDel(String key, Object... fields) {
        redisTemplate.opsForHash().delete(key, fields);
    }

-    public void leftPush(String key, Object value){
+    public void leftPush(String key, Object value) {
        leftPush(key, value, DEFAULT_EXPIRE);
    }

-    public void leftPush(String key, Object value, long expire){
+    public void leftPush(String key, Object value, long expire) {
        redisTemplate.opsForList().leftPush(key, value);

-        if(expire != NOT_EXPIRE){
+        if (expire != NOT_EXPIRE) {
            expire(key, expire);
        }
    }

-    public Object rightPop(String key){
+    public Object rightPop(String key) {
        return redisTemplate.opsForList().rightPop(key);
    }
+
 }
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
@ -8,6 +8,7 @@

 package com.epmet.commons.tools.security.config;

+import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@ -40,9 +41,11 @@ import java.util.TimeZone;
 public class WebMvcConfig implements WebMvcConfigurer {
    @Autowired
    private UserDetailHandlerMethodArgumentResolver userDetailHandlerMethodArgumentResolver;
-
+    @Autowired
+    private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
    @Override
    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
        argumentResolvers.add(userDetailHandlerMethodArgumentResolver);
    }

@ -75,4 +78,5 @@ public class WebMvcConfig implements WebMvcConfigurer {
        converter.setObjectMapper(mapper);
        return converter;
    }
+
 }
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java
@ -0,0 +1,60 @@
+package com.epmet.commons.tools.security.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户token
+ *
+ * @author yinzuomei
+ * @Date 2020-03-14
+ */
+@Data
+public class TokenDto implements Serializable {
+	private static final long serialVersionUID = 8883581762088390769L;
+	/**
+	 * 政府端:gov、居民端:resi、运营端:oper
+	 */
+	private String app;
+
+	/**
+	 * PC端:web、微信小程序:wxmp
+	 */
+	private String client;
+
+	/**
+	 * 用户ID
+	 */
+	private String userId;
+
+	/**
+	 * sessionKey
+	 */
+	private String sessionKey;
+
+	/**
+	 * openId
+	 */
+	private String openId;
+
+	/**
+	 * unionId
+	 */
+	private String unionId;
+
+	/**
+	 * token字符串
+	 */
+	private String token;
+
+	/**
+	 * 过期时间戳
+	 */
+	private Long expireTime;
+
+	/**
+	 * 最后一次更新时间
+	 */
+	private long updateTime;
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.security.resolver;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+/**
+ * 有@LoginUser注解的方法参数，注入当前登录用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Service
+public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
+
+    public LoginUserHandlerMethodArgumentResolver(){
+
+    }
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        if(parameter.getParameterType().isAssignableFrom(TokenDto.class)){
+            logger.info("入参是TokenDto.class");
+        }else{
+            logger.info("parameter.getParameterType().isAssignableFrom(TokenDto.class)");
+        }
+        if(parameter.hasParameterAnnotation(LoginUser.class)){
+            logger.info("入参@LoginUser");
+        }else {
+            logger.info("parameter.hasParameterAnnotation(LoginUser.class) is false");
+        }
+        return parameter.getParameterType().isAssignableFrom(TokenDto.class) && parameter.hasParameterAnnotation(LoginUser.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container,
+                                  NativeWebRequest request, WebDataBinderFactory factory) throws Exception {
+        //app-client-userId
+        String redisKey = request.getHeader(Constant.APP_USER_KEY);
+        if (StringUtils.isEmpty(redisKey)) {
+            throw new RenException(ErrorCode.UNAUTHORIZED);
+        }
+        String[] keyArray=redisKey.split("-");
+        String app=keyArray[0];
+        String client=keyArray[1];
+        String userId=keyArray[2];
+        TokenDto tokenDto = cpUserDetailRedis.get(app,client,userId);
+        logger.info("resolveArgument TokenDto:"+ JSON.toJSONString(tokenDto));
+        return tokenDto;
+    }
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.utils;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * CP用户Redis
+ *
+ * @author rongchao
+ * @since 1.0.0
+ */
+@Component
+public class CpUserDetailRedis {
+
+	@Autowired
+	private RedisUtils redisUtils;
+
+	public void set(TokenDto user, long expire) {
+		if (user == null) {
+			return;
+		}
+		String key = RedisKeys.getCpUserKey(user.getApp(), user.getClient(), user.getUserId());
+		//bean to map
+		Map<String, Object> map = BeanUtil.beanToMap(user, false, true);
+		redisUtils.hMSet(key, map, expire);
+	}
+
+	/**
+	 * 获取token信息
+	 *
+	 * @param app 居民端resi;政府端gov;运营端oper
+	 * @param client PC端：web;微信小程序端：wxmp
+	 * @param userId oper_user、customer_user、customer_staff表主键
+	 * @return
+	 */
+	public TokenDto get(String app, String client, String userId) {
+		String key = RedisKeys.getCpUserKey(app,client,userId);
+
+		Map<String, Object> map = redisUtils.hGetAll(key);
+		if (MapUtil.isEmpty(map)) {
+			return null;
+		}
+
+		//map to bean
+		TokenDto user = BeanUtil.mapToBean(map, TokenDto.class, true);
+
+		return user;
+	}
+
+	/**
+	 * 删除用户信息
+	 *
+	 * @param app 居民端resi;政府端gov;运营端oper
+	 * @param client PC端：web;微信小程序端：wxmp
+	 * @param userId oper_user、customer_user、customer_staff表主键
+	 */
+	public void logout(String app, String client, String userId) {
+		redisUtils.delete(RedisKeys.getCpUserKey(app,client,userId));
+	}
+
+	/**
+	 * 设置redis时间
+	 *
+	 * @param app 居民端resi;政府端gov;运营端oper
+	 * @param client PC端：web;微信小程序端：wxmp
+	 * @param userId oper_user、customer_user、customer_staff表主键
+	 * @param expire 有效时间
+	 * @author rongchao
+	 */
+	public boolean expire(String app, String client, String userId, long expire) {
+		return redisUtils.expire(RedisKeys.getCpUserKey(app,client,userId), expire);
+	}
+
+	/**
+	 * 查询token剩余时间
+	 *
+	 * @param app 居民端resi;政府端gov;运营端oper
+	 * @param client PC端：web;微信小程序端：wxmp
+	 * @param userId oper_user、customer_user、customer_staff表主键
+	 * @return 获取有效期
+	 * @author yujintao
+	 * @date 2019/9/9 14:18
+	 */
+	public long getExpire(String app, String client, String userId) {
+		return redisUtils.getExpire(RedisKeys.getCpUserKey(app, client, userId));
+	}
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@ -29,6 +29,8 @@ public class DateUtils {
 	public final static String DATE_PATTERN = "yyyy-MM-dd";
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
 	public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    /** 时间格式(yyyyMMddHHmmss) */
+    public final static String DATE_TIME_NO_SPLIT  = "yyyyMMddHHmmss";

    /**
     * 日期格式化 日期格式为：yyyy-MM-dd
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java
@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.utils;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 树节点，所有需要实现树节点的，都需要继承该类
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class TreeStringNode<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 上级ID
+     */
+    private String pid;
+    /**
+     * 子节点列表
+     */
+    private List<T> children = new ArrayList<>();
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java
@ -77,4 +77,29 @@ public class TreeUtils {
        return result;
    }

+    /**
+     * 构建树节点
+     */
+    public static <T extends TreeStringNode> List<T> buildTree(List<T> treeNodes) {
+        List<T> result = new ArrayList<>();
+
+        //list转map
+        Map<String, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
+        for(T treeNode : treeNodes){
+            nodeMap.put(treeNode.getId(), treeNode);
+        }
+
+        for(T node : nodeMap.values()) {
+            T parent = nodeMap.get(node.getPid());
+            if(parent != null && !(node.getId().equals(parent.getId()))){
+                parent.getChildren().add(node);
+                continue;
+            }
+
+            result.add(node);
+        }
+
+        return result;
+    }
+
 }
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java
@ -0,0 +1,66 @@
+package com.epmet.commons.tools.utils;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Web工具类
+ *
+ * @author rongchao
+ * @Date 18-11-20
+ */
+public class WebUtil {
+
+    public static HttpServletRequest getHttpServletRequest() {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        return request;
+    }
+
+    public static Object getAttributesFromRequest(String paramName) {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        return requestAttributes.getAttribute(paramName, RequestAttributes.SCOPE_REQUEST);
+    }
+
+    public static void setAttributesFromRequest(String paramName, Object obj) {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        requestAttributes.setAttribute(paramName, obj, RequestAttributes.SCOPE_REQUEST);
+    }
+
+    /**
+     * 获取用户真实IP地址，不使用request.getRemoteAddr();的原因是有可能用户使用了代理软件方式避免真实IP地址,
+     * <p>
+     * 可是，如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值，究竟哪个才是真正的用户端的真实IP呢？
+     * 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。
+     * <p>
+     * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130,
+     * 192.168.1.100
+     * <p>
+     * 用户真实IP为： 192.168.1.110
+     *
+     * @return
+     */
+    public static String getIpAddress() {
+        HttpServletRequest request = getHttpServletRequest();
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+}
--- a/epmet-commons/pom.xml
+++ b/epmet-commons/pom.xml
@ -17,6 +17,10 @@
 		<module>epmet-commons-tools</module>
 		<module>epmet-commons-mybatis</module>
 		<module>epmet-commons-dynamic-datasource</module>
+		<module>epmet-commons-tools-phone</module>
+		<module>epmet-common-clienttoken</module>
+		<module>epmet-commons-tools-wx-ma</module>
+		<module>epmet-commons-tools-wx-mp</module>
 	</modules>

 </project>
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@ -47,6 +47,17 @@
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-common-clienttoken</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
    </dependencies>

    <build>
@ -97,44 +108,49 @@
                <nacos.ip></nacos.ip>
                <!-- gateway routes -->
                <!--  1、认证服务  -->
-                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
-<!--                <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>-->
+<!--                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
+                <gateway.routes.epmet-auth-server.uri>http://127.0.0.1:8081</gateway.routes.epmet-auth-server.uri>
                <!--  2、Admin服务  -->
                <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
-<!--                <gateway.routes.epmet-admin-server.uri>http://localhost:8082</gateway.routes.epmet-admin-server.uri>-->
+<!--                <gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri>-->
                <!--  3、监控服务  -->
                <gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
-<!--                <gateway.routes.epmet-monitor-server.uri>http://localhost:8100</gateway.routes.epmet-monitor-server.uri>-->
+<!--                <gateway.routes.epmet-monitor-server.uri>http://127.0.0.1:8100</gateway.routes.epmet-monitor-server.uri>-->
                <!--  4、OSS服务 -->
                <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
-<!--                <gateway.routes.epmet-oss-server.uri>http://localhost:8083</gateway.routes.epmet-oss-server.uri>-->
+<!--                <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>-->
                <!--  5、消息服务  -->
 <!--                <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>-->
-                <gateway.routes.epmet-message-server.uri>http://localhost:8085</gateway.routes.epmet-message-server.uri>
+                <gateway.routes.epmet-message-server.uri>http://127.0.0.1:8085</gateway.routes.epmet-message-server.uri>
                <!--   6、工作流服务 -->
 <!--                <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>-->
-                <gateway.routes.epmet-activiti-server.uri>http://localhost:8086</gateway.routes.epmet-activiti-server.uri>
+                <gateway.routes.epmet-activiti-server.uri>http://127.0.0.1:8086</gateway.routes.epmet-activiti-server.uri>
                <!--  7、定时任务服务  -->
 <!--                <gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>-->
-                <gateway.routes.epmet-job-server.uri>http://localhost:8084</gateway.routes.epmet-job-server.uri>
+                <gateway.routes.epmet-job-server.uri>http://127.0.0.1:8084</gateway.routes.epmet-job-server.uri>
                <!--  8、用户模块              -->
                <!--                <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>-->
-                <gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>
+                <gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>
                <!--  9、新模块结构demo  -->
                <gateway.routes.epmet-demo-server.uri>lb://epmet-demo-server</gateway.routes.epmet-demo-server.uri>
-<!--                <gateway.routes.epmet-demo-server.uri>http://localhost:8088</gateway.routes.epmet-demo-server.uri>-->
+<!--                <gateway.routes.epmet-demo-server.uri>http://127.0.0.1:8088</gateway.routes.epmet-demo-server.uri>-->
                <!--   10、运营端客户定制化服务             -->
 <!--                <gateway.routes.epmet-oper-customize-server.uri>lb://oper-customize-server</gateway.routes.epmet-oper-customize-server.uri>-->
-                <gateway.routes.oper-customize-server.uri>http://localhost:8089</gateway.routes.oper-customize-server.uri>
+                <gateway.routes.oper-customize-server.uri>http://127.0.0.1:8089</gateway.routes.oper-customize-server.uri>
                <!--   11、运营端客户定制化服务             -->
 <!--                <gateway.routes.oper-crm-server.uri>lb://oper-crm-server</gateway.routes.oper-crm-server.uri>-->
-                <gateway.routes.oper-crm-server.uri>http://localhost:8090</gateway.routes.oper-crm-server.uri>
+                <gateway.routes.oper-crm-server.uri>http://127.0.0.1:8090</gateway.routes.oper-crm-server.uri>
                <!--   12、居民端陌生人导览             -->
+<!--                <gateway.routes.resi-guide-server.uri>lb://oper-crm-server</gateway.routes.resi-guide-server.uri>-->
+                <gateway.routes.resi-guide-server.uri>http://127.0.0.1:8091</gateway.routes.resi-guide-server.uri>
+                <!--   13、gov-org 数据网格库 原epmet-business   -->
 <!--                <gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>-->
                <gateway.routes.resi-guide-server.uri>http://localhost:8091</gateway.routes.resi-guide-server.uri>
                <!--   13、政府组织管理   -->
 <!--                <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>-->
-                <gateway.routes.gov-org-server.uri>http://localhost:8092</gateway.routes.gov-org-server.uri>
+                <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>
+                <!--   14、#运营端访问权限控制   -->
+                <gateway.routes.oper-access-server.uri>http://127.0.0.1:8093</gateway.routes.oper-access-server.uri>
            </properties>
        </profile>

@ -186,6 +202,8 @@
                <gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>
                <!--   13、政府组织管理            -->
                <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
+                <!--   14、#运营端访问权限控制   -->
+                <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
            </properties>
        </profile>
    </profiles>
--- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
+++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
@ -1,8 +1,8 @@
 /**
 * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
 * https://www.renren.io
- *
+ * <p>
 * 版权所有，侵权必究！
 */

@ -12,6 +12,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;

 /**
 * 网关服务
@ -24,8 +25,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableFeignClients
 public class GatewayApplication {

-    public static void main(String[] args) {
-        SpringApplication.run(GatewayApplication.class, args);
-    }
-
+	public static void main(String[] args) {
+		SpringApplication.run(GatewayApplication.class, args);
+	}
 }
--- a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java
@ -14,6 +14,8 @@ import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@ -41,9 +43,10 @@ import java.util.List;
@Configuration
@ConfigurationProperties(prefix = "renren")
 public class AuthFilter implements GlobalFilter {
+    private Logger logger = LoggerFactory.getLogger(getClass());
    private final AntPathMatcher antPathMatcher = new AntPathMatcher();
    @Autowired
-    private ResourceFeignClient resourceFeignClient;
+    public ResourceFeignClient resourceFeignClient;
    /**
     * 不拦截的urls
     */
@ -56,6 +59,7 @@ public class AuthFilter implements GlobalFilter {

        //请求放行，无需验证权限
        if(pathMatcher(requestUri)){
+            logger.info("AuthFilter当前requestUri=["+requestUri+"]AuthFilter已放行");
            return chain.filter(exchange);
        }

--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@ -0,0 +1,158 @@
+
+package com.epmet.filter;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * app接口权限过滤器
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component("CpAuth")
+public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpAuthGatewayFilterFactory.CpAuthConfig> {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+	@Autowired
+	private CpProperty cpProperty;
+	private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+	@Autowired
+	private JwtTokenUtils jwtTokenUtils;
+	@Autowired
+	private CpUserDetailRedis cpUserDetailRedis;
+
+
+	@Override
+	public List<String> shortcutFieldOrder() {
+		return Arrays.asList("enabled");
+	}
+
+	public CpAuthGatewayFilterFactory() {
+		super(CpAuthConfig.class);
+	}
+
+	@Override
+	public GatewayFilter apply(CpAuthConfig config) {
+		return (exchange, chain) -> {
+			if (!config.isEnabled()) {
+				logger.info("===========");
+				return chain.filter(exchange);
+			}
+
+			ServerHttpRequest request = exchange.getRequest();
+			String requestUri = request.getPath().pathWithinApplication().value();
+
+			//请求放行，无需验证权限
+			if (!pathMatcher(requestUri)) {
+				return chain.filter(exchange);
+			}
+			HttpHeaders headers = request.getHeaders();
+			String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
+			logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri + "]CpAuthGatewayFilterFactory拦截成功token:"+token);
+			if (StringUtils.isBlank(token)) {
+				token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
+				logger.info("params token："+token);
+				if (StringUtils.isBlank(token)) {
+					return chain.filter(exchange);
+				}
+			}
+			TokenDto user = this.getLoginUserInfo(token);
+			//当前登录用户userId，添加到header中
+			if (user != null) {
+				String redisKey = user.getApp() + "-" + user.getClient() + "-" + user.getUserId();
+				logger.info("redisKey=" + redisKey);
+				ServerHttpRequest build = exchange.getRequest().mutate().header(Constant.APP_USER_KEY, redisKey).build();
+				return chain.filter(exchange.mutate().request(build).build());
+			}
+			return chain.filter(exchange);
+		};
+	}
+
+	public TokenDto getLoginUserInfo(String token) {
+		//是否过期
+		Claims claims = jwtTokenUtils.getClaimByToken(token);
+		if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
+			throw new RenException(ErrorCode.UNAUTHORIZED);
+		}
+		//获取用户ID
+		String app = (String) claims.get("app");
+		String client = (String) claims.get("client");
+		String userId = (String) claims.get("userId");
+		//查询Redis，如果没数据，则保持用户信息到Redis
+		TokenDto tokenDto = cpUserDetailRedis.get(app, client, userId);
+		if (null == tokenDto) {
+			throw new RenException(ErrorCode.REGION_SUB_DELETE_ERROR, Constant.TOKEN_HEADER);
+		}
+		//过期时间
+		long expire = (claims.getExpiration().getTime() - System.currentTimeMillis()) / 1000;
+		cpUserDetailRedis.set(tokenDto, expire);
+		return tokenDto;
+	}
+
+	private Mono<Void> response(ServerWebExchange exchange, Object object) {
+		String json = JSON.toJSONString(object);
+		DataBuffer buffer = exchange.getResponse().bufferFactory().wrap(json.getBytes(StandardCharsets.UTF_8));
+		exchange.getResponse().getHeaders().setContentType(MediaType.APPLICATION_JSON_UTF8);
+		exchange.getResponse().setStatusCode(HttpStatus.OK);
+		return exchange.getResponse().writeWith(Flux.just(buffer));
+	}
+
+	private boolean pathMatcher(String requestUri) {
+		for (String url : cpProperty.getSwaggerUrls()) {
+			if (antPathMatcher.match(url, requestUri)) {
+				return false;
+			}
+		}
+		for (String url : cpProperty.getUrls()) {
+			if (antPathMatcher.match(url, requestUri)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static class CpAuthConfig {
+
+		/**
+		 * 控制是否开启认证
+		 */
+		private boolean enabled;
+
+		public CpAuthConfig() {
+		}
+
+		public boolean isEnabled() {
+			return enabled;
+		}
+
+		public void setEnabled(boolean enabled) {
+			this.enabled = enabled;
+		}
+	}
+}
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
@ -0,0 +1,27 @@
+package com.epmet.filter;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author rongchao
+ * @Date 19-5-17
+ */
+@Data
+@Component
+@EnableConfigurationProperties
+@ConfigurationProperties(prefix = "epmet")
+public class CpProperty {
+
+    private List<String> urls;
+
+    /**
+     * 不处理token，直接通过
+     */
+    private List<String> swaggerUrls;
+
+}
--- a/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenProperties.java
+++ b/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenProperties.java
@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.jwt;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Jwt
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "jwt.token")
+public class JwtTokenProperties {
+    private String secret;
+    private int expire;
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public int getExpire() {
+        return expire;
+    }
+
+    public void setExpire(int expire) {
+        this.expire = expire;
+    }
+}
--- a/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java
+++ b/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java
@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.jwt;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.apache.commons.codec.binary.Base64;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Jwt工具类
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class JwtTokenUtils {
+    private static final Logger logger = LoggerFactory.getLogger(JwtTokenUtils.class);
+
+    @Autowired
+    private JwtTokenProperties jwtProperties;
+
+    /**
+     * 生成jwt token 弃用
+     */
+    @Deprecated
+    public String generateToken(String userId) {
+        return Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setSubject(userId)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(jwtProperties.getExpire()).toDate())
+                .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
+                .compact();
+    }
+
+    public Claims getClaimByToken(String token) {
+        try {
+            return Jwts.parser()
+                    .setSigningKey(jwtProperties.getSecret())
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            logger.debug("validate is token error, token = " + token, e);
+            return null;
+        }
+    }
+
+    /**
+     * @return java.util.Date
+     * @param token
+     * @Author yinzuomei
+     * @Description 获取token的有效期截止时间
+     * @Date 2020/3/18 22:17
+     **/
+    public Date getExpiration(String token){
+        try {
+            return Jwts.parser()
+                    .setSigningKey(jwtProperties.getSecret())
+                    .parseClaimsJws(token)
+                    .getBody().getExpiration();
+        } catch (Exception e) {
+            logger.debug("validate is token error, token = " + token, e);
+            return null;
+        }
+    }
+
+    /**
+     * @param map
+     * @return java.lang.String
+     * @Author yinzuomei
+     * @Description 根据app+client+userId生成token
+     * @Date 2020/3/18 22:29
+     **/
+    public String createToken(Map<String, Object> map) {
+        return Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setClaims(map)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(jwtProperties.getExpire()).toDate())
+                .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
+                .compact();
+    }
+
+    /**
+     * token是否过期
+     *
+     * @return true：过期
+     */
+    public boolean isTokenExpired(Date expiration) {
+        return expiration.before(new Date());
+    }
+
+    public static void main(String[] args) {
+        Map<String, Object> map=new HashMap<>();
+        map.put("app","gov");
+        map.put("client","wxmp");
+        map.put("userId","100526ABC");
+        String tokenStr=Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setClaims(map)
+                .setIssuedAt(new Date())
+                .setExpiration(DateTime.now().plusSeconds(604800).toDate())
+                .signWith(SignatureAlgorithm.HS512, "7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]")
+                .compact();
+        System.out.println(tokenStr);
+        Claims claims= Jwts.parser()
+                .setSigningKey("7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]")
+                .parseClaimsJws(tokenStr)
+                .getBody();
+        System.out.println("app="+ claims.get("app"));
+        System.out.println("client="+ claims.get("client"));
+        System.out.println("userId="+ claims.get("userId"));
+    }
+
+}
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@ -42,6 +42,7 @@ spring:
            - Path=${server.servlet.context-path}/sys/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
        #监控服务
        - id: epmet-monitor-server
          uri: @gateway.routes.epmet-monitor-server.uri@
@ -90,6 +91,7 @@ spring:
            - Path=${server.servlet.context-path}/epmetuser/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
        #demo流服务
        - id: epmet-demo-server
          uri: @gateway.routes.epmet-demo-server.uri@
@ -98,6 +100,7 @@ spring:
            - Path=${server.servlet.context-path}/demo/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
        #运营端客户定制化服务
        - id: oper-customize-server
          uri: @gateway.routes.oper-customize-server.uri@
@ -106,6 +109,7 @@ spring:
            - Path=${server.servlet.context-path}/oper/customize/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
        #运营端客户管理
        - id: oper-crm-server
          uri: @gateway.routes.oper-crm-server.uri@
@ -114,6 +118,7 @@ spring:
            - Path=${server.servlet.context-path}/oper/crm/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
        #居民端陌生人导览
        - id: resi-guide-server
          uri: @gateway.routes.resi-guide-server.uri@
@ -130,6 +135,16 @@ spring:
            - Path=${server.servlet.context-path}/gov/org/**
          filters:
            - StripPrefix=1
+            - CpAuth=true
+        #运营端访问权限控制
+        - id: oper-access-server
+          uri: @gateway.routes.oper-access-server.uri@
+          order: 14
+          predicates:
+            - Path=${server.servlet.context-path}/oper/access/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
    nacos:
      discovery:
        server-addr: @nacos.server-addr@
@ -148,6 +163,7 @@ renren:
  urls:
    - /auth/captcha
    - /auth/login
+    - /auth/login/*
    - /*/swagger-resources/**
    - /*/swagger-ui.html
    - /*/webjars/**
@ -160,7 +176,9 @@ renren:
    - /activiti/editor-app/**
    - /oper/customize/**
    - /oper/crm/**
-    - /resi/guide/**
+    - /epmetuser/**
+    - /gov/org/**
+    - /oper/access/**
 management:
  endpoints:
    web:
@ -179,6 +197,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
@ -208,3 +230,20 @@ hystrix:
 ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 300000
+
+epmet:
+  # 党群e事通
+  urls:
+    - /oper/customize/**
+    - /oper/crm/**
+    - /epmetuser/**
+    - /gov/org/**
+    - /oper/access/**
+  swaggerUrls:
+
+jwt:
+  token:
+    #秘钥
+    secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
+    #token有效时长，默认7天，单位秒
+    expire: 604800
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
@ -63,6 +63,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
@ -18,6 +18,7 @@
 package com.epmet.controller;

 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@ -26,6 +27,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.DemoDTO;
 import com.epmet.dto.form.SaveCustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
@ -155,4 +157,28 @@ public class DemoController {
        return demoService.saveCustomerInfo(dto);
    }

+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
+    @GetMapping("/getcustomergrid/{id}")
+    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id) {
+        return demoService.getcustomergrid(id);
+    }
+
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
+    @GetMapping("getSysUserInfoById")
+    public Result<UserDetail> getSysUserInfoById(@RequestParam("id") Long id) {
+        return demoService.getSysUserInfoById(id);
+    }
+
 }
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/AdminFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/AdminFeignClient.java
@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.user.UserDetail;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 用户接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@FeignClient(name = ServiceConstant.EPMET_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+    /**
+     * 根据用户ID，获取用户信息
+     */
+    @GetMapping("sys/user/getById")
+    Result<UserDetail> getById(@RequestParam("id") Long id);
+
+    /**
+     * 根据用户名，获取用户信息
+     * @param username  用户名
+     */
+    @GetMapping("sys/user/getByUsername")
+    Result<UserDetail> getByUsername(@RequestParam("username") String username);
+
+}
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/16 14:48
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
+public interface EpmetUserFeignClient {
+}
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@ -1,5 +1,22 @@
 package com.epmet.feign;

+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/18 11:11
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+	@GetMapping("gov/org/customergrid/getcustomergrid/{id}")
+	Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id);


 import com.epmet.commons.tools.constant.ServiceConstant;
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
@ -4,7 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
-import com.epmet.feign.impl.OperCrmFeignClientFallBack;
+import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/AdminFeignClientFallback.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/AdminFeignClientFallback.java
@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.security.user.UserDetail;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户接口 Fallback
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<UserDetail> getById(Long id) {
+        return new Result<>();
+    }
+
+    @Override
+    public Result<UserDetail> getByUsername(String username) {
+        return new Result<>();
+    }
+}
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
@ -0,0 +1,15 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/16 14:53
+ */
+@Component
+public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
+
+
+}
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/18 11:13
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+	@Override
+	public Result<CustomerGridDTO> getcustomergrid(String id) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getcustomergrid",id);
+	}
+}
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
@ -1,4 +1,4 @@
-package com.epmet.feign.impl;
+package com.epmet.feign.fallback;

 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
@ -19,8 +19,10 @@ package com.epmet.service;

 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.DemoDTO;
 import com.epmet.dto.form.SaveCustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
@ -135,4 +137,22 @@ public interface DemoService extends BaseService<DemoEntity> {
     **/
    Result<String> saveCustomerInfo(SaveCustomerFormDTO dto);

+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
+    Result<CustomerGridDTO> getcustomergrid(String id);
+
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
+    Result<UserDetail> getSysUserInfoById(Long id);
+
 }
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java
@ -22,14 +22,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.DemoDao;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.DemoDTO;
 import com.epmet.dto.form.SaveCustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.DemoEntity;
+import com.epmet.feign.AdminFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.DemoRedis;
 import com.epmet.service.DemoService;
@ -41,7 +45,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;

@ -58,6 +61,10 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
    private DemoRedis demoRedis;
    @Autowired
    private OperCrmFeignClient operCrmFeignClient;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private AdminFeignClient adminFeignClient;
    @Override
    public PageData<DemoDTO> page(Map<String, Object> params) {
        IPage<DemoEntity> page = baseDao.selectPage(
@ -152,4 +159,13 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
        return operCrmFeignClient.queryCustomInfoByCustomerId(customerId);
    }

+    @Override
+    public Result<CustomerGridDTO> getcustomergrid(String id) {
+        return govOrgFeignClient.getcustomergrid(id);
+    }
+
+    @Override
+    public Result<UserDetail> getSysUserInfoById(Long id) {
+        return adminFeignClient.getById(id);
+    }
 }
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
@ -61,6 +61,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@ -69,6 +69,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
@ -69,6 +69,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@ -80,6 +80,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@ -40,7 +40,7 @@ import java.util.Map;


 /**
- * 客户网格表 
+ * 客户网格表
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
@ -48,7 +48,7 @@ import java.util.Map;
@RestController
@RequestMapping("customergrid")
 public class CustomerGridController {
-    
+
    @Autowired
    private CustomerGridService customerGridService;

@ -119,4 +119,9 @@ public class CustomerGridController {
        return customerGridService.listGridForStrangerByOrder(listCustomerGridFormDTO);
    }

-}
+    @GetMapping("getcustomergrid/{id}")
+    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id){
+        CustomerGridDTO data = customerGridService.get(id);
+        return new Result<CustomerGridDTO>().ok(data);
+    }
+}
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@ -84,6 +84,10 @@ mybatis-plus:
    db-config:
      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
    banner: false
  #原生配置
  configuration:
--- a/epmet-module/oper-access/oper-access-client/pom.xml
+++ b/epmet-module/oper-access/oper-access-client/pom.xml
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>oper-access</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>oper-access-client</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java
@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 国际化
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-18
+ */
+@Data
+public class OperLanguageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表名
+     */
+	private String tableName;
+
+    /**
+     * 表主键
+     */
+	private String tableId;
+
+    /**
+     * 字段名
+     */
+	private String fieldName;
+
+    /**
+     * 字段值
+     */
+	private String fieldValue;
+
+    /**
+     * 语言
+     */
+	private String language;
+
+}