Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

 Conflicts:

	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

	epmet-gateway/pom.xml

	epmet-gateway/src/main/resources/bootstrap.yml

	epmet-module/pom.xml

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.43
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.36</version>
+    <version>0.3.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -80,6 +80,12 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools-wx-mp</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-user-client</artifactId>
@@ -104,6 +110,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>3.6.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -154,10 +172,10 @@
                 <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>
+                <wx.mp.configs.appId>wxcb6ce2ed0c5ae54c</wx.mp.configs.appId>
+                <wx.mp.configs.secret>c7f74941ee97fa9b2e1065772d34c397</wx.mp.configs.secret>
+                <wx.mp.configs.token>12345678Yzm</wx.mp.configs.token>
+                <wx.mp.configs.aesKey>jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3</wx.mp.configs.aesKey>
                 <!--居民端小程序配置-->
                 <resi.wx.ma.appId>wx07674c23af51b521</resi.wx.ma.appId>
                 <resi.wx.ma.secret>a2fd0d29b007cbbcf8c8dda8c693d99b</resi.wx.ma.secret>
@@ -191,10 +209,10 @@
                 <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>
+                <wx.mp.configs.appId>wxcb6ce2ed0c5ae54c</wx.mp.configs.appId>
+                <wx.mp.configs.secret>c7f74941ee97fa9b2e1065772d34c397</wx.mp.configs.secret>
+                <wx.mp.configs.token>12345678Yzm</wx.mp.configs.token>
+                <wx.mp.configs.aesKey>jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3</wx.mp.configs.aesKey>
                 <!--居民端小程序配置-->
                 <resi.wx.ma.appId>wx07674c23af51b521</resi.wx.ma.appId>
                 <resi.wx.ma.secret>a2fd0d29b007cbbcf8c8dda8c693d99b</resi.wx.ma.secret>
@@ -228,10 +246,10 @@
                 <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>
+                <wx.mp.configs.appId>wxcb6ce2ed0c5ae54c</wx.mp.configs.appId>
+                <wx.mp.configs.secret>c7f74941ee97fa9b2e1065772d34c397</wx.mp.configs.secret>
+                <wx.mp.configs.token>12345678Yzm</wx.mp.configs.token>
+                <wx.mp.configs.aesKey>jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3</wx.mp.configs.aesKey>
                 <!--居民端小程序配置-->
                 <resi.wx.ma.appId>wx07674c23af51b521</resi.wx.ma.appId>
                 <resi.wx.ma.secret>a2fd0d29b007cbbcf8c8dda8c693d99b</resi.wx.ma.secret>

epmet-auth/src/main/java/com/epmet/constant/PublicUserLoginConstant.java

@@ -0,0 +1,22 @@
+package com.epmet.constant;
+
+/**
+ * @author sun
+ * @dscription
+ */
+public interface PublicUserLoginConstant {
+
+	/**
+	 * 初始化用户信息失败
+	 */
+	String SAVE_USER_EXCEPTION = "初始化用户信息失败";
+	/**
+	 * 是否登陆（true false）
+	 */
+	String PARAMETER_EXCEPTION = "是否登陆值错误";
+	/**
+	 * 用户登陆 新增访问记录
+	 */
+	String SAVE_VISITED_EXCEPTION = "用户登陆，新增访问记录失败";
+
+}

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

@@ -0,0 +1,74 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.PublicUserLoginConstant;
+import com.epmet.dto.form.LoginByPhoneFormDTO;
+import com.epmet.dto.form.PaWxCodeFormDTO;
+import com.epmet.dto.form.PublicSendSmsCodeFormDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
+import com.epmet.service.PublicUserLoginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/8 18:29
+ */
+@RestController
+@RequestMapping("publicuser")
+public class PublicUserLoginController {
+
+    @Autowired
+    private PublicUserLoginService publicUserLoginService;
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author sun
+     * @description 解析wxcode获取用户信息并生成token
+     **/
+    @PostMapping(value = "/wxcodetotoken")
+    public Result<UserTokenResultDTO> wxCodeToToken(@RequestBody PaWxCodeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PaWxCodeFormDTO.AddUserInternalGroup.class);
+        return new Result<UserTokenResultDTO>().ok(publicUserLoginService.wxCodeToToken(formDTO));
+    }
+
+    /**
+     * @param formDTO 手机号
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号登录-发送验证码
+     **/
+    @PostMapping(value = "/sendsmscode")
+    public Result sendSmsCode(@RequestBody PublicSendSmsCodeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,PublicSendSmsCodeFormDTO.AddUserShowGroup.class);
+        if(formDTO.getIsLogon()!=true&&formDTO.getIsLogon()!=false){
+            throw new RenException(PublicUserLoginConstant.PARAMETER_EXCEPTION);
+        }
+        publicUserLoginService.sendSmsCode(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号-手机验证码登陆
+     **/
+    @PostMapping(value = "/loginbyphone")
+    public Result<UserTokenResultDTO> loginByPhone(@LoginUser TokenDto tokenDTO, @RequestBody LoginByPhoneFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, LoginByPhoneFormDTO.AddUserShowGroup.class, LoginByPhoneFormDTO.LoginByPhone.class);
+        return new Result<UserTokenResultDTO>().ok(publicUserLoginService.loginByPhone(tokenDTO, formDTO));
+    }
+
+
+}

epmet-auth/src/main/java/com/epmet/dto/form/LoginByPhoneFormDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 手机验证码登陆接口入参
+ * @Author sun
+ */
+@Data
+public class LoginByPhoneFormDTO implements Serializable {
+    private static final long serialVersionUID = 4193133227120225342L;
+    /**
+     * 添加用户操作的用户可见异常分组
+     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
+     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
+     */
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface LoginByPhone extends CustomerClientShowGroup{}
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+    private String phone;
+
+    /**
+     * 验证码
+     */
+    @NotBlank(message="验证码不能为空", groups = {LoginByPhone.class})
+    private String smsCode;
+
+}
+

epmet-auth/src/main/java/com/epmet/dto/form/PaWxCodeFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/8 18:32
+ */
+@Data
+public class PaWxCodeFormDTO implements Serializable {
+    private static final long serialVersionUID = -207861963128774742L;
+    public interface AddUserInternalGroup {}
+    /**
+     * wxCode
+     */
+    @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
+    private String wxCode;
+}

epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 公众号手机号+验证码登录接口入参
+ * @Author sun
+ */
+@Data
+public class PublicSendSmsCodeFormDTO implements Serializable {
+    private static final long serialVersionUID = -1852541457359282018L;
+    /**
+     * 添加用户操作的用户可见异常分组
+     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
+     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
+     */
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+    private String phone;
+    /**
+     * 是否登陆（登陆：true  注册：false）
+     */
+    private Boolean isLogon;
+}

epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java

@@ -11,6 +11,7 @@ package com.epmet.redis;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.form.PublicSendSmsCodeFormDTO;
 import com.epmet.dto.form.SendSmsCodeFormDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -82,4 +83,28 @@ public class CaptchaRedis {
         String smsCode = (String) redisUtils.get(smsCodeKey);
         return smsCode;
     }
+
+    /**
+     * @param sendSmsCodeFormDTO app、client、phone
+     * @param smsCode            验证码
+     * @return void
+     * @Author sun
+     * @Description 公众号-短信验证码存入redis
+     **/
+    public void savePublicSmsCode(PublicSendSmsCodeFormDTO sendSmsCodeFormDTO, String smsCode) {
+        String smsCodeKey = RedisKeys.getLoginSmsCodeKey(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, sendSmsCodeFormDTO.getPhone());
+        logger.info(String.format("短信验证码key=%s", smsCodeKey));
+        redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE);
+    }
+    /**
+     * @param phone
+     * @return java.lang.String
+     * @Author sun
+     * @Description 公众号-获取登录时发送的验证码
+     **/
+    public String getPublicSmsCode(String phone) {
+        String smsCodeKey = RedisKeys.getLoginSmsCodeKey(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, phone);
+        String smsCode = (String) redisUtils.get(smsCodeKey);
+        return smsCode;
+    }
 }

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

@@ -0,0 +1,41 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.LoginByPhoneFormDTO;
+import com.epmet.dto.form.PaWxCodeFormDTO;
+import com.epmet.dto.form.PublicSendSmsCodeFormDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/8 18:31
+ */
+public interface PublicUserLoginService {
+
+    /**
+     * @return
+     * @param formDTO
+     * @author sun
+     * @description 解析wxcode获取用户信息并生成token
+     **/
+    UserTokenResultDTO wxCodeToToken(PaWxCodeFormDTO formDTO);
+
+    /**
+     * @param formDTO 手机号
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号登录-发送验证码
+     **/
+    void sendSmsCode(PublicSendSmsCodeFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号-手机验证码登陆
+     **/
+    UserTokenResultDTO loginByPhone(TokenDto tokenDTO, LoginByPhoneFormDTO formDTO);
+
+}

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

@@ -0,0 +1,239 @@
+package com.epmet.service.impl;
+
+import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
+import com.epmet.constant.PublicUserLoginConstant;
+import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.dto.PaCustomerDTO;
+import com.epmet.dto.PaUserDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.SaveUserResultDTO;
+import com.epmet.dto.result.SendVerificationCodeResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetThirdFeignClient;
+import com.epmet.jwt.JwtTokenProperties;
+import com.epmet.jwt.JwtTokenUtils;
+import com.epmet.redis.CaptchaRedis;
+import com.epmet.service.PublicUserLoginService;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+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;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/8 18:31
+ */
+@Service
+public class PublicUserLoginServiceImpl implements PublicUserLoginService {
+    private static final Logger logger = LoggerFactory.getLogger(PublicUserLoginServiceImpl.class);
+    private static final String SEND_SMS_CODE_ERROR = "发送短信验证码异常,手机号[%s],code[%s],msg[%s]";
+    @Autowired
+    private WxMpService wxMpService;
+    @Autowired
+    private EpmetThirdFeignClient epmetThirdFeignClient;
+    @Autowired
+    private JwtTokenUtils jwtTokenUtils;
+    @Autowired
+    private JwtTokenProperties jwtTokenProperties;
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private CaptchaRedis captchaRedis;
+
+
+    @Override
+    public UserTokenResultDTO wxCodeToToken(PaWxCodeFormDTO formDTO) {
+        //1.通过微信code获取用户基本信息
+        WxMpUser wxMpUser = this.getWxMpUser(formDTO.getWxCode());
+
+        //2.将获取的用户基本信息初始化到数据库
+        Result<SaveUserResultDTO> result = epmetThirdFeignClient.saveUser(wxMpUser);
+        if (!result.success()) {
+            throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION);
+        }
+        SaveUserResultDTO resultDTO = result.getData();
+
+        //3.获取用户token
+        String token = this.generateGovWxmpToken(resultDTO.getUserId());
+        //4.保存到redis
+        this.saveLatestGovTokenDto(resultDTO, wxMpUser, token);
+        UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setToken(token);
+        return userTokenResultDTO;
+    }
+
+    private WxMpUser getWxMpUser(String wxCode) {
+        WxMpUser wxMpUser = null;
+        try {
+            WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.oauth2getAccessToken(wxCode);
+            wxMpUser = wxMpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
+        } catch (WxErrorException e) {
+            logger.error("->[getWxMpUser]::error[{}]", "解析微信用户信息失败", e.getMessage());
+            e.printStackTrace();
+            throw new RenException("解析微信用户信息失败" + e.getMessage());
+        }
+        if (null == wxMpUser ) {
+            logger.error("wxMpUser is null");
+            throw new RenException("解析微信用户信息失败 wxMpUser is null");
+        }
+        /*if(StringUtils.isBlank(wxMpUser.getUnionId())){
+            logger.error("wxMpUser.getUnionId() is  null");
+            //            throw new RenException("解析微信用户信息失败");
+        }*/
+        return wxMpUser;
+    }
+
+    /**
+     * @Description 生成token
+     **/
+    private String generateGovWxmpToken(String userId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("app", LoginConstant.APP_PUBLIC);
+        map.put("client", LoginConstant.CLIENT_MP);
+        map.put("userId", userId);
+        String token = jwtTokenUtils.createToken(map);
+        logger.info("app:" + LoginConstant.APP_PUBLIC + ";client:" + LoginConstant.CLIENT_MP + ";userId:" + userId + ";生成token[" + token + "]");
+        return token;
+    }
+
+    //保存tokenDto到redis
+    private void saveLatestGovTokenDto(SaveUserResultDTO resultDTO, WxMpUser wxMpUser, String token) {
+        TokenDto tokenDTO = new TokenDto();
+        int expire = jwtTokenProperties.getExpire();
+        tokenDTO.setApp(LoginConstant.APP_PUBLIC);
+        tokenDTO.setClient(LoginConstant.CLIENT_MP);
+        tokenDTO.setOpenId(wxMpUser.getOpenId());
+        tokenDTO.setUnionId(null == wxMpUser.getUnionId() ? "" : wxMpUser.getUnionId());
+        tokenDTO.setToken(token);
+        //首次初始化时还没有客户
+        tokenDTO.setCustomerId("");
+        tokenDTO.setUserId(resultDTO.getUserId());
+        tokenDTO.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+        tokenDTO.setUpdateTime(System.currentTimeMillis());
+        cpUserDetailRedis.set(tokenDTO, expire);
+        logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
+    }
+
+    /**
+     * @param formDTO 手机号
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号登录-发送验证码
+     **/
+    @Override
+    public void sendSmsCode(PublicSendSmsCodeFormDTO formDTO) {
+        //1、校验手机号是否符合规范
+        if (!PhoneValidatorUtils.isMobile(formDTO.getPhone())) {
+            logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg()));
+            throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
+        }
+        //2、根据手机号校验用户是否存在
+        Result<CustomerUserResultDTO> Result = epmetThirdFeignClient.checkPaUser(formDTO.getPhone());
+        if (!Result.success()) {
+            logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), Result.getCode(), Result.getMsg()));
+            throw new RenException(Result.getCode());
+        }
+        CustomerUserResultDTO ResultDTO = Result.getData();
+        //登陆
+        if (formDTO.getIsLogon() && null == ResultDTO.getPaUserResult()) {
+            throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
+        }
+        //注册
+        if (!formDTO.getIsLogon() && null != ResultDTO.getPaUserResult()) {
+            throw new RenException(EpmetErrorCode.MOBILE_USED.getCode());
+        }
+        //3、发送短信验证码
+        SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
+        sendVerificationCodeFormDTO.setMobile(formDTO.getPhone());
+        //登陆或注册对应的短息模板
+        sendVerificationCodeFormDTO.setAliyunTemplateCode(formDTO.getIsLogon() ? SmsTemplateConstant.LGOIN_CONFIRM : SmsTemplateConstant.USER_REGISTER);
+        Result<SendVerificationCodeResultDTO> smsCodeResult = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO);
+        if (!smsCodeResult.success()) {
+            logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), smsCodeResult.getCode(), smsCodeResult.getMsg()));
+            throw new RenException(smsCodeResult.getCode());
+        }
+        //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
+        captchaRedis.savePublicSmsCode(formDTO, smsCodeResult.getData().getCode());
+        logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getPhone()));
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 公众号-手机验证码登陆
+     **/
+    @Override
+    public UserTokenResultDTO loginByPhone(TokenDto tokenDTO, LoginByPhoneFormDTO formDTO) {
+        //1.根据手机号查询到用户、客户信息
+        Result<CustomerUserResultDTO> result = epmetThirdFeignClient.checkPaUser(formDTO.getPhone());
+        if (!result.success()) {
+            logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg()));
+            throw new RenException(result.getCode());
+        }
+        CustomerUserResultDTO resultDTO = result.getData();
+
+        //2.用户不存在时不允许登陆
+        PaUserDTO userDTO = resultDTO.getPaUserResult();
+        if (null == userDTO || StringUtils.isBlank(userDTO.getId())) {
+            throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
+        }
+
+        //3.校验验证码是否正确
+        String rightSmsCode = captchaRedis.getPublicSmsCode(formDTO.getPhone());
+        if (!formDTO.getSmsCode().equals(rightSmsCode)) {
+            logger.error(String.format("验证码错误code[%s],msg[%s]", EpmetErrorCode.MOBILE_CODE_ERROR.getCode(), EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
+            throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+        }
+        //获取缓存中的token
+        TokenDto redisTokenDTO = cpUserDetailRedis.get(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, userDTO.getId(), TokenDto.class);
+        if (redisTokenDTO == null) {
+            return null;
+        }
+
+        //4.判断是否存在客户信息，是否需要生成新的token
+        PaCustomerDTO customerDTO = resultDTO.getPaCustomerResult();
+        if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) {
+            redisTokenDTO.setCustomerId(customerDTO.getId());
+            int expire = jwtTokenProperties.getExpire();
+            cpUserDetailRedis.set(redisTokenDTO, expire);
+        }
+
+        //5.登陆成功，访问记录表新增访问记录(访问记录新增失败不应影响用户登陆)
+        SaveUserVisitedFormDTO visited = new SaveUserVisitedFormDTO();
+        visited.setUserId(userDTO.getId());
+        visited.setLogonUserId(tokenDTO.getUserId());
+        visited.setPhone(formDTO.getPhone());
+        Result visitedResult = epmetThirdFeignClient.saveUserVisited(visited);
+        if(!visitedResult.success()){
+            logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION);
+        }
+
+        //6.返回token
+        UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setToken(redisTokenDTO.getToken());
+        return userTokenResultDTO;
+    }
+
+}

epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/constant/LoginConstant.java

@@ -21,6 +21,11 @@ public interface LoginConstant {
 	 */
 	String APP_OPER = "oper";
 
+	/**
+	 * 公众号
+	 */
+	String APP_PUBLIC = "public";
+
 	/**
 	 * web
 	 */
@@ -30,4 +35,9 @@ public interface LoginConstant {
 	 * 微信小程序
 	 */
 	String CLIENT_WXMP = "wxmp";
+
+	/**
+	 * E事通服务号
+	 */
+	String CLIENT_MP = "mp";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -31,6 +31,7 @@ public interface NumConstant {
     int THIRTY = 30;
     int FORTY = 40;
     int FIFTY = 50;
+    int SIXTY = 60;
     int ONE_HUNDRED = 100;
     int ONE_THOUSAND = 1000;
     int MAX = 99999999;
@@ -48,5 +49,6 @@ public interface NumConstant {
     String THREE_STR = "3";
     String FOUR_STR = "4";
     String FIVE_STR = "5";
+    String POSITIVE_EIGHT_STR = "+8";
 
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@@ -119,6 +119,11 @@ public interface ServiceConstant {
      */
     String DATA_STATISTICAL_SERVER = "data-statistical-server";
 
+    /**
+     * 微信第三方平台
+     */
+    String EPMET_THIRD_SERVER = "epmet-third-server";
+
     /**
      * 爱心互助
      */

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

@@ -82,7 +82,10 @@ public enum EpmetErrorCode {
 	DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),
 	ARTICLE_PUBLISH_ERROR(8801, "发布文章失败，请刷新重试"),
 
-	CUSTOMER_VALIDATE_ERROR(8999, "内部数据校验异常");
+	CUSTOMER_VALIDATE_ERROR(8999, "内部数据校验异常"),
+
+	//公众号  865..开头的码
+	PUBLIC_NOT_EXISTS(8651,"手机号未注册，请先完成信息注册");
 
 
 	private int code;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -481,4 +481,11 @@ public class DateUtils {
         cale.set(Calendar.DAY_OF_MONTH, 0);
         return cale.getTime();
     }
+
+    public static String formatTimestamp(Long timestamp, String pattern) {
+        //设置格式
+        SimpleDateFormat format =  new SimpleDateFormat(pattern);
+        return format.format(timestamp);
+    }
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
@@ -27,7 +28,10 @@ import org.springframework.util.CollectionUtils;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
@@ -204,6 +208,67 @@ public class HttpClientManager {
 		return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 	}
 
+	/**
+	 * desc:  发送get请求
+	 * param:url, params
+	 * return: CallResult<String>
+	 * date: 2019/2/21 9:16
+	 *
+	 * @author: jianjun liu
+	 */
+	public Result<Byte[]> sendGetFile(String url, Map<String, Object> params) {
+
+		try {
+			URIBuilder builder = new URIBuilder(url);
+			if (!CollectionUtils.isEmpty(params)) {
+				Set<String> set = params.keySet();
+				for (String key : set) {
+					builder.setParameter(key, params.get(key) == null ? "" : String.valueOf(params.get(key)));
+				}
+			}
+			HttpGet httpGet = new HttpGet(builder.build());
+			httpGet.setConfig(requestConfig);
+			return executeToByte(httpGet);
+		} catch (Exception e) {
+			log.error("sendGet exception", e);
+			return new Result<Byte[]>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+		}
+	}
+
+	private Result<Byte[]> executeToByte(HttpRequestBase httpMethod) {
+		CloseableHttpResponse response = null;
+		try {
+			response = httpclient.execute(httpMethod);
+			log.debug("http send response:{}", JSON.toJSONString(response));
+			if (response != null && response.getStatusLine() != null) {
+				if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+					InputStream in = response.getEntity().getContent();
+					ByteArrayOutputStream output = new ByteArrayOutputStream();
+					byte[] buffer = new byte[4096];
+					int n = 0;
+					while (-1 != (n = in.read(buffer))) {
+						output.write(buffer, 0, n);
+					}
+					return new Result<Byte[]>().ok(ArrayUtils.toObject(output.toByteArray()));
+				} else {
+					log.warn("execute http method fail,httpStatus:{0}", response.getStatusLine().getStatusCode());
+				}
+			}
+		} catch (Exception e) {
+			log.error("execute exception", e);
+			return new Result<Byte[]>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+		} finally {
+			httpMethod.releaseConnection();
+			try {
+				if (response != null) {
+					response.close();
+				}
+			} catch (IOException e) {
+			}
+		}
+		return new Result<Byte[]>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+	}
+
 	public static void main(String[] args) {
 		String url = "http://localhost:8107/epmetscan/api/textSyncScan";
 		TextTaskDTO p = new TextTaskDTO();

epmet-gateway/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.26
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.25
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.25
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.23</version>
+    <version>0.3.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -185,6 +185,10 @@
                 <!-- 30、内容审核服务 -->
                 <gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
            <!--     <gateway.routes.epmet-openapi-scan.uri>http://localhost:8107</gateway.routes.epmet-openapi-scan.uri>-->
+                <!-- 31、微信第三方平台 -->
+                <gateway.routes.epmet-third-server.uri>lb://epmet-third-server</gateway.routes.epmet-third-server.uri>
+<!--                <gateway.routes.epmet-third-server.uri>http://localhost:8110</gateway.routes.epmet-third-server.uri>-->
+
                 <!--    爱心互助            -->
                 <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
 <!--                <gateway.routes.epmet-heart-server.url>http://127.0.0.1:8111</gateway.routes.epmet-heart-server.url>-->
@@ -273,9 +277,11 @@
                 <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
                 <!-- 30、内容审核服务 -->
                 <gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
-                <!--    爱心互助            -->
+                <!-- 31、微信第三方平台 -->
+                <gateway.routes.epmet-third-server.uri>lb://epmet-third-server</gateway.routes.epmet-third-server.uri>
+                <!--  32、 爱心互助            -->
                 <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
-                <!--  32、积分银行 -->
+                <!--  33、积分银行 -->
                  <gateway.routes.epmet-point-server.url>http://127.0.0.1:8112</gateway.routes.epmet-point-server.url>
             </properties>
         </profile>
@@ -356,9 +362,11 @@
                 <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
                 <!-- 30、内容审核服务 -->
                 <gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
-                <!--    爱心互助            -->
+                <!-- 31、微信第三方平台 -->
+                <gateway.routes.epmet-third-server.uri>lb://epmet-third-server</gateway.routes.epmet-third-server.uri>
+                <!-- 32、 爱心互助            -->
                 <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
-                <!-- 32、 积分银行 -->
+                <!-- 33、 积分银行 -->
                 <gateway.routes.epmet-point-server.url>http://127.0.0.1:8112</gateway.routes.epmet-point-server.url>
             </properties>
         </profile>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -286,10 +286,19 @@ spring:
           filters:
               - StripPrefix=1
               - CpAuth=true
+        #微信第三方平台
+        - id: epmet-third-server
+          uri: @gateway.routes.epmet-third-server.uri@
+          order: 31
+          predicates:
+            - Path=${server.servlet.context-path}/third/**
+          filters:
+              - StripPrefix=1
+              - CpAuth=true
         # 爱心互助
         - id: epmet-heart-server
           uri: @gateway.routes.epmet-heart-server.url@
-          order: 31
+          order: 32
           predicates:
             - Path=${server.servlet.context-path}/heart/**
           filters:
@@ -298,7 +307,7 @@ spring:
         # 积分银行
         - id: epmet-point-server
           uri: @gateway.routes.epmet-point-server.url@
-          order: 32
+          order: 33
           predicates:
             - Path=${server.servlet.context-path}/point/**
           filters:
@@ -418,11 +427,6 @@ epmet:
     - /gov/issue/**
     - /gov/project/**
     - /resi/home/**
-    - /gov/voice/**
-    - /resi/voice/**
-    - /data/report/**
-    - /heart/**
-    - /point/**
   swaggerUrls:
 
 jwt:

epmet-module/epmet-third/epmet-third-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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>epmet-third</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+    </parent>
+
+
+    <artifactId>epmet-third-client</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>3.6.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthCodeDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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;
+
+
+/**
+ * 授权回调url反参表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+public class AuthCodeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * resi：居民端，work：工作端
+     */
+	private String clientType;
+
+    /**
+     * 授权方APPID
+     */
+	private String authAppid;
+
+    /**
+     * 授权码
+     */
+	private String authCode;
+
+    /**
+     * 到期时间
+     */
+	private Date expiresInTime;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 
+     */
+	private String createdBy;
+
+    /**
+     * 
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+    /**
+     * 
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthResultRecordDTO.java

@@ -0,0 +1,116 @@
+/**
+ * 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-07-15
+ */
+@Data
+public class AuthResultRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * resi：居民端，work：工作端
+     */
+	private String clientType;
+
+    /**
+     * 第三方平台AppId 第三方平台AppId
+     */
+	private String componentAppId;
+
+    /**
+     * 微信返回创建时间 微信返回创建时间
+     */
+	private Date wechatCreateTime;
+
+    /**
+     * 通知类型
+     */
+	private String infoType;
+
+    /**
+     * 授权方AppId
+     */
+	private String authorizerAppId;
+
+    /**
+     * 授权码（auth_code）
+     */
+	private String authorizationCode;
+
+    /**
+     * 授权码过期时间
+     */
+	private Date expiresInTime;
+
+    /**
+     * 预授权码
+     */
+	private String preAuthCode;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthorizationInfoDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class AuthorizationInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 授权方 appid
+     */
+	private String authorizerAppid;
+
+    /**
+     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）【第三方和微信交互使用】
+     */
+	private String authorizerAccessToken;
+
+    /**
+     * 到期时间
+     */
+	private Date expiresInTime;
+
+    /**
+     * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效
+     */
+	private String authorizerRefreshToken;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 
+     */
+	private String createdBy;
+
+    /**
+     * 
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+    /**
+     * 
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BindingAccountDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class BindingAccountDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id ID
+     */
+	private String id;
+
+    /**
+     * 开放平台账号ID 开放平台账号ID
+     */
+	private String openPlatformAccountId;
+
+    /**
+     * 公众号/小程序APPID（授权方APPID） 授权方APPID
+     */
+	private String authAppId;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 客户端 居民端：resi，工作端：work
+     */
+	private String clientType;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BusinessInfoDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class BusinessInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 功能类型 open_store：是否开通微信门店功能 open_scan：是否开通微信扫商品功能 open_pay：是否开通微信支付功能 open_card：是否开通微信卡券功能 open_shake：是否开通微信摇一摇功能
+     */
+	private String funcType;
+
+    /**
+     * 开通状态 0：未开通，1：已开通
+     */
+	private Integer openStatus;
+
+    /**
+     * 删除状态 0:正常，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditRecordDTO.java

@@ -0,0 +1,144 @@
+/**
+ * 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-07-15
+ */
+@Data
+public class CodeAuditRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 模板ID
+     */
+	private String templateId;
+
+    /**
+     * 客户端类型：resi：居民端，work：工作端
+     */
+	private String clientType;
+
+    /**
+     * 授权方AppId
+     */
+	private String authAppId;
+
+    /**
+     * 小程序的原始 ID
+     */
+	private String toUserName;
+
+    /**
+     * 发送方帐号（一个 OpenID，此时发送方是系统帐号）
+     */
+	private String fromUserName;
+
+    /**
+     * 消息创建时间 （整型），时间戳
+     */
+	private Date wechatCreateTime;
+
+    /**
+     * 消息类型 event
+     */
+	private String msgType;
+
+    /**
+     * 事件类型
+weapp_audit_success：审核通过，
+weapp_audit_fail：审核不通过，
+weapp_audit_delay：审核延后
+     */
+	private String event;
+
+    /**
+     * 审核成功时的时间戳
+     */
+	private Date succTime;
+
+    /**
+     * 审核不通过的时间戳
+     */
+	private Date failTime;
+
+    /**
+     * 审核延后时的时间戳
+     */
+	private Date delayTime;
+
+    /**
+     * 审核不通过的原因
+     */
+	private String reason;
+
+    /**
+     * 审核不通过的截图示例。用 | 分隔的 media_id 的列表，可通过获取永久素材接口拉取截图内容
+     */
+	private String screenShot;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java

@@ -0,0 +1,101 @@
+/**
+ * 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;
+
+
+/**
+ * 代码审核j结果 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-09
+ */
+@Data
+public class CodeAuditResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 代码ID
+     */
+	private String codeId;
+
+    /**
+     * 审核ID
+     */
+	private String auditId;
+
+    /**
+     * 审核结果 审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay
+     */
+	private String result;
+
+    /**
+     * 原因
+     */
+	private String reason;
+
+	/**
+	 * 当审核被拒绝时，会返回审核失败的小程序截图示例。用 | 分隔的 media_id 的列表
+	 */
+	private String screenShot;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 是否删除
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java

@@ -0,0 +1,116 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class CodeCustomerDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 客户名
+     */
+	private String customerName;
+
+    /**
+     * 模板ID
+     */
+	private String templateId;
+
+    /**
+     * 小程序类型 居民端resi,工作端work
+     */
+	private String clientType;
+
+    /**
+     * APPID
+     */
+	private String appId;
+
+    /**
+     * 自定义配置
+     */
+	private String extJson;
+
+    /**
+     * 代码版本号
+     */
+	private String userVersion;
+
+    /**
+     * 代码描述
+     */
+	private String userDesc;
+
+    /**
+     * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed
+     */
+	private String status;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 是否删除
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeMediaDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class CodeMediaDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 代码ID
+     */
+	private String codeId;
+
+    /**
+     * 素材ID
+     */
+	private String mediaId;
+
+    /**
+     * 素材名
+     */
+	private String mediaName;
+
+    /**
+     * 素材类型 图片（image）、语音（voice）、视频（video）和缩略图（thumb）
+     */
+	private String mediaType;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 是否删除
+     */
+	private String delFlag;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentAccessTokenDTO.java

@@ -0,0 +1,76 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class ComponentAccessTokenDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private String id;
+
+    /**
+     * 令牌 【第三方平台接口的调用凭据】
+     */
+	private String componentAccessToken;
+
+    /**
+     * 令牌到期时间
+     */
+	private Date expiresInTime;
+
+    /**
+     * 删除状态 0：正常 1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentVerifyTicketDTO.java

@@ -0,0 +1,81 @@
+/**
+ * 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;
+
+
+/**
+ * 微信发送的ticket表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+public class ComponentVerifyTicketDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 第三方平台ID
+     */
+	private String componentAppId;
+
+    /**
+     * component_verify_ticket
+     */
+	private String typeInfo;
+
+    /**
+     * 票据内容
+     */
+	private String componentVerifyTicket;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerCodeOperationHistoryDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class CustomerCodeOperationHistoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 代码ID
+     */
+	private String codeId;
+
+    /**
+     * 版本
+     */
+	private String version;
+
+    /**
+     * 操作类型 操作 上传upload，审核audit，撤回undo，发布release
+     */
+	private String operation;
+
+    /**
+     * 描述
+     */
+	private String describe;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 是否删除
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class CustomerMpDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * pa_customer的id
+     */
+	private String customerId;
+
+    /**
+     * resi，work
+     */
+	private String client;
+
+    /**
+     * 小程序的appId
+     */
+	private String appId;
+
+    /**
+     * 是否已经授权 0：未授权，1：已授权
+     */
+	private Integer authorizationFlag;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FuncInfoDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class FuncInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private String id;
+
+    /**
+     * 权限类别
+     */
+	private String funcscopeCategory;
+
+    /**
+     * 权限ID
+     */
+	private String funcscopeId;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 授权方APPID
+     */
+	private String authorizationInfoAppid;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 
+     */
+	private String createdBy;
+
+    /**
+     * 
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+    /**
+     * 
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniCategoryInfoDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class MiniCategoryInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 类目排序 first , second
+     */
+	private String categorySort;
+
+    /**
+     * 类目名称 资讯，文娱......
+     */
+	private String categoryName;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniInfoDTO.java

@@ -0,0 +1,121 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class MiniInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 昵称
+     */
+	private String nickName;
+
+    /**
+     * 头像
+     */
+	private String headImg;
+
+    /**
+     * 小程序类型 默认为 0
+     */
+	private String serviceTypeInfo;
+
+    /**
+     * 小程序认证类型 小程序认证类型
+     */
+	private String verifyTypeInfo;
+
+    /**
+     * 原始 ID
+     */
+	private String userName;
+
+    /**
+     * 主体名称
+     */
+	private String principalName;
+
+    /**
+     * 账号介绍
+     */
+	private String signature;
+
+    /**
+     * 二维码图片的 URL
+     */
+	private String qrcodeUrl;
+
+    /**
+     * 删除状态 0：正常，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniNetworkInfoDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class MiniNetworkInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 类型
+     */
+	private String networkType;
+
+    /**
+     * 域名 RequestDomain，WsRequestDomain，UploadDomain，DownloadDomain
+     */
+	private String url;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java

@@ -0,0 +1,82 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class OpenPlatformAccountDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id ID
+     */
+	private String id;
+
+    /**
+     * openId 所创建的开放平台帐号的 appid
+     */
+	private String openAppId;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerAgencyDTO.java

@@ -0,0 +1,111 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaCustomerAgencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id,来源于customer.id
+     */
+	private String customerId;
+
+    /**
+     * 根组织名称
+     */
+	private String agencyName;
+
+    /**
+     * 级别
+     */
+	private String level;
+
+    /**
+     * 地区编码
+     */
+	private String areaCode;
+
+    /**
+     * 省
+     */
+	private String province;
+
+    /**
+     * 市
+     */
+	private String city;
+
+    /**
+     * 区
+     */
+	private String district;
+
+    /**
+     * 党支部数量
+     */
+	private Integer partybranchnum;
+
+    /**
+     * 删除标识
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java

@@ -0,0 +1,81 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaCustomerDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id，本主键和oper_crm.customer.id一致
+     */
+	private String id;
+
+    /**
+     * 客户名称，默认是根组织名称
+     */
+	private String customerName;
+
+    /**
+     * 是否已经完成客户信息初始化 0：未初始化，1：已初始化
+     */
+    private Integer isInitialize;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerUserAgencyDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaCustomerUserAgencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id,来源于pa_customer.id
+     */
+	private String customerId;
+
+    /**
+     * pa_customer_agency.id
+     */
+	private String agencyId;
+
+    /**
+     * pa_user.id
+     */
+	private String userId;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaInfoDTO.java

@@ -0,0 +1,129 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class PaInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 昵称
+     */
+	private String nickName;
+
+    /**
+     * 头像
+     */
+	private String headImg;
+
+    /**
+     * 公众号类型 0：订阅号
+1：由历史老帐号升级后的订阅号
+2：服务号
+     */
+	private String serviceTypeInfo;
+
+    /**
+     * 公众号认证类型 -1：未认证
+0：微信认证
+1：新浪微博认证
+2：腾讯微博认证
+3：已资质认证通过但还未通过名称认证
+4：已资质认证通过、还未通过名称认证，但通过了新浪微博认证
+5：已资质认证通过、还未通过名称认证，但通过了腾讯微博认证
+     */
+	private String verifyTypeInfo;
+
+    /**
+     * 原始ID
+     */
+	private String userName;
+
+    /**
+     * 主体名称 
+     */
+	private String principalName;
+
+    /**
+     * 公众号所设置的微信号，可能为空 公众号所设置的微信号，可能为空
+     */
+	private String alias;
+
+    /**
+     * 二维码图片的 URL
+     */
+	private String qrcodeUrl;
+
+    /**
+     * 删除状态 0：正常，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * user表的id
+     */
+	private String id;
+
+    /**
+     * 手机号
+     */
+	private String phone;
+
+    /**
+     * 姓
+     */
+	private String realName;
+
+    /**
+     * 1男2女0未知
+     */
+	private String gender;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaUserVisitedDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * user表的id
+     */
+	private String id;
+
+    /**
+     * 用户Id pa_user.id
+     */
+	private String userId;
+
+    /**
+     * 登陆手机号对应的openId【pa_user_wechat表手机号对应的openId】
+     */
+	private String wxOpenId;
+
+    /**
+     * 登陆用户的openId
+     */
+	private String openId;
+
+    /**
+     * 登陆用户使用的登陆手机号
+     */
+	private String phone;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserWechatDTO.java

@@ -0,0 +1,121 @@
+/**
+ * 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-07-09
+ */
+@Data
+public class PaUserWechatDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * user表的id
+     */
+	private String id;
+
+    /**
+     * 用户Id user.id
+     */
+	private String userId;
+
+    /**
+     * 注册用户的微信openId
+     */
+	private String wxOpenId;
+
+    /**
+     * 
+     */
+	private String unionId;
+
+    /**
+     * 1男2女0未知
+     */
+	private String gender;
+
+    /**
+     * 昵称
+     */
+	private String nickname;
+
+    /**
+     * 头像
+     */
+	private String headImgUrl;
+
+    /**
+     * 国家
+     */
+	private String country;
+
+    /**
+     * 省份
+     */
+	private String province;
+
+    /**
+     * 城市
+     */
+	private String city;
+
+    /**
+     * 语言
+     */
+	private String language;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PreAuthTokenDTO.java

@@ -0,0 +1,76 @@
+/**
+ * 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-07-14
+ */
+@Data
+public class PreAuthTokenDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private String id;
+
+    /**
+     * 预授权码 【第三方平台方实现授权托管的必备信息，每个预授权码有效期为 10 分钟。需要先获取令牌才能调用】
+     */
+	private String preAuthToken;
+
+    /**
+     * 预授权码有效期  
+     */
+	private Date expiresInTime;
+
+    /**
+     * 删除状态 0：正常 1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/AuthCodeFormDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/8 17:53
+ */
+@Data
+public class AuthCodeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6163303184086480522L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 授权方AppId
+     */
+    private String authAppId;
+
+    /**
+     * 授权码
+     */
+    private String authCode;
+
+    /**
+     * 有效期  10min
+     */
+    private Date expiresInTime;
+
+    /**
+     * 删除状态 0：正常  1：已删除
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 创建者
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     *  更新者
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/AuthorizationInfoFormDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 10:30
+ */
+@Data
+public class AuthorizationInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1117036477221128930L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 授权方 appid
+     */
+    private String authorizerAppid;
+
+    /**
+     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）
+     */
+    private String authorizerAccessToken;
+
+    /**
+     * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
+     */
+    private Date expiresInTime;
+
+    /**
+     * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效
+     */
+    private String authorizerRefreshToken;
+
+    /**
+     * 客户端类型 resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    private Integer delFlag = 0;
+
+    private String createdBy = "APP_USER";
+
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/AuthorizerAccessTokenFormDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 17:29
+ */
+@Data
+public class AuthorizerAccessTokenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 268927093061495006L;
+
+    /**
+     * 授权方令牌
+     */
+    private String authorizerAccessToken;
+
+    /**
+     * 有效期，单位：秒
+     */
+    private Date expiresInTime;
+
+    /**
+     * 刷新令牌
+     */
+    private String authorizerRefreshToken;
+
+    /**
+     * 授权方APPID
+     */
+    private String authAppid;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    private Integer delFlag = 0;
+
+    private String createdBy = "APP_USER";
+
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BindingAccountFormDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/13 17:58
+ */
+@Data
+public class BindingAccountFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7969402941219659678L;
+
+    /**
+     * 开放平台账号ID 开放平台账号ID
+     */
+    private String openPlatformAccountId;
+
+    /**
+     * 公众号/小程序APPID（授权方APPID） 授权方APPID
+     */
+    private String authAppId;
+
+    /**
+     * 客户ID 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端 居民端：resi，工作端：work
+     */
+    private String clientType;
+
+    private Integer delFlag = 0;
+    private Integer revision = 0;
+    private String createdBy = "APP_USER";
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BusinessInfoFormDTO.java

@@ -0,0 +1,60 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/14 15:54
+ */
+@Data
+public class BusinessInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 570372083578341740L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+    private String primaryId;
+
+    /**
+     * 功能类型 open_store：是否开通微信门店功能 open_scan：是否开通微信扫商品功能 open_pay：是否开通微信支付功能 open_card：是否开通微信卡券功能 open_shake：是否开通微信摇一摇功能
+     */
+    private String funcType;
+
+    /**
+     * 开通状态 0：未开通，1：已开通
+     */
+    private Integer openStatus;
+
+    /**
+     * 删除状态 0:正常，1：删除
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeAuditRecordFormDTO.java

@@ -0,0 +1,115 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/15 14:13
+ */
+@Data
+public class CodeAuditRecordFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2295533266066734315L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 模板ID
+     */
+    private String templateId;
+
+    /**
+     * 客户端类型：resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 授权方AppId
+     */
+    private String authAppId;
+
+    /**
+     * 小程序的原始 ID
+     */
+    private String toUserName;
+
+    /**
+     * 发送方帐号（一个 OpenID，此时发送方是系统帐号）
+     */
+    private String fromUserName;
+
+    /**
+     * 消息创建时间 （整型），时间戳
+     */
+    private Date wechatCreateTime;
+
+    /**
+     * 消息类型 event
+     */
+    private String msgType;
+
+    /**
+     * 事件类型
+     weapp_audit_success：审核通过，
+     weapp_audit_fail：审核不通过，
+     weapp_audit_delay：审核延后
+     */
+    private String event;
+
+    /**
+     * 审核成功时的时间戳
+     */
+    private Date succTime;
+
+    /**
+     * 审核不通过的时间戳
+     */
+    private Date failTime;
+
+    /**
+     * 审核延后时的时间戳
+     */
+    private Date delayTime;
+
+    /**
+     * 审核不通过的原因
+     */
+    private String reason;
+
+    /**
+     * 审核不通过的截图示例。用 | 分隔的 media_id 的列表，可通过获取永久素材接口拉取截图内容
+     */
+    private String screenShot;
+
+    /**
+     * 删除状态
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/14 17:50
+ */
+@Data
+public class CodeCommonFormDTO implements Serializable {
+	private static final long serialVersionUID = -8923691903900141713L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 代码ID
+	 */
+	private String codeId;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeUploadFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/9 14:24
+ */
+@NoArgsConstructor
+@Data
+public class CodeUploadFormDTO implements Serializable {
+
+	private static final long serialVersionUID = 1295337818281424509L;
+	/**
+	 * 小程序类型 居民端resi， 工作段work
+	 */
+	private String clientType;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 代码库中的代码模板 ID
+	 */
+	private String templateId;
+	/**
+	 * 第三方自定义的配置
+	 */
+	private String extJson;
+	/**
+	 * 代码版本号
+	 */
+	private String userVersion;
+	/**
+	 * 代码描述
+	 */
+	private String userDesc;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentAccessTokenFormDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 8:54
+ */
+@Data
+public class ComponentAccessTokenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2860559047843944065L;
+
+    /**
+     * 令牌 【第三方平台接口的调用凭据】
+     */
+    private String componentAccessToken;
+
+    /**
+     * 令牌有效期  单位：s  最长 60*60*2
+     */
+    private Date expiresInTime;
+
+    /**
+     * 删除状态 0：正常 1：删除
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/7 11:12
+ */
+@Data
+public class ComponentVerifyTicketFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 第三方平台ID
+     */
+    private String componentAppId;
+
+    /**
+     * component_verify_ticket
+     */
+    private String typeInfo = "component_verify_ticket";
+
+    /**
+     * 票据内容
+     */
+    private String componentVerifyTicket;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+    private String delFlag = "0";
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateAgencyFormDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-创建组织-接口入参
+ */
+@Data
+public class CreateAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 根组织名称
+     */
+    @NotBlank(message = "组织名称不能为空")
+    private String agencyName;
+
+    /**
+     * 级别
+     */
+    @NotBlank(message = "组织级别不能为空")
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    @NotBlank(message = "地区编码不能为空")
+    private String areaCode;
+
+    /**
+     * 省（中国字）
+     */
+    private String province = "";
+
+    /**
+     * 市（中国字）
+     */
+    private String city = "";
+
+    /**
+     * 区（中国字）
+     */
+    private String district = "";
+
+    /**
+     * 党支部数量
+     */
+    private Integer partyBranchNum = 0;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateOpenFormDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/13 17:36
+ */
+@Data
+public class CreateOpenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7656834022953140875L;
+
+    private String id;
+
+    /**
+     * openId 所创建的开放平台帐号的 appid
+     */
+    private String openid;
+
+    /**
+     * 客户ID 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建者
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 修改者
+     */
+    private String updatedBy = "APP_USER";
+
+    /**
+     * 是否已删除(0-未删除，1-已删除)
+     */
+    private String delFlag = "0";
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/FuncInfoFormDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 10:43
+ */
+@Data
+public class FuncInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5468844633023377254L;
+
+    /**
+     * 权限类别
+     */
+    private String funcscopeCategory;
+
+    /**
+     * 权限ID
+     */
+    private String funcscopeId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 授权方APPID
+     */
+    private String authorizationInfoAppid;
+
+    private Integer delFlag = 0;
+
+    private String createdBy = "APP_USER";
+
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/GoToAuthFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/13 10:30
+ */
+@Data
+public class GoToAuthFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4171794043794295829L;
+    public interface GoToAuth extends CustomerClientShowGroup{}
+
+    /**
+     * 客户端类型   resi：居民端 ， work：工作端
+     */
+    @NotBlank(message = "客户端类型不能为空",groups = {GoToAuth.class})
+    private String clientType;
+
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/MiniCategoryInfoFormDTO.java

@@ -0,0 +1,60 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/14 15:53
+ */
+@Data
+public class MiniCategoryInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 9211011906485259736L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+    private String primaryId;
+
+    /**
+     * 类目排序 first , second
+     */
+    private String categorySort;
+
+    /**
+     * 类目名称 资讯，文娱......
+     */
+    private String categoryName;
+
+    /**
+     * 删除状态
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/MiniInfoFormDTO.java

@@ -0,0 +1,76 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/14 15:20
+ */
+@Data
+public class MiniInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2970966756786695782L;
+
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 头像
+     */
+    private String headImg;
+
+    /**
+     * 小程序类型 默认为 0
+     */
+    private String serviceTypeInfo;
+
+    /**
+     * 小程序认证类型 小程序认证类型
+     */
+    private String verifyTypeInfo;
+
+    /**
+     * 原始 ID
+     */
+    private String userName;
+
+    /**
+     * 主体名称
+     */
+    private String principalName;
+
+    /**
+     * 账号介绍
+     */
+    private String signature;
+
+    /**
+     * 二维码图片的 URL
+     */
+    private String qrcodeUrl;
+
+    private Integer delFlag = 0;
+
+    private Integer revision = 0;
+
+    private String createdBy = "APP_USER";
+
+    private String updatedBy = "APP_USER";
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/MiniNetworkInfoFormDTO.java

@@ -0,0 +1,60 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/14 15:52
+ */
+@Data
+public class MiniNetworkInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2171502778870475956L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 主表ID
+     */
+    private String primaryId;
+
+    /**
+     * 类型
+     */
+    private String networkType;
+
+    /**
+     * 域名 RequestDomain，WsRequestDomain，UploadDomain，DownloadDomain
+     */
+    private String url;
+
+    /**
+     * 删除状态
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/MyInfoFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询我的信息-接口入参
+ */
+@Data
+public class MyInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 客户Id
+     */
+    //@NotBlank(message = "客户Id不能为空", groups = {MyInfoFormDTO.AddUserInternalGroup.class})
+    private String customerId;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/PaInfoFormDTO.java

@@ -0,0 +1,95 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/14 15:27
+ */
+@Data
+public class PaInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2495498009170200556L;
+
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型  resi：居民端，work：工作端
+     */
+    private String clientType;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 头像
+     */
+    private String headImg;
+
+    /**
+     * 公众号类型 0：订阅号
+     1：由历史老帐号升级后的订阅号
+     2：服务号
+     */
+    private String serviceTypeInfo;
+
+    /**
+     * 公众号认证类型 -1：未认证
+     0：微信认证
+     1：新浪微博认证
+     2：腾讯微博认证
+     3：已资质认证通过但还未通过名称认证
+     4：已资质认证通过、还未通过名称认证，但通过了新浪微博认证
+     5：已资质认证通过、还未通过名称认证，但通过了腾讯微博认证
+     */
+    private String verifyTypeInfo;
+
+    /**
+     * 原始ID
+     */
+    private String userName;
+
+    /**
+     * 主体名称
+     */
+    private String principalName;
+
+    /**
+     * 公众号所设置的微信号，可能为空 公众号所设置的微信号，可能为空
+     */
+    private String alias;
+
+    /**
+     * 二维码图片的 URL
+     */
+    private String qrcodeUrl;
+
+    /**
+     * 删除状态 0：正常，1：删除
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/PreAuthTokenFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 9:15
+ */
+@Data
+public class PreAuthTokenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2970040842154724385L;
+
+    /**
+     * 预授权码 【第三方平台方实现授权托管的必备信息，每个预授权码有效期为 10 分钟。需要先获取令牌才能调用】
+     */
+    private String preAuthToken;
+
+    /**
+     * 预授权码有效期  单位：s  最长 60*60*2
+     */
+    private Date expiresInTime;
+
+    /**
+     * 删除状态 0：正常 1：删除
+     */
+    private Integer delFlag = 0;
+
+    /**
+     * 创建人
+     */
+    private String createdBy = "APP_USER";
+
+    /**
+     * 更新人
+     */
+    private String updatedBy = "APP_USER";
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterFormDTO.java

@@ -0,0 +1,54 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-手机号注册-接口入参
+ */
+@Data
+public class RegisterFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = {AddUserInternalGroup.class, AddUserShowGroup.class})
+    private String phone;
+
+    /**
+     * 手机短信验证码
+     */
+    @NotBlank(message = "验证码不能为空", groups = {AddUserShowGroup.class})
+    private String smsCode;
+
+    /**
+     * 姓氏
+     */
+    @NotBlank(message = "姓氏不能为空", groups = {AddUserShowGroup.class})
+    private String surName;
+
+    /**
+     * 性别  1男2女0未知
+     */
+    @NotNull(message = "用户性别不能为空", groups = {AddUserShowGroup.class})
+    private Integer gender;
+
+    /**
+     * token中userId
+     */
+    private String userId;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询公众号注册的客户列表-接口入参
+ */
+@Data
+public class RegisterInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 当前页
+     * */
+    @Min(value = 1)
+    private Integer pageNo = 1;
+
+    /**
+     * 每页显示数量
+     * */
+    private Integer pageSize = 20;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-用户登陆新增访问记录-接口入参
+ */
+@Data
+public class SaveUserVisitedFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 登陆手机号对应的userId
+     */
+    private String userId;
+
+    /**
+     * 登陆人userId
+     */
+    private String logonUserId;
+
+    /**
+     * 登陆手机号
+     */
+    private String phone;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java

@@ -0,0 +1,126 @@
+package com.epmet.dto.form;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/14 16:37
+ */
+@Data
+public class SubmitAuditFormDTO implements Serializable {
+	private static final long serialVersionUID = -2136272127561529025L;
+	/**
+	 * 上传代码ID
+	 */
+	private String codeId;
+
+	/**
+	 * 小程序版本说明和功能解释
+	 */
+	private String versionDesc;
+	/**
+	 * 反馈内容，至多 200 字
+	 */
+	private String feedbackInfo;
+	/**
+	 * 用 | 分割的 media_id 列表，至多 5 张图片, 可以通过新增临时素材接口上传而得到
+	 */
+	private String feedbackStuff;
+	/**
+	 * 审核项列表（选填，至多填写 5 项）
+	 */
+	private List<ItemListBean> itemList;
+	/**
+	 * 预览信息（小程序页面截图和操作录屏）
+	 */
+	private List<PreviewInfoBean> previewInfo;
+	/**
+	 * 用户生成内容场景（UGC）信息安全声明
+	 */
+	private List<UgcDeclareBean> ugcDeclare;
+
+	@NoArgsConstructor
+	@Data
+	private static class ItemListBean {
+		/**
+		 * 小程序的页面，可通过获取小程序的页面列表接口获得
+		 */
+		private String address;
+		/**
+		 * 小程序的标签，用空格分隔，标签至多 10 个，标签长度至多 20
+		 */
+		private String tag;
+		/**
+		 * 一级类目名称
+		 */
+		private String firstClass;
+		/**
+		 * 二级类目名称
+		 */
+		private String secondClass;
+		/**
+		 * 三级类目名称
+		 */
+		private String thirdClass;
+		/**
+		 * 一级类目的 ID
+		 */
+		private String firstId;
+		/**
+		 * 二级类目的 ID
+		 */
+		private String secondId;
+		/**
+		 * 三级类目的 ID
+		 */
+		private String thirdId;
+		/**
+		 * 小程序页面的标题,标题长度至多 32
+		 */
+		private String title;
+	}
+
+	@NoArgsConstructor
+	@Data
+	private static class PreviewInfoBean {
+		/**
+		 * 录屏mediaid列表，可以通过提审素材上传接口获得
+		 */
+		private List<String> videoIdList;
+		/**
+		 * 截屏mediaid列表，可以通过提审素材上传接口获得
+		 */
+		private List<String> picIdList;
+	}
+
+	@NoArgsConstructor
+	@Data
+	private static class UgcDeclareBean {
+		/**
+		 * UGC场景 0,不涉及用户生成内容, 1.用户资料,2.图片,3.视频,4.文本,5其他, 可多选,当scene填0时无需填写下列字段
+		 */
+		private List<Integer> scene;
+		/**
+		 * 当scene选其他时的说明,不超时256字
+		 */
+		private String otherSceneDesc;
+		/**
+		 * 内容安全机制 1.使用平台建议的内容安全API,2.使用其他的内容审核产品,3.通过人工审核把关,4.未做内容审核把关
+		 */
+		private List<Integer> method;
+		/**
+		 * 是否有审核团队, 0.无,1.有,默认0
+		 */
+		private Integer hasAuditTeam;
+		/**
+		 * 说明当前对UGC内容的审核机制,不超过256字
+		 */
+		private String auditDesc;
+	}
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/6 9:57
+ */
+@Data
+public class ThirdPlatformEventFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8855993636150332559L;
+
+    public interface ThirdPlatForm extends CustomerClientShowGroup{}
+
+    /**
+     * 时间戳
+     */
+    @NotBlank(message = "timeStamp不能为空",groups = {ThirdPlatForm.class})
+    private String timeStamp;
+
+    /**
+     * 随机数
+     */
+    @NotBlank(message = "nonce不能为空",groups = {ThirdPlatForm.class})
+    private String nonce;
+
+    /**
+     * 消息体签名
+     */@NotBlank(message = "msgSignature不能为空",groups = {ThirdPlatForm.class})
+
+    private String msgSignature;
+
+    /**
+     * 消息体
+     */
+    @NotBlank(message = "postData不能为空",groups = {ThirdPlatForm.class})
+    private String postData;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/14 15:57
+ */
+@NoArgsConstructor
+@Data
+public class UploadListFormDTO implements Serializable {
+
+	private static final long serialVersionUID = 5733465036099223190L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 小程序类型 居民端resi，工作端work
+	 */
+	private String clientType;
+	/**
+	 * 状态
+	 */
+	private String status;
+	/**
+	 * 开始时间
+	 */
+	private String startTime;
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
+	/**
+	 * 页数
+	 */
+	private Integer page;
+	/**
+	 * 页面条数
+	 */
+	private Integer limit;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/7 10:28
+ */
+@Data
+public class WeChatPlatformAuthCodeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -9047434066325122697L;
+
+    /**
+     * 预授权码
+     */
+    private String authCode;
+
+    /**
+     * 有效期，单位：秒
+     */
+    private Integer expiresIn;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AgencyLevelListResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询组织级别-接口返参
+ */
+@Data
+public class AgencyLevelListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     */
+    private String levelKey;
+    /**
+     * 级别对应的名称
+     */
+    private String levelName;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthCodeResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/15 10:00
+ */
+@Data
+public class AuthCodeResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4642988014737245076L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型 resi：居民端，work：工作端
+     */
+    private String clientType;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthorizationInfoResultDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 权限集列表
+ * @Author zxc
+ * @CreateTime 2020/7/8 13:39
+ */
+@Data
+public class AuthorizationInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 授权方 appid
+     */
+    private String authorizer_appid;
+
+    /**
+     * 接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）
+     */
+    private String authorizer_access_token;
+
+    /**
+     * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
+     */
+    private String expires_in;
+
+    /**
+     * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。
+     * 一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效
+     */
+    private String authorizer_refresh_token;
+
+    /**
+     * 授权给开发者的权限集列表
+     */
+    private List<Map> func_info;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author sun
+ * @Description 公众号-创建组织-接口返参
+ */
+@Data
+public class CreateAgencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 新增客户Id
+     */
+    private String customerId;
+    /**
+     * 包含customerId的token
+     */
+    private String token;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateOpenResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/13 16:17
+ */
+@Data
+public class CreateOpenResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7130231978776634403L;
+
+    private String id;
+
+    /**
+     * 所创建的开放平台帐号的 appid
+     */
+    private String openAppId;
+
+    /**
+     * 错误信息
+     */
+    private String errMsg;
+
+    /**
+     * 返回码
+     * 0：ok，
+     * -1：system error ， 系统错误
+     * 40013：invalid appid ， appid 无效
+     * 89000：account has bound open ，该公众号/小程序 已经绑定了开放平台帐号
+     */
+    private Integer errCode;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java

@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询公众号注册的客户列表-接口返参
+ */
+@Data
+public class CustomerAgencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId = "";
+    /**
+     * 组织Id
+     */
+    private String agencyId = "";
+    /**
+     * 组织名称
+     */
+    private String agencyName = "";
+    /**
+     * 组织级别
+     */
+    private String level = "";
+    /**
+     * 省
+     */
+    private String province = "";
+    /**
+     * 市
+     */
+    private String city = "";
+    /**
+     * 区
+     */
+    private String district = "";
+    /**
+     * 党支部数量
+     */
+    private Integer partybranchnum;
+    /**
+     * 居民端授权状态(0：未授权，1：已授权)
+     */
+    private Integer resiAuth;
+    /**
+     * 政府端授权状态(0：未授权，1：已授权)
+     */
+    private Integer workAuth;
+    /**
+     * 政府端授权状态(0：未授权，1：已授权)
+     */
+    private Integer initState;
+    /**
+     * 注册人手机号
+     */
+    private String phone;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerIdAndClientResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/15 15:44
+ */
+@Data
+public class CustomerIdAndClientResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7427184790539679353L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型
+     */
+    private String clientType;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.PaCustomerDTO;
+import com.epmet.dto.PaUserDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 根据手机号查询用户信息、客户信息-接口返参
+ * @Author sun
+ */
+@Data
+public class CustomerUserResultDTO implements Serializable {
+	private static final long serialVersionUID = 5214475907074876716L;
+
+	/**
+	 * 用户信息
+	 */
+	private PaUserDTO paUserResult;
+	/**
+	 * 用户对应的客户信息
+	 */
+	private PaCustomerDTO paCustomerResult;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GoToAuthResultDTO.java

@@ -0,0 +1,45 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/10 15:55
+ */
+@Data
+public class GoToAuthResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8759961913652933215L;
+
+    /**
+     * 第三方AppId
+     */
+    @JsonIgnore
+    private String componentAppId;
+
+    /**
+     * 预授权码
+     */
+    @JsonIgnore
+    private String preAuthCode;
+
+    /**
+     * 回调地址【获取 授权码和过期时间】
+     */
+    @JsonIgnore
+    private String redirectUri;
+
+    /**
+     * 客户ID
+     */
+    @JsonIgnore
+    private String customerId;
+
+    /**
+     * 反参：拼好的url，包括回调地址
+     */
+    private String url;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询我的信息-接口返参
+ */
+@Data
+public class MyInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId = "";
+    /**
+     * 组织名称
+     */
+    private String agencyName = "";
+    /**
+     * 组织级别
+     */
+    private String level = "";
+    /**
+     * 省
+     */
+    private String province = "";
+    /**
+     * 市
+     */
+    private String city = "";
+    /**
+     * 区
+     */
+    private String district = "";
+    /**
+     * 党支部数量
+     */
+    private Integer partyBranchNum;
+    /**
+     * 居民端授权状态(0：未授权，1：已授权)
+     */
+    private Integer resiAuthorization;
+    /**
+     * 政府端授权状态(0：未授权，1：已授权)
+     */
+    private Integer workAuthorization;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterInfoResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询公众号注册的客户列表-接口返参
+ */
+@Data
+public class RegisterInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 总记录数
+     */
+    private Integer total;
+    /**
+     * 客户组织列表
+     */
+    private List<CustomerAgencyResultDTO> agencyList;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ResultBean.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/6 9:08
+ */
+@Data
+public class ResultBean implements Serializable {
+
+    private static final long serialVersionUID = -1528288965079007980L;
+
+    private Object data;
+
+    private String msg;
+
+    private String errorMsg;
+
+    private Integer code;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SaveUserResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 授权用户信息时新增或更新用户信息-接口返参
+ */
+@Data
+public class SaveUserResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 新增或已有用户的Id
+     */
+    private String userId;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateAndAppIdResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/15 15:56
+ */
+@Data
+public class TemplateAndAppIdResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3875904833509300177L;
+
+    /**
+     * 模板ID
+     */
+    private String templateId;
+
+    /**
+     * 授权方AppId
+     */
+    private String authAppId;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateListResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/14 15:22
+ */
+@NoArgsConstructor
+@Data
+public class TemplateListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -5545336708096791516L;
+	/**
+	 * 模板 id
+	 */
+	private String templateId;
+	/**
+	 * 模板描述
+	 */
+	private String userDesc;
+	/**
+	 * 模板版本号
+	 */
+	private String userVersion;
+	/**
+	 * 模板创建时间yyyy-mm-dd
+	 */
+	private String createTime;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java

@@ -0,0 +1,62 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/14 16:20
+ */
+@NoArgsConstructor
+@Data
+public class UploadListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -8110308954072076978L;
+	/**
+	 * 代码ID
+	 */
+	private String id;
+	/**
+	 * 客户名
+	 */
+	private String customerId;
+	/**
+	 * 客户名
+	 */
+	private String customerName;
+	/**
+	 * 居民端resi 工作端work
+	 */
+	private String clientType;
+	/**
+	 * 代码描述
+	 */
+	private String codeInfo;
+	/**
+	 * 版本号
+	 */
+	private String version;
+	/**
+	 * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed
+	 */
+	private String status;
+	/**
+	 * 上传时间
+	 */
+	private String uploadTime;
+	/**
+	 * 审核ID
+	 */
+	private String auditId;
+	/**
+	 * 小程序APP ID
+	 */
+	private String appId;
+	/**
+	 * 提交审核时间
+	 */
+	private String auditTime;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/WillOverDueResultDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/9 17:01
+ */
+@Data
+public class WillOverDueResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -9073227815312384742L;
+
+    /**
+     * 授权方令牌
+     */
+    private String authorizerAccessToken;
+
+    /**
+     * 刷新令牌
+     */
+    private String authorizerRefreshToken;
+
+    /**
+     * 授权方AppId
+     */
+    private String authAppId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 客户端类型 resi：居民端，work：工作端
+     */
+    private String clientType;
+
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java

@@ -0,0 +1,52 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.SaveUserVisitedFormDTO;
+import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.SaveUserResultDTO;
+import com.epmet.feign.fallback.EpmetThirdFeignClientFallback;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @Author zxc
+ * @CreateTime 2020/7/5 14:45
+ */
+@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdFeignClientFallback.class)
+
+public interface EpmetThirdFeignClient {
+
+    /**
+     * @param wxMpUser
+     * @return
+     * @Author sun
+     * @Description 根据openId新增或更新用户信息
+     **/
+    @PostMapping(value = "third/pauser/saveuser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<SaveUserResultDTO> saveUser(@RequestBody WxMpUser wxMpUser);
+
+    /**
+     * @param phone
+     * @return
+     * @Author sun
+     * @Description 根据手机号查询公众号用户基本信息，校验用户是否存在
+     **/
+    @PostMapping(value = "third/pauser/checkpauser/{phone}")
+    Result<CustomerUserResultDTO> checkPaUser(@PathVariable("phone") String phone);
+
+    /**
+     * @param visited
+     * @return
+     * @Author sun
+     * @Description 用户登陆，新增访问记录数据
+     **/
+    @PostMapping(value = "third/pauservisited/saveuservisited")
+    Result saveUserVisited(@RequestBody SaveUserVisitedFormDTO visited);
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java

@@ -0,0 +1,34 @@
+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.form.SaveUserVisitedFormDTO;
+import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.SaveUserResultDTO;
+import com.epmet.feign.EpmetThirdFeignClient;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/5 14:46
+ */
+@Component
+public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient {
+
+    @Override
+    public Result<SaveUserResultDTO> saveUser(WxMpUser wxMpUser) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUser", wxMpUser);
+    }
+
+    @Override
+    public Result<CustomerUserResultDTO> checkPaUser(String phone) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "checkPaUser", phone);
+    }
+
+    @Override
+    public Result saveUserVisited(SaveUserVisitedFormDTO visited) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUserVisited", visited);
+    }
+}

epmet-module/epmet-third/epmet-third-server/.gitignore

@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/

epmet-module/epmet-third/epmet-third-server/Dockerfile

@@ -0,0 +1,11 @@
+FROM java:8
+
+RUN export LANG="zh_CN.UTF-8"
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+
+COPY ./target/*.jar ./app.jar
+
+EXPOSE 8110
+
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  epmet-third-server:
+    container_name: epmet-third-server-dev
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.13
+    ports:
+      - "8110:8110"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  epmet-third-server:
+    container_name: epmet-third-server-prod
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.14
+    ports:
+      - "8110:8110"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/prod:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 600M

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@@ -0,0 +1,17 @@
+version: "3.7"
+services:
+  epmet-third-server:
+    container_name: epmet-third-server-test
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.13
+    ports:
+      - "8110:8110"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/test:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -0,0 +1,263 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <version>0.0.14</version>
+
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>epmet-third</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>epmet-third-server</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <aliyun.core.version>3.2.2</aliyun.core.version>
+        <aliyun.dysmsapi.version>1.1.0</aliyun.dysmsapi.version>
+        <qcloud.qcloudsms.version>1.0.5</qcloud.qcloudsms.version>
+        <freemarker.version>2.3.28</freemarker.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>${aliyun.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>${aliyun.dysmsapi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.qcloudsms</groupId>
+            <artifactId>qcloudsms</artifactId>
+            <version>${qcloud.qcloudsms.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>${freemarker.version}</version>
+        </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <!--<version>5.1.1</version>-->
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-common</artifactId>
+            <version>3.6.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-common-clienttoken</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-crm-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>8110</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+
+                <spring.flyway.enabled>false</spring.flyway.enabled>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
+            <properties>
+                <server.port>8110</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
+            <properties>
+                <server.port>8110</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+
+                <spring.flyway.enabled>true</spring.flyway.enabled>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>