Merge remote-tracking branch 'remotes/origin/release'

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.40
+    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.40</version>
+    <version>0.3.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

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

@@ -14,14 +14,6 @@ public interface PublicUserLoginConstant {
 	 * 是否登陆（true false）
 	 */
 	String PARAMETER_EXCEPTION = "是否登陆值错误";
-	/**
-	 * 登陆验证
-	 */
-	String LOGON_EXCEPTION = "该手机号未注册";
-	/**
-	 * 注册验证
-	 */
-	String ZHU_CE_EXCEPTION = "该手机号已注册";
 	/**
 	 * 用户登陆 新增访问记录
 	 */

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

@@ -97,10 +97,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
             logger.error("wxMpUser is null");
             throw new RenException("解析微信用户信息失败 wxMpUser is null");
         }
-        if(StringUtils.isBlank(wxMpUser.getUnionId())){
+        /*if(StringUtils.isBlank(wxMpUser.getUnionId())){
             logger.error("wxMpUser.getUnionId() is  null");
-//            throw new RenException("解析微信用户信息失败");
-        }
+            //            throw new RenException("解析微信用户信息失败");
+        }*/
         return wxMpUser;
     }
 
@@ -121,8 +121,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
     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(wxMpUser.getUnionId());
+        tokenDTO.setUnionId(null == wxMpUser.getUnionId() ? "" : wxMpUser.getUnionId());
         tokenDTO.setToken(token);
         //首次初始化时还没有客户
         tokenDTO.setCustomerId("");
@@ -155,11 +157,11 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         CustomerUserResultDTO ResultDTO = Result.getData();
         //登陆
         if (formDTO.getIsLogon() && null == ResultDTO.getPaUserResult()) {
-            throw new RenException(PublicUserLoginConstant.LOGON_EXCEPTION);
+            throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
         }
         //注册
         if (!formDTO.getIsLogon() && null != ResultDTO.getPaUserResult()) {
-            throw new RenException(PublicUserLoginConstant.ZHU_CE_EXCEPTION);
+            throw new RenException(EpmetErrorCode.MOBILE_USED.getCode());
         }
         //3、发送短信验证码
         SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
@@ -195,7 +197,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         //2.用户不存在时不允许登陆
         PaUserDTO userDTO = resultDTO.getPaUserResult();
         if (null == userDTO || StringUtils.isBlank(userDTO.getId())) {
-            throw new RenException(PublicUserLoginConstant.LOGON_EXCEPTION);
+            throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
         }
 
         //3.校验验证码是否正确

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

@@ -49,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/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-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.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/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.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

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

@@ -294,7 +294,7 @@ spring:
             - Path=${server.servlet.context-path}/third/**
           filters:
             - StripPrefix=1
-            - CpAuth=false
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -409,6 +409,7 @@ epmet:
     - /gov/issue/**
     - /gov/project/**
     - /resi/home/**
+    - /third/**
   swaggerUrls:
 
 jwt:

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

@@ -26,7 +26,7 @@ import lombok.Data;
  * 授权回调url反参表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class AuthCodeDTO implements Serializable {
@@ -43,6 +43,11 @@ public class AuthCodeDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * resi：居民端，work：工作端
+     */
+	private String clientType;
+
     /**
      * 授权方APPID
      */
@@ -54,9 +59,9 @@ public class AuthCodeDTO implements Serializable {
 	private String authCode;
 
     /**
-     * 有效期  10min
+     * 到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
     /**
      * 

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

@@ -26,7 +26,7 @@ import lombok.Data;
  * 授权信息表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class AuthorizationInfoDTO implements Serializable {
@@ -49,14 +49,14 @@ public class AuthorizationInfoDTO implements Serializable {
 	private String authorizerAppid;
 
     /**
-     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）
+     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）【第三方和微信交互使用】
      */
 	private String authorizerAccessToken;
 
     /**
-     * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
+     * 到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
     /**
      * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效

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

@@ -23,68 +23,68 @@ import lombok.Data;
 
 
 /**
- * 获取/刷新接口调用令牌记录表
+ *  公众号/小程序绑定开放平台帐号表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
-public class RefreshAuthorizerAccessTokenDTO implements Serializable {
+public class BindingAccountDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     * id ID
      */
 	private String id;
 
     /**
-     * 授权方令牌
+     * 开放平台账号ID 开放平台账号ID
      */
-	private String authorizerAccessToken;
+	private String openPlatformAccountId;
 
     /**
-     * 有效期，单位：秒
+     * 公众号/小程序APPID（授权方APPID） 授权方APPID
      */
-	private Integer expiresIn;
+	private String authAppId;
 
     /**
-     * 刷新令牌
+     * 客户ID 客户ID
      */
-	private String authorizerRefreshToken;
+	private String customerId;
 
     /**
-     * 授权方APPID
+     * 客户端 居民端：resi，工作端：work
      */
-	private String authAppid;
+	private String clientType;
 
     /**
-     * 客户ID
+     * 
      */
-	private String customerId;
+	private Integer delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	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/ComponentAccessTokenDTO.java

@@ -26,7 +26,7 @@ import lombok.Data;
  * 第三方平台调用凭证
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class ComponentAccessTokenDTO implements Serializable {
@@ -44,9 +44,9 @@ public class ComponentAccessTokenDTO implements Serializable {
 	private String componentAccessToken;
 
     /**
-     * 令牌有效期  单位：s  最长 60*60*2
+     * 令牌到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
     /**
      * 删除状态 0：正常 1：删除

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

@@ -26,7 +26,7 @@ import lombok.Data;
  * 微信发送的ticket表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-08
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class ComponentVerifyTicketDTO implements Serializable {
@@ -41,7 +41,7 @@ public class ComponentVerifyTicketDTO implements Serializable {
     /**
      * 第三方平台ID
      */
-	private String appid;
+	private String componentAppId;
 
     /**
      * component_verify_ticket

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

@@ -51,7 +51,7 @@ public class CustomerMpDTO implements Serializable {
     /**
      * 小程序的appId
      */
-	private Integer appId;
+	private String appId;
 
     /**
      * 是否已经授权 0：未授权，1：已授权

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

@@ -26,7 +26,7 @@ import lombok.Data;
  * 授权给开发者的权限集列表	
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class FuncInfoDTO implements Serializable {

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/AuthorizerRefreshTokenDTO.java → epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java

@@ -23,35 +23,41 @@ import lombok.Data;
 
 
 /**
- * 授权方的刷新令牌表
+ *  开放平台账号表
+
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
-public class AuthorizerRefreshTokenDTO implements Serializable {
+public class OpenPlatformAccountDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * id ID
      */
 	private String id;
 
     /**
-     * 授权方的刷新令牌
+     * openId 所创建的开放平台帐号的 appid
      */
-	private String authorizerRefreshToken;
+	private String openAppId;
 
     /**
-     * 授权方appid
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 
      */
-	private String authorizerAppid;
+	private Integer delFlag;
 
     /**
-     * 删除标识 0-否，1-是
+     * 乐观锁
      */
-	private String delFlag;
+	private Integer revision;
 
     /**
      * 创建人

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

@@ -43,6 +43,11 @@ public class PaCustomerDTO implements Serializable {
      */
 	private String customerName;
 
+    /**
+     * 是否已经完成客户信息初始化 0：未初始化，1：已初始化
+     */
+    private Integer isInitialize;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

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/PreAuthTokenDTO.java

@@ -26,7 +26,7 @@ import lombok.Data;
  * 预授权码历史记录表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 public class PreAuthTokenDTO implements Serializable {
@@ -44,9 +44,9 @@ public class PreAuthTokenDTO implements Serializable {
 	private String preAuthToken;
 
     /**
-     * 预授权码有效期  单位：s  最长 60*60*2
+     * 预授权码有效期  
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
     /**
      * 删除状态 0：正常 1：删除

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

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -18,6 +19,11 @@ public class AuthCodeFormDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * resi：居民端，work：工作端
+     */
+    private String clientType;
+
     /**
      * 授权方AppId
      */
@@ -31,7 +37,7 @@ public class AuthCodeFormDTO implements Serializable {
     /**
      * 有效期  10min
      */
-    private Integer expiresIn;
+    private Date expiresInTime;
 
     /**
      * 删除状态 0：正常  1：已删除

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

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -31,7 +32,7 @@ public class AuthorizationInfoFormDTO implements Serializable {
     /**
      * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
      */
-    private Integer expiresIn;
+    private Date expiresInTime;
 
     /**
      * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效
@@ -39,8 +40,10 @@ public class AuthorizationInfoFormDTO implements Serializable {
     private String authorizerRefreshToken;
 
     /**
-     *
+     * 客户端类型 resi：居民端，work：工作端
      */
+    private String clientType;
+
     private Integer delFlag = 0;
 
     private String createdBy = "APP_USER";

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

@@ -22,7 +22,7 @@ public class AuthorizerAccessTokenFormDTO implements Serializable {
     /**
      * 有效期，单位：秒
      */
-    private Integer expiresIn;
+    private Date expiresInTime;
 
     /**
      * 刷新令牌

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/ComponentAccessTokenFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -21,7 +22,7 @@ public class ComponentAccessTokenFormDTO implements Serializable {
     /**
      * 令牌有效期  单位：s  最长 60*60*2
      */
-    private Integer expiresIn;
+    private Date expiresInTime;
 
     /**
      * 删除状态 0：正常 1：删除

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

@@ -22,7 +22,7 @@ public class ComponentVerifyTicketFormDTO implements Serializable {
     /**
      * 第三方平台ID
      */
-    private String appid;
+    private String componentAppId;
 
     /**
      * component_verify_ticket

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/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

@@ -20,7 +20,7 @@ public class MyInfoFormDTO implements Serializable {
     /**
      * 客户Id
      */
-    @NotBlank(message = "客户Id不能为空", groups = {MyInfoFormDTO.AddUserInternalGroup.class})
+    //@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

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -21,7 +22,7 @@ public class PreAuthTokenFormDTO implements Serializable {
     /**
      * 预授权码有效期  单位：s  最长 60*60*2
      */
-    private Integer expiresIn;
+    private Date expiresInTime;
 
     /**
      * 删除状态 0：正常 1：删除

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/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

@@ -29,7 +29,7 @@ public class AuthorizationInfoResultDTO implements Serializable {
     /**
      * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
      */
-    private Integer expires_in;
+    private String expires_in;
 
     /**
      * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_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/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/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/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/WillOverDueResultDTO.java

@@ -33,5 +33,10 @@ public class WillOverDueResultDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 客户端类型 resi：居民端，work：工作端
+     */
+    private String clientType;
+
 
 }

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

@@ -2,7 +2,7 @@ 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.6
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.11
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.6</version>
+    <version>0.0.11</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java

@@ -16,7 +16,10 @@ public interface ModuleConstant {
     String INFO_TYPE = "InfoType";
     String TICKET_UNDERLINE_KEY = "component_verify_ticket";
     String TICKET_KEY = "ComponentVerifyTicket";
+    String APP_ID = "AppId";
+    String AUTHORIZATION_CODE_HUMP = "AuthorizationCode";
     String UNAUTHORIZED = "unauthorized";
+    String AUTHORIZED = "authorized";
     String NULL_CHAR = "";
     String SUCCESS = "success";
 
@@ -40,6 +43,40 @@ public interface ModuleConstant {
 
     //授权回调URL 如下
     String AUTH_CODE = "auth_code";
+    String ERR_CODE = "errcode";
+    String ERR_MSG = "errmsg";
+    String OPEN_APP_ID = "open_appid";
+    String LOW_APP_ID = "appid";
+
+    String CUSTOMER_ID = "customerId";
+    String CLIENT = "client";
+
+    //创建开放平台账号
+    String ACCESS_TOKEN = "access_token";
+
+    //获取并保存授权方账号基本信息 如下
+    String COMPONENT_APP_ID = "component_appid";
+    String AUTHORIZER_APP_ID = "authorizer_appid";
+    String AUTHORIZER_INFO = "authorizer_info";
+    String MINI_PROGRAM_INFO = "miniprograminfo";
+    String BUSINESS_INFO = "business_info";
+    String CATEGORIES = "categories";
+    String NETWORK = "network";
+
+    //代码审核结果推送 如下
+    String EVENT = "Event";
+    String WEAPP_AUDIT_SUCCESS = "weapp_audit_success"; //审核通过
+    String WEAPP_AUDIT_FAIL = "weapp_audit_fail"; //审核不通过
+    String WEAPP_AUDIT_DELAY = "weapp_audit_delay"; //审核延后
+    String DELAY = "delay";
+    String AUDIT_SUCCESS = "audit_success";
+    String AUDIT_FAILED = "audit_failed";
+
+    int FORTY_THOUSAND_AND_THIRTEEN = 40013;
+    int EIGHTY_NINE_THOUSAND = 89000;
+    int EIGHTY_NINE_THOUSAND_AND_ONE = 89001;
+    int EIGHTY_NINE_THOUSAND_AND_THREE = 89003;
+    int EIGHTY_NINE_THOUSAND_AND_FOUR = 89004;
 
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/TencentAuthTypeConstant.java

@@ -0,0 +1,33 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/13 9:08
+ */
+public interface TencentAuthTypeConstant {
+
+    /**
+     * 公众号认证类型
+     */
+    String AUTH_MINUS_ONE = "未认证";
+    String AUTH_ZERO = "微信认证";
+    String AUTH_ONE = "新浪微博认证";
+    String AUTH_TWO = "腾讯微博认证";
+    String AUTH_THREE = "已资质认证通过但还未通过名称认证";
+    String AUTH_FOUR = "已资质认证通过、还未通过名称认证，但通过了新浪微博认证";
+    String AUTH_FIVE = "已资质认证通过、还未通过名称认证，但通过了腾讯微博认证";
+
+    /**
+     * 公众号类型
+     */
+    String ZERO = "订阅号";
+    String ONE = "由历史老帐号升级后的订阅号";
+    String TWO = "服务号";
+
+    /**
+     * 小程序认证类型
+     */
+    String MINI_AUTH_MINUS_ONE = "未认证";
+    String MINI_AUTH_ZERO = "微信认证";
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdApiConstant.java

@@ -7,7 +7,7 @@ package com.epmet.constant;
 public interface ThirdApiConstant {
 
     /**
-     *
+     * 获取预授权码
      */
     String API_CREATE_PREAUTHCODE_URL = "https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode";
 
@@ -23,4 +23,37 @@ public interface ThirdApiConstant {
 
     String API_AUTHORIZER_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token";
 
+    /**
+     * 授权回调url
+     */
+    String API_REDIRECT_URL = "https://epmet-dev.elinkservice.cn/api/third/redirectauthcode";
+
+    /**
+     * 反参授权回调url
+     */
+    String API_RETURN_REDIRECT_URL = "https://epmet-dev.elinkservice.cn/api/third/redirectauthcode?client=%s&customerId=%s";
+
+    /**
+     * 授权注册页面扫码授权
+     * component_appid:第三方AppId
+     * pre_auth_code：预授权码
+     * redirect_uri：回调url（获取授权码）
+     */
+    String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
+
+    /**
+     * 创建开放平台帐号并绑定公众号/小程序
+     */
+    String API_CREATE_OPEN = "https://api.weixin.qq.com/cgi-bin/open/create";
+
+    /**
+     * 公众号/小程序绑定到开放平台帐号下
+     */
+    String API_BIND_OPEN = "https://api.weixin.qq.com/cgi-bin/open/bind?";
+
+    /**
+     * 获取授权方的帐号基本信息
+     */
+    String API_GET_AUTHORIZER_INFO = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info";
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdPlatformConstant.java

@@ -9,12 +9,12 @@ public interface ThirdPlatformConstant {
     /**
      * 第三方平台appId
      */
-    String PLATFORM_APP_ID = "****************";
+//    String PLATFORM_APP_ID = "****************";
 
     /**
      * 第三方平台 secret
      */
-    String PLATFORM_APP_SECRET = "****************";
+//    String PLATFORM_APP_SECRET = "****************";
 
     /**
      * 第三方平台 消息加解密Key
@@ -24,6 +24,6 @@ public interface ThirdPlatformConstant {
     /**
      * 第三方平台 消息校验Token
      */
-    String PLATFORM_COMPONENT_TOKEN = "****************";
+//    String PLATFORM_COMPONENT_TOKEN = "****************";
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRedisKeyConstant.java

@@ -27,7 +27,12 @@ public interface ThirdRedisKeyConstant {
     String ACCESS_TOKEN_REDIS_KEY = "epmet:wechartthird:componentaccesstoken";
 
     /**
-     * authorizer_refresh_token 刷新令牌，获取授权信息时得到
+     * authorizer_refresh_token 刷新令牌，获取授权信息时得到 第三方和微信交互使用的
+     */
+    String THIRD_AUTHORIZER_REFRESH_TOKEN_REDIS_KEY = "epmet:wechartthird:thirdauthorizerrefreshtoken";
+
+    /**
+     * 第三方 和 授权方交互使用的
      */
     String AUTHORIZER_REFRESH_TOKEN_REDIS_KEY = "epmet:wechartthird:authorizerrefreshtoken";
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java

@@ -46,4 +46,38 @@ public interface ThirdRunTimeInfoConstant {
 
     String END_GET_AUTH_INFO = "=====================结束获取【authorization_info】=====================";
 
+    String CREATE_AND_BIND_SUCCESS = "创建开放平台帐号并绑定公众号/小程序";
+
+    String BIND_SUCCESS = "绑定公众号/小程序到开放平台";
+
+    /**
+     * 对应错误码：-1
+     */
+    String SYSTEM_ERROR = "系统错误";
+
+    /**
+     * 对应错误码：40013
+     */
+    String INVALID_APP_ID = "appId 或 openAppId 无效";
+
+    /**
+     * 对应错误码：89000
+     */
+    String ACCOUNT_HAS_BOUND_OPEN = "该公众号/小程序 已经绑定了开放平台帐号";
+
+    /**
+     * 对应错误码：89001
+     */
+    String NOT_SAME_CONTRACTOR  = "Authorizer 与开放平台帐号主体不相同";
+
+    /**
+     * 对应错误码：89003
+     */
+    String NOT_ALLOWED_OPERATE = "该开放平台帐号并非通过 api 创建，不允许操作";
+
+    /**
+     * 对应错误码：89004
+     */
+    String TO_LIMIT = "该开放平台帐号所绑定的公众号/小程序已达上限（100 个）";
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java

@@ -0,0 +1,39 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.GoToAuthFormDTO;
+import com.epmet.dto.result.GoToAuthResultDTO;
+import com.epmet.service.AppLetAuthorizationService;
+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 zxc
+ * @CreateTime 2020/7/10 15:48
+ */
+@RestController
+@RequestMapping("auth")
+public class AppLetAuthorizationController {
+
+    @Autowired
+    private AppLetAuthorizationService appLetAuthorizationService;
+
+    /**
+     * @Description  小程序点击“去授权”的时候
+     * @param tokenDto
+     * @author zxc
+     */
+    @PostMapping("gotoauth")
+    public Result<GoToAuthResultDTO> goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO);
+        return new Result().ok(goToAuthResultDTO);
+    }
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java

@@ -1,12 +1,10 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.ComponentVerifyTicketService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,8 +26,9 @@ public class AuthRedirectController {
      * @param
      * @author zxc
      */
-    public Result redirectUri(HttpServletRequest request, HttpServletResponse response, @LoginUser TokenDto tokenDto, @RequestParam("authAppId")String authAppId){
-        componentVerifyTicketService.redirectUri(request,response,tokenDto,authAppId);
+    @GetMapping("redirect")
+    public Result redirectUri(HttpServletRequest request, HttpServletResponse response){
+        componentVerifyTicketService.redirectUri(request,response);
         return new Result();
     }
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -8,6 +9,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.form.CreateAgencyFormDTO;
 import com.epmet.dto.form.MyInfoFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
+import com.epmet.dto.form.RegisterInfoFormDTO;
 import com.epmet.dto.result.AgencyLevelListResultDTO;
 import com.epmet.dto.result.CreateAgencyResultDTO;
 import com.epmet.dto.result.MyInfoResultDTO;
@@ -85,8 +87,21 @@ public class PaCustomerController {
      **/
     @PostMapping("myinfo")
     public Result<MyInfoResultDTO> myInfo(@LoginUser TokenDto tokenDTO, @RequestBody MyInfoFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyInfoFormDTO.AddUserInternalGroup.class);
-        return new Result<MyInfoResultDTO>().ok(paCustomerService.myInfo(formDTO));
+        //ValidatorUtils.validateEntity(formDTO, MyInfoFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<MyInfoResultDTO>().ok(paCustomerService.myInfo(tokenDTO, formDTO));
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    @PostMapping("registerinfo")
+    public Result<PageData> registerInfo(@LoginUser TokenDto tokenDTO, @RequestBody RegisterInfoFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<PageData>().ok(paCustomerService.registerInfo(formDTO));
     }
 
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.ComponentVerifyTicketService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
  * @Author zxc
  * @CreateTime 2020/7/8 15:06
  */
+@Slf4j
 @RestController
 @RequestMapping("wechatthird")
 public class WeChatNotifyController {
@@ -24,7 +26,9 @@ public class WeChatNotifyController {
      */
     @PostMapping("componentaccesstoken")
     public Result getComponentAccessToken() {
+        log.info("开始获取【component_access_token】......");
         componentVerifyTicketService.getComponentAccessToken();
+        log.info("已成功获取到【component_access_token】......");
         return new Result();
     }
 
@@ -45,7 +49,9 @@ public class WeChatNotifyController {
      */
     @PostMapping("refreshtoken")
     public Result refreshToken(){
+        log.info("开始刷新/获取接口调用令牌......");
         componentVerifyTicketService.refreshToken();
+        log.info("刷新/获取接口调用令牌......成功了");
         return new Result();
     }
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthCodeDao.java

@@ -19,8 +19,10 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.AuthCodeFormDTO;
+import com.epmet.dto.result.AuthCodeResultDTO;
 import com.epmet.entity.AuthCodeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 授权回调url反参表
@@ -31,6 +33,27 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface AuthCodeDao extends BaseDao<AuthCodeEntity> {
 
+    /**
+     * @Description  插入 授权码
+     * @param formDTO
+     * @author zxc
+     */
     void insertRedirectAuthCode(AuthCodeFormDTO formDTO);
 
+    /**
+     * @Description  根据authCode查询客户ID和客户端类型
+     * @param authCode
+     * @author zxc
+     */
+    AuthCodeResultDTO selectCustomerIdByAuthCode(@Param("authCode")String authCode);
+
+    /**
+     * @Description  回填 auth_code表 authAppId
+     * @param customerId
+     * @param clientType
+     * @param authAppId
+     * @author zxc
+     */
+    void updateAppId(@Param("customerId")String customerId,@Param("clientType")String clientType,@Param("authAppId")String authAppId);
+	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizerRefreshTokenDao.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthResultRecordDao.java

@@ -18,16 +18,16 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.AuthorizerRefreshTokenEntity;
+import com.epmet.entity.AuthResultRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 授权方的刷新令牌表
+ * 授权结果记录表 
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-08
+ * @since v1.0.0 2020-07-15
  */
 @Mapper
-public interface AuthorizerRefreshTokenDao extends BaseDao<AuthorizerRefreshTokenEntity> {
+public interface AuthResultRecordDao extends BaseDao<AuthResultRecordEntity> {
 	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java

@@ -19,10 +19,14 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.AuthorizationInfoFormDTO;
+import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
+import com.epmet.dto.result.WillOverDueResultDTO;
 import com.epmet.entity.AuthorizationInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 授权信息表
  *
@@ -44,6 +48,27 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
      * @param customerId
      * @author zxc
      */
-    void updateOldAuthorizationInfo(@Param("customerId")String customerId);
+    void updateOldAuthorizationInfo(@Param("customerId")String customerId,@Param("clientType")String clientType);
+
+    /**
+     * @Description  查询即将过期的 authorizer_access_token
+     * @param
+     * @author zxc
+     */
+    List<WillOverDueResultDTO> checkWillOverDue();
+
+    /**
+     * @Description  插入 authorizer_access_token
+     * @param refreshAccessToken
+     * @author zxc
+     */
+    void insertAuthorizerAccessToken(AuthorizerAccessTokenFormDTO refreshAccessToken);
+
+    /**
+     * @Description  逻辑删除 授权方的authorizer_access_token
+     * @param customerId
+     * @author zxc
+     */
+    void updateOldAuthorizerAccessToken(@Param("customerId")String customerId,@Param("clientType")String clientType);
 	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BindingAccountDao.java

@@ -0,0 +1,41 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.BindingAccountFormDTO;
+import com.epmet.entity.BindingAccountEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *  公众号/小程序绑定开放平台帐号表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface BindingAccountDao extends BaseDao<BindingAccountEntity> {
+
+    /**
+     * @Description  插入 公众号/小程序绑定开放平台帐号表
+     * @param formDTO
+     * @author zxc
+     */
+    void insertBindingAccount(BindingAccountFormDTO formDTO);
+	
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/BusinessInfoDao.java

@@ -0,0 +1,44 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.BusinessInfoFormDTO;
+import com.epmet.entity.BusinessInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 功能开通状况表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface BusinessInfoDao extends BaseDao<BusinessInfoEntity> {
+
+    /**
+     * @Description  功能开通信息插入
+     * @param businessInfoList
+     * @author zxc
+     */
+    void insertBusinessInfo(@Param("businessInfoList") List<BusinessInfoFormDTO> businessInfoList);
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditRecordDao.java

@@ -0,0 +1,41 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.CodeAuditRecordFormDTO;
+import com.epmet.entity.CodeAuditRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 代码审核记录表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-15
+ */
+@Mapper
+public interface CodeAuditRecordDao extends BaseDao<CodeAuditRecordEntity> {
+
+    /**
+     * @Description  插入代码审核结果
+     * @param formDTO
+     * @author zxc
+     */
+    void insertCodeAuditRecord(CodeAuditRecordFormDTO formDTO);
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java

@@ -20,9 +20,10 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.CodeAuditResultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
- * 代码审核j结果 
+ * 代码审核结果
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -30,4 +31,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CodeAuditResultDao extends BaseDao<CodeAuditResultEntity> {
 
+    /**
+     * @Description  更新 代码审核结果中的审核状态
+     * @param customerId
+     * @param codeCustomerId
+     * @author zxc
+     */
+    void updateAuditResult(@Param("customerId")String customerId,@Param("codeCustomerId")String codeCustomerId,@Param("codeResult")String codeResult);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java

@@ -18,8 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.CodeAuditRecordFormDTO;
+import com.epmet.dto.result.TemplateAndAppIdResultDTO;
 import com.epmet.entity.CodeCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 客户代码关联表 
@@ -30,4 +33,19 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CodeCustomerDao extends BaseDao<CodeCustomerEntity> {
 
+    /**
+     * @Description  根据客户id和客户端类型获取 代码模板ID和授权方AppId
+     * @param customerId
+     * @param clientType
+     * @author zxc
+     */
+    TemplateAndAppIdResultDTO selectTemplateAndAppId(@Param("customerId")String customerId,@Param("clientType")String clientType);
+
+    /**
+     * @Description  查询 code_customer 表ID
+     * @param codeAuditRecord
+     * @author zxc
+     */
+    String selectCodeCustomerId(CodeAuditRecordFormDTO codeAuditRecord);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java

@@ -22,6 +22,8 @@ import com.epmet.dto.form.ComponentAccessTokenFormDTO;
 import com.epmet.entity.ComponentAccessTokenEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 第三方平台调用凭证
  *
@@ -38,6 +40,25 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
      */
     void insertComponentAccessToken(ComponentAccessTokenFormDTO formDTO);
 
+    /**
+     * @Description  逻辑删除旧的 component_access_token信息
+     * @param
+     * @author zxc
+     */
     void updateOldComponentAccessToken();
 
+    /**
+     * @Description  查询component_access_token 数量
+     * @param
+     * @author zxc
+     */
+    Integer selectAccessTokenCount();
+
+    /**
+     * @Description  查询即将过期【component_access_token】的数量
+     * @param
+     * @author zxc
+     */
+    Integer selectWillOverTokenCount();
+	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentVerifyTicketDao.java

@@ -31,6 +31,18 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ComponentVerifyTicketDao extends BaseDao<ComponentVerifyTicketEntity> {
 
+    /**
+     * @Description  插入 票据【component_verify_ticket】
+     * @param formDTO
+     * @author zxc
+     */
     void insertComponentVerifyTicket(ComponentVerifyTicketFormDTO formDTO);
 
+    /**
+     * @Description  逻辑删除 【component_verify_ticket】
+     * @param
+     * @author zxc
+     */
+    void updateOldComponentVerifyTicket();
+	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java

@@ -19,11 +19,13 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerMpDTO;
+import com.epmet.dto.form.AuthCodeFormDTO;
 import com.epmet.entity.CustomerMpEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 客户小程序关系表
@@ -41,4 +43,42 @@ public interface CustomerMpDao extends BaseDao<CustomerMpEntity> {
      * @Description 查询客户小程序授权结果信息
      **/
     List<CustomerMpDTO> selectByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description 查询所有客户小程序的授权信息
+     **/
+    List<CustomerMpDTO> selectAll();
+
+    /**
+     * @Description  查询授权的数量
+     * @param customerId
+     * @author zxc
+     */
+    Integer selectAuthCount(@Param("customerId")String customerId);
+
+    /**
+     * @Description  回填customer_mp的appId
+     * @param formDTO
+     * @author zxc
+     */
+    void updateAppIDByCustomerIdAndClient(AuthCodeFormDTO formDTO);
+
+    /**
+     * @Description  修改小程序授权的状态
+     * @param authAppId
+     * @author zxc
+     */
+    void updateAuthorizationFlag(@Param("authAppId")String authAppId);
+
+    /**
+     * @Description  根据 客户Id和授权方AppId查询clientType
+     * @param customerId
+     * @param authAppId
+     * @author zxc
+     */
+    String selectClientTypeByCustomerIdAndAuthId(@Param("customerId")String customerId,@Param("authAppId")String authAppId);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniCategoryInfoDao.java

@@ -0,0 +1,44 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.MiniCategoryInfoFormDTO;
+import com.epmet.entity.MiniCategoryInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 小程序配置类目信息表 小程序配置类目信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface MiniCategoryInfoDao extends BaseDao<MiniCategoryInfoEntity> {
+
+    /**
+     * @Description  小程序配置的类目信息插入
+     * @param miniCategoryInfoList
+     * @author zxc
+     */
+    void insertCategoryInfo(@Param("miniCategoryInfoList") List<MiniCategoryInfoFormDTO> miniCategoryInfoList);
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniInfoDao.java

@@ -0,0 +1,50 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.MiniInfoFormDTO;
+import com.epmet.dto.result.CustomerIdAndClientResultDTO;
+import com.epmet.entity.MiniInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *  小程序信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface MiniInfoDao extends BaseDao<MiniInfoEntity> {
+
+    /**
+     * @Description  插入小程序信息
+     * @param formDTO
+     * @author zxc
+     */
+    void insertMiniInfo(MiniInfoFormDTO formDTO);
+
+    /**
+     * @Description  根据原始ID查询  customerId 和 clientType
+     * @param toUserName
+     * @author zxc
+     */
+    CustomerIdAndClientResultDTO selectCustomerIdAndClientByToUserName(@Param("toUserName")String toUserName);
+	
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MiniNetworkInfoDao.java

@@ -0,0 +1,44 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.MiniNetworkInfoFormDTO;
+import com.epmet.entity.MiniNetworkInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 小程序配置合法域名信息表 小程序配置合法域名信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface MiniNetworkInfoDao extends BaseDao<MiniNetworkInfoEntity> {
+
+    /**
+     * @Description 小程序配置的合法域名信息插入
+     * @param networkInfoList
+     * @author zxc
+     */
+    void insertNetworkInfo(@Param("networkInfoList") List<MiniNetworkInfoFormDTO> networkInfoList);
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/RefreshAuthorizerAccessTokenDao.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java

@@ -18,42 +18,34 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
-import com.epmet.dto.result.WillOverDueResultDTO;
-import com.epmet.entity.RefreshAuthorizerAccessTokenEntity;
+import com.epmet.dto.form.CreateOpenFormDTO;
+import com.epmet.dto.result.CreateOpenResultDTO;
+import com.epmet.entity.OpenPlatformAccountEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
- * 获取/刷新接口调用令牌记录表
+ *  开放平台账号表
+
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-08
+ * @since v1.0.0 2020-07-13
  */
 @Mapper
-public interface RefreshAuthorizerAccessTokenDao extends BaseDao<RefreshAuthorizerAccessTokenEntity> {
-
-    /**
-     * @Description  查询即将过期的 authorizer_access_token
-     * @param
-     * @author zxc
-     */
-    List<WillOverDueResultDTO> checkWillOverDue();
+public interface OpenPlatformAccountDao extends BaseDao<OpenPlatformAccountEntity> {
 
     /**
-     * @Description  插入 authorizer_access_token
-     * @param refreshAccessToken
+     * @Description  插入开放平台账号
+     * @param coForm
      * @author zxc
      */
-    void insertAuthorizerAccessToken(AuthorizerAccessTokenFormDTO refreshAccessToken);
+    void insertOpenPlatFormAccount(CreateOpenFormDTO coForm);
 
     /**
-     * @Description  逻辑删除 授权方的authorizer_access_token
+     * @Description  根据客户Id查询已绑定开放平台的账号ID
      * @param customerId
      * @author zxc
      */
-    void updateOldAuthorizerAccessToken(@Param("customerId")String customerId);
+    String selectOpenAppIdByCustomerId(@Param("customerId")String customerId);
 	
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.PaCustomerDTO;
+import com.epmet.dto.result.CustomerAgencyResultDTO;
 import com.epmet.entity.PaCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +42,12 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
      * @Description 公众号-根据userId查询用户对应的客户信息
      **/
     List<PaCustomerDTO> selectCustomerByUserId(@Param("userId") String userId);
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    List<CustomerAgencyResultDTO> registerInfo();
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java

@@ -18,8 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.entity.PaCustomerUserAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户组织关系表
@@ -30,4 +32,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PaCustomerUserAgencyDao extends BaseDao<PaCustomerUserAgencyEntity> {
 
+    /**
+     * @param userId
+     * @return
+     * @Author sun
+     * @Description 根据userId查询客户信息
+     **/
+    PaCustomerUserAgencyDTO selectByUserId(@Param("userId") String userId);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaInfoDao.java

@@ -0,0 +1,42 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.PaInfoFormDTO;
+import com.epmet.entity.PaInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 公众号信息表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-13
+ */
+@Mapper
+public interface PaInfoDao extends BaseDao<PaInfoEntity> {
+
+    /**
+     * @Description  公众号信息插入
+     * @param formDTO
+     * @author zxc
+     */
+    void insertPaInfo(PaInfoFormDTO formDTO);
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthCodeEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 授权回调url反参表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -43,6 +43,11 @@ public class AuthCodeEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+    /**
+     * resi：居民端，work：工作端
+     */
+	private String clientType;
+
     /**
      * 授权方APPID
      */
@@ -54,8 +59,8 @@ public class AuthCodeEntity extends BaseEpmetEntity {
 	private String authCode;
 
     /**
-     * 有效期  10min
+     * 到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthResultRecordEntity.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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 授权结果记录表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("auth_result_record")
+public class AuthResultRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户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;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizationInfoEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 授权信息表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -49,14 +49,14 @@ public class AuthorizationInfoEntity extends BaseEpmetEntity {
 	private String authorizerAppid;
 
     /**
-     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）
+     * 	接口调用令牌（在授权的公众号/小程序具备 API 权限时，才有此返回值）【第三方和微信交互使用】
      */
 	private String authorizerAccessToken;
 
     /**
-     * authorizer_access_token 的有效期（在授权的公众号/小程序具备API权限时，才有此返回值），单位：秒
+     * 到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
     /**
      * 刷新令牌（在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/RefreshAuthorizerAccessTokenEntity.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BindingAccountEntity.java

@@ -26,41 +26,36 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 获取/刷新接口调用令牌记录表
+ *  公众号/小程序绑定开放平台帐号表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("refresh_authorizer_access_token")
-public class RefreshAuthorizerAccessTokenEntity extends BaseEpmetEntity {
+@TableName("binding_account")
+public class BindingAccountEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 授权方令牌
+     * 开放平台账号ID 开放平台账号ID
      */
-	private String authorizerAccessToken;
+	private String openPlatformAccountId;
 
     /**
-     * 有效期，单位：秒
+     * 公众号/小程序APPID（授权方APPID） 授权方APPID
      */
-	private Integer expiresIn;
+	private String authAppId;
 
     /**
-     * 刷新令牌
+     * 客户ID 客户ID
      */
-	private String authorizerRefreshToken;
-
-    /**
-     * 授权方APPID
-     */
-	private String authAppid;
+	private String customerId;
 
     /**
-     * 客户ID
+     * 客户端 居民端：resi，工作端：work
      */
-	private String customerId;
+	private String clientType;
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BusinessInfoEntity.java

@@ -0,0 +1,66 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 功能开通状况表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("business_info")
+public class BusinessInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 客户端类型  resi：居民端，work：工作端
+	 */
+	private String clientType;
+
+    /**
+     * 主表ID 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 功能类型 open_store：是否开通微信门店功能 open_scan：是否开通微信扫商品功能 open_pay：是否开通微信支付功能 open_card：是否开通微信卡券功能 open_shake：是否开通微信摇一摇功能
+     */
+	private String funcType;
+
+    /**
+     * 开通状态 0：未开通，1：已开通
+     */
+	private Integer openStatus;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditRecordEntity.java

@@ -0,0 +1,114 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 代码审核记录表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("code_audit_record")
+public class CodeAuditRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户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;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentAccessTokenEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 第三方平台调用凭证
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -44,8 +44,8 @@ public class ComponentAccessTokenEntity extends BaseEpmetEntity {
 	private String componentAccessToken;
 
     /**
-     * 令牌有效期  单位：s  最长 60*60*2
+     * 令牌到期时间
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentVerifyTicketEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 微信发送的ticket表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-08
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java

@@ -51,7 +51,7 @@ public class CustomerMpEntity extends BaseEpmetEntity {
     /**
      * 小程序的appId
      */
-	private Integer appId;
+	private String appId;
 
     /**
      * 是否已经授权 0：未授权，1：已授权

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FuncInfoEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 授权给开发者的权限集列表	
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniCategoryInfoEntity.java

@@ -0,0 +1,66 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小程序配置类目信息表 小程序配置类目信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("mini_category_info")
+public class MiniCategoryInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 客户端类型  resi：居民端，work：工作端
+	 */
+	private String clientType;
+
+    /**
+     * 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 类目排序 first , second
+     */
+	private String categorySort;
+
+    /**
+     * 类目名称 资讯，文娱......
+     */
+	private String categoryName;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniInfoEntity.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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ *  小程序信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("mini_info")
+public class MiniInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户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;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniNetworkInfoEntity.java

@@ -0,0 +1,66 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小程序配置合法域名信息表 小程序配置合法域名信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("mini_network_info")
+public class MiniNetworkInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 客户端类型  resi：居民端，work：工作端
+	 */
+	private String clientType;
+
+    /**
+     * 主表ID 主表ID
+     */
+	private String primaryId;
+
+    /**
+     * 类型
+     */
+	private String networkType;
+
+    /**
+     * 域名 RequestDomain，WsRequestDomain，UploadDomain，DownloadDomain
+     */
+	private String url;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizerRefreshTokenEntity.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/OpenPlatformAccountEntity.java

@@ -26,26 +26,27 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 授权方的刷新令牌表
+ *  开放平台账号表
+
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("authorizer_refresh_token")
-public class AuthorizerRefreshTokenEntity extends BaseEpmetEntity {
+@TableName("open_platform_account")
+public class OpenPlatformAccountEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 授权方的刷新令牌
+     * openId 所创建的开放平台帐号的 appid
      */
-	private String authorizerRefreshToken;
+	private String openAppId;
 
     /**
-     * 授权方appid
+     * 客户ID 客户ID
      */
-	private String authorizerAppid;
+	private String customerId;
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java

@@ -43,4 +43,9 @@ public class PaCustomerEntity extends BaseEpmetEntity {
      */
 	private String customerName;
 
+    /**
+     * 是否已经完成客户信息初始化 0：未初始化，1：已初始化
+     */
+	private Integer isInitialize;
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaInfoEntity.java

@@ -0,0 +1,99 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 公众号信息表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pa_info")
+public class PaInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户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;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PreAuthTokenEntity.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * 预授权码历史记录表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-07-09
+ * @since v1.0.0 2020-07-14
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -44,8 +44,8 @@ public class PreAuthTokenEntity extends BaseEpmetEntity {
 	private String preAuthToken;
 
     /**
-     * 预授权码有效期  单位：s  最长 60*60*2
+     * 预授权码有效期  
      */
-	private Integer expiresIn;
+	private Date expiresInTime;
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/CustomerMpExcel.java

@@ -41,7 +41,7 @@ public class CustomerMpExcel {
     private String client;
 
     @Excel(name = "小程序的appId")
-    private Integer appId;
+    private String appId;
 
     @Excel(name = "是否已经授权：0.未授权 1.已授权")
     private Integer authorizationFlag;