From 06cee963139662f9cfa25bed7fb2067ff4fe488a Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Sat, 5 Oct 2024 12:54:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=201.?= =?UTF-8?q?=E5=BC=95=E5=85=A5JSON=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=202.=E7=BC=96=E5=86=99XML=E5=92=8CJSON=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E5=85=B7=E7=B1=BB=203.=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81boot=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E4=BE=BF=E4=BA=8E=E5=90=8E=E7=BB=AD?= =?UTF-8?q?boot=E9=A1=B9=E7=9B=AE=E8=87=AA=E8=BA=AB=E6=8E=A5=E7=AE=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=204.=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E7=9B=AE=E5=BD=95=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4?= =?UTF-8?q?=205.=E6=94=AF=E6=8C=81=E6=8E=A5=E6=94=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=90=8E=E8=BD=AC=E5=8F=91=E6=B6=88=E6=81=AF=206.=E6=89=93?= =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clients/java/wechat-ferry-mvn/README.MD | 21 +- clients/java/wechat-ferry-mvn/pom.xml | 83 +- .../wechat/ferry/config/ErrorPageConfig.java | 28 + .../ferry/config/WeChatConfiguration.java | 2 +- .../ferry/config/WeChatFerryProperties.java | 37 + .../com/wechat/ferry/config/WebConfig.java | 33 + .../java/com/wechat/ferry/constant/.gitkeep | 3 + .../ferry/controller/WeChatDllController.java | 199 +- .../dto/{WxMsgDTO.java => WxPpMsgDTO.java} | 4 +- .../java/com/wechat/ferry/entity/po/.gitkeep | 3 + .../ferry/entity/{po => proto}/Wcf.java | 5810 +++++++++++------ .../entity/vo/request/WxPpDatabaseSqlReq.java | 29 + .../vo/request/WxPpDatabaseTableReq.java | 23 + .../entity/vo/request/WxPpGroupMemberReq.java | 23 + .../entity/vo/request/WxPpSendCardMsgReq.java | 43 + .../vo/request/WxPpSendEmojiMsgReq.java | 31 + .../entity/vo/request/WxPpSendFileMsgReq.java | 31 + .../vo/request/WxPpSendImageMsgReq.java | 31 + .../entity/vo/request/WxPpSendTextMsgReq.java | 49 + .../entity/vo/response/WxPpContactsResp.java | 101 + .../vo/response/WxPpDatabaseFieldResp.java | 35 + .../vo/response/WxPpDatabaseRowResp.java | 25 + .../vo/response/WxPpGroupMemberResp.java | 35 + .../entity/vo/response/WxPpMsgTypeResp.java | 29 + .../vo/response/WxPpSendCardMsgResp.java | 29 + .../vo/response/WxPpSendEmojiMsgResp.java | 29 + .../vo/response/WxPpSendFileMsgResp.java | 29 + .../vo/response/WxPpSendImageMsgResp.java | 29 + .../vo/response/WxPpSendTextMsgResp.java | 29 + .../java/com/wechat/ferry/enums/SexEnum.java | 16 + .../wechat/ferry/enums/WcfMsgTypeEnum.java | 192 + .../com/wechat/ferry/enums/WhetherEnum.java | 39 + .../ferry/enums/WxContactsTypeEnum.java | 65 + .../ferry/handle/WeChatSocketClient.java | 43 +- .../ferry/service/WeChatDllService.java | 160 + .../service/impl/WeChatDllServiceImpl.java | 336 +- .../service/impl/WeChatMsgServiceImpl.java | 69 +- .../ferry/utils/XmlJsonConvertUtil.java | 65 +- .../src/main/resources/application.yml | 27 + .../src/main/resources/proto/wcf.proto | 20 +- 40 files changed, 5924 insertions(+), 1961 deletions(-) create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/ErrorPageConfig.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WebConfig.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/constant/.gitkeep rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/{WxMsgDTO.java => WxPpMsgDTO.java} (96%) create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/.gitkeep rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/{po => proto}/Wcf.java (79%) create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WcfMsgTypeEnum.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WhetherEnum.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java diff --git a/clients/java/wechat-ferry-mvn/README.MD b/clients/java/wechat-ferry-mvn/README.MD index 8ee145b..224f9d1 100644 --- a/clients/java/wechat-ferry-mvn/README.MD +++ b/clients/java/wechat-ferry-mvn/README.MD @@ -9,11 +9,12 @@ ### 环境准备 -| 名称 | 版本 | -|-------|-----------| -| JDK | 1.8+ | -| Maven | 3.8+ | -| 微信 | 3.9.10.27 | +| 名称 | 版本 | 备注 | +|-------|-----------|----| +| JDK | 1.8+ | √ | +| Maven | 3.8+ | √ | +| 微信 | 3.9.10.27 | √ | +| MySQL | 8.0+ | 备用 | ### 下载文件 @@ -49,6 +50,10 @@ wechat: socket-port: 10086 ``` +### 数据库修改-目前未使用 + +为了更好的拓展应用,本客户端后续将采用mysql数据库,请自行安装mysql数据库 + ### 编译运行 找到 src/main/java/com/wechat/ferry/WeChatFerryApplication.java 类 @@ -71,6 +76,9 @@ swagger地址:http://localhost:9201/swagger-ui/index.html | protobuf-java | 3.22.2 | rpc | | jna | 5.6.0 | 态访问系统本地库 | | nng-java | 1.4.0 | 本地包 | +| fastjson2 | 2.0.52 | 序列化 | +| dom4j | 2.1.3 | XML解析包 | +| httpclient | 4.5.13 | 客户端请求 | ### 模块结构 @@ -86,7 +94,8 @@ wechat-ferry-mvn │ │ │ ├─config 配置 │ │ │ ├─entity 聚合模型 │ │ │ │ ├─dto DTO模型 -│ │ │ │ ├─po 实体模型 +│ │ │ │ ├─po 数据库实体(与表结构一一对应,否则请使用DTO) +│ │ │ │ ├─proto PB实体 │ │ │ │ └─vo 视图层返回体目录 │ │ │ ├─enums 枚举 │ │ │ ├─handle 处理层 diff --git a/clients/java/wechat-ferry-mvn/pom.xml b/clients/java/wechat-ferry-mvn/pom.xml index 084258a..0ef4844 100644 --- a/clients/java/wechat-ferry-mvn/pom.xml +++ b/clients/java/wechat-ferry-mvn/pom.xml @@ -14,8 +14,14 @@ wechat-ferry-mvn jar wechat-ferry-mvn + 39.2.4 WeChatFerry客户端Java-Maven版 + + com.wechat.ferry.WeChatFerryApplication + wechat-ferry-mvn + + org.springframework.boot @@ -30,6 +36,11 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-starter-thymeleaf + org.slf4j @@ -77,6 +88,35 @@ 5.6.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + io.sisu.nng @@ -90,6 +130,19 @@ + + ${app.name}-${project.version} + + + src/main/resources + + + bin/* + proto/* + sql/* + + + kr.motd.maven @@ -98,8 +151,25 @@ - + + org.springframework.boot + spring-boot-maven-plugin + + true + + ${application.main.class} + + + + + repackage + + + + + + org.xolstice.maven.plugins protobuf-maven-plugin @@ -125,17 +195,6 @@ - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - **/*.proto - - - diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/ErrorPageConfig.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/ErrorPageConfig.java new file mode 100644 index 0000000..a7c439a --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/ErrorPageConfig.java @@ -0,0 +1,28 @@ +package com.wechat.ferry.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.ErrorPageRegistrar; +import org.springframework.boot.web.server.ErrorPageRegistry; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +/** + * 配置类-配置错误页面转发首页 + * + * @author chandler + * @date 2024-10-04 10:21 + */ +@Slf4j +@Configuration +@Component +public class ErrorPageConfig implements ErrorPageRegistrar { + + @Override + public void registerErrorPages(ErrorPageRegistry registry) { + ErrorPage error404Page = new ErrorPage(HttpStatus.NOT_FOUND, "/index.html"); + registry.addErrorPages(error404Page); + } + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatConfiguration.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatConfiguration.java index 21080e5..b2bf852 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatConfiguration.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatConfiguration.java @@ -27,7 +27,7 @@ public class WeChatConfiguration { private ServerProperties serverProperties; @Bean - public WeChatSocketClient client() { + public WeChatSocketClient weChatSocketClient() { log.debug("[读取配置文件]-端口:{},地址:{}", properties.getSocketPort(), properties.getDllPath()); // 连接远程 RPC // Client client = new Client("127.0.0.1", 10086); diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java index 82fa7f7..74dc78d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java @@ -1,5 +1,7 @@ package com.wechat.ferry.config; +import java.util.List; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -26,4 +28,39 @@ public class WeChatFerryProperties { */ private Integer socketPort; + /** + * 需要开启消息处理的群 + */ + private List openMsgGroups; + + /** + * 接收消息转发开关 + */ + private Boolean receiveMsgFwdSwitch = false; + + /** + * 接收消息转发URL + */ + private List receiveMsgFwdUrls; + + /** + * 发送消息前转发开关 + */ + private Boolean sendMsgFrontFwdSwitch = false; + + /** + * 发送消息前转发URL + */ + private List sendMsgFrontFwdUrls; + + /** + * 发送消息后转发开关 + */ + private Boolean sendMsgBackFwdSwitch = false; + + /** + * 发送消息后转发URL + */ + private List sendMsgBackFwdUrls; + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WebConfig.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WebConfig.java new file mode 100644 index 0000000..e765bc3 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WebConfig.java @@ -0,0 +1,33 @@ +package com.wechat.ferry.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 配置类-配置项目首页 + * + * @author chandler + * @date 2024-10-04 10:30 + */ +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + // 将根路径 "/" 的请求重定向到 "/index.html" + registry.addViewController("/").setViewName("forward:/index.html"); + WebMvcConfigurer.super.addViewControllers(registry); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 添加资源处理器,用于映射静态资源路径 + registry.addResourceHandler("/**") + // 添加资路径 + .addResourceLocations("classpath:/templates/"); + WebMvcConfigurer.super.addResourceHandlers(registry); + } + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/constant/.gitkeep b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/constant/.gitkeep new file mode 100644 index 0000000..a10d4fe --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/constant/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep \ No newline at end of file diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java index f6ead44..cef42d6 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java @@ -1,13 +1,32 @@ package com.wechat.ferry.controller; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; 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; -import com.alibaba.fastjson2.JSONObject; import com.wechat.ferry.entity.TResponse; +import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; import com.wechat.ferry.enums.ResponseCodeEnum; import com.wechat.ferry.service.WeChatDllService; @@ -23,7 +42,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @RestController -@RequestMapping("/wechat/cgi/dll") +@RequestMapping("/wechat/cgi/wcf") @Api(tags = "微信消息处理-接口") public class WeChatDllController { @@ -34,11 +53,181 @@ public class WeChatDllController { this.weChatDllService = weChatDllService; } - @ApiOperation(value = "测试", notes = "test") - @PostMapping(value = "/test") - public TResponse test(@RequestBody JSONObject jsonData) { + @ApiOperation(value = "查询登录状态", notes = "loginStatus") + @PostMapping(value = "/loginStatus") + public TResponse loginStatus() { + Boolean status = weChatDllService.loginStatus(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, status); + } + + @ApiOperation(value = "获取登录微信号", notes = "queryLoginWeChatNo") + @PostMapping(value = "/loginWeChatNo") + public TResponse queryLoginWeChatNo() { + String weChatNo = weChatDllService.queryLoginWeChatId(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, weChatNo); + } + + @ApiOperation(value = "获取登录微信信息", notes = "queryLoginWeChatInfo") + @PostMapping(value = "/loginWeChatInfo") + public TResponse queryLoginWeChatInfo() { return TResponse.ok(ResponseCodeEnum.SUCCESS); } + @ApiOperation(value = "获取消息类型", notes = "queryMsgTypeList") + @PostMapping(value = "/list/msgType") + public TResponse> queryMsgTypeList() { + List list = weChatDllService.queryMsgTypeList(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + @ApiOperation(value = "获取联系人", notes = "queryContactsList") + @PostMapping(value = "/list/contacts") + public TResponse> queryContactsList() { + List list = weChatDllService.queryContactsList(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + @ApiOperation(value = "获取可查询数据库", notes = "queryDatabaseSql") + @PostMapping(value = "/list/dbSql") + public TResponse> queryDatabaseSql(@Validated @RequestBody WxPpDatabaseSqlReq request) { + List list = weChatDllService.queryDatabaseSql(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + @ApiOperation(value = "获取数据库所有表名称", notes = "queryDatabaseAllTableName") + @PostMapping(value = "/list/dbTableName") + public TResponse> queryDatabaseAllTableName() { + List list = weChatDllService.queryDatabaseAllTableName(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + @ApiOperation(value = "获取指定数据库中的表", notes = "queryDatabaseTable") + @PostMapping(value = "/list/dbTable") + public TResponse> queryDatabaseTable(@Validated @RequestBody WxPpDatabaseTableReq request) { + List list = weChatDllService.queryDatabaseTable(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + // @ApiOperation(value = "获取语音消息", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/voiceMsg") + // public TResponse queryVoiceMsg() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + + @ApiOperation(value = "查询群成员", notes = "queryGroupMember") + @PostMapping(value = "/list/groupMember") + public TResponse> queryGroupMember(@Validated @RequestBody WxPpGroupMemberReq request) { + List list = weChatDllService.queryGroupMember(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + } + + @ApiOperation(value = "发送消息汇总入口", notes = "sendMsgMaster") + @PostMapping(value = "/send/msgMaster") + public TResponse sendMsgMaster(@Validated @RequestBody String jsonString) { + + return TResponse.ok(ResponseCodeEnum.SUCCESS); + } + + @ApiOperation(value = "发送文本消息(可 @)", notes = "sendTextMsg") + @PostMapping(value = "/send/textMsg") + public TResponse sendTextMsg(@Validated @RequestBody WxPpSendTextMsgReq request) { + WxPpSendTextMsgResp resp = weChatDllService.sendTextMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + @ApiOperation(value = "发送图片消息", notes = "sendImageMsg") + @PostMapping(value = "/send/imageMsg") + public TResponse sendImageMsg(@Validated @RequestBody WxPpSendImageMsgReq request) { + WxPpSendImageMsgResp resp = weChatDllService.sendImageMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + @ApiOperation(value = "发送文件消息", notes = "sendFileMsg") + @PostMapping(value = "/send/fileMsg") + public TResponse sendFileMsg(@Validated @RequestBody WxPpSendFileMsgReq request) { + WxPpSendFileMsgResp resp = weChatDllService.sendFileMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + @ApiOperation(value = "发送卡片消息", notes = "sendCardMsg") + @PostMapping(value = "/send/cardMsg") + public TResponse sendCardMsg(@Validated @RequestBody WxPpSendCardMsgReq request) { + WxPpSendCardMsgResp resp = weChatDllService.sendCardMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + @ApiOperation(value = "发送表情消息", notes = "sendEmojiMsg") + @PostMapping(value = "/send/emojiMsg") + public TResponse sendEmojiMsg(@Validated @RequestBody WxPpSendEmojiMsgReq request) { + WxPpSendEmojiMsgResp resp = weChatDllService.sendEmojiMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + // @ApiOperation(value = "拍一拍群友", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "转发消息", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "开启接收消息", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "关闭接收消息", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "查询数据库", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "获取朋友圈消息", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "下载图片、视频、文件", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "解密图片", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "添加群成员", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "删除群成员", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + // + // @ApiOperation(value = "邀请群成员", notes = "queryMsgTypeList") + // @PostMapping(value = "/list/msgType") + // public TResponse queryMsgTypeList() { + // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxMsgDTO.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java similarity index 96% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxMsgDTO.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java index 19dfa78..457327f 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxMsgDTO.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java @@ -4,13 +4,13 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * DTO-微信消息 + * DTO-ge微信消息 * * @author chandler * @date 2024-09-26 19:56 */ @Data -public class WxMsgDTO { +public class WxPpMsgDTO { /** * 是否自己发送的 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/.gitkeep b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/.gitkeep new file mode 100644 index 0000000..a10d4fe --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep \ No newline at end of file diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/Wcf.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/proto/Wcf.java similarity index 79% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/Wcf.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/proto/Wcf.java index 0182aa3..ea81c16 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/po/Wcf.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/proto/Wcf.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: wcf.proto -package com.wechat.ferry.entity.po; +package com.wechat.ferry.entity.proto; public final class Wcf { private Wcf() {} @@ -366,7 +366,7 @@ public final class Wcf { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.wechat.ferry.entity.po.Wcf.getDescriptor().getEnumTypes().get(0); + return com.wechat.ferry.entity.proto.Wcf.getDescriptor().getEnumTypes().get(0); } private static final Functions[] VALUES = values(); @@ -405,7 +405,7 @@ public final class Wcf { * .wcf.Functions func = 1; * @return The func. */ - com.wechat.ferry.entity.po.Wcf.Functions getFunc(); + com.wechat.ferry.entity.proto.Wcf.Functions getFunc(); /** *
@@ -424,7 +424,7 @@ public final class Wcf {
      * .wcf.Empty empty = 2;
      * @return The empty.
      */
-    com.wechat.ferry.entity.po.Wcf.Empty getEmpty();
+    com.wechat.ferry.entity.proto.Wcf.Empty getEmpty();
     /**
      * 
      * 无参数
@@ -432,7 +432,7 @@ public final class Wcf {
      *
      * .wcf.Empty empty = 2;
      */
-    com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder getEmptyOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder getEmptyOrBuilder();
 
     /**
      * 
@@ -480,7 +480,7 @@ public final class Wcf {
      * .wcf.TextMsg txt = 4;
      * @return The txt.
      */
-    com.wechat.ferry.entity.po.Wcf.TextMsg getTxt();
+    com.wechat.ferry.entity.proto.Wcf.TextMsg getTxt();
     /**
      * 
      * 发送文本消息结构
@@ -488,7 +488,7 @@ public final class Wcf {
      *
      * .wcf.TextMsg txt = 4;
      */
-    com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder getTxtOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder getTxtOrBuilder();
 
     /**
      * 
@@ -507,7 +507,7 @@ public final class Wcf {
      * .wcf.PathMsg file = 5;
      * @return The file.
      */
-    com.wechat.ferry.entity.po.Wcf.PathMsg getFile();
+    com.wechat.ferry.entity.proto.Wcf.PathMsg getFile();
     /**
      * 
      * 发送图片、文件消息结构
@@ -515,7 +515,7 @@ public final class Wcf {
      *
      * .wcf.PathMsg file = 5;
      */
-    com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder getFileOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder getFileOrBuilder();
 
     /**
      * 
@@ -534,7 +534,7 @@ public final class Wcf {
      * .wcf.DbQuery query = 6;
      * @return The query.
      */
-    com.wechat.ferry.entity.po.Wcf.DbQuery getQuery();
+    com.wechat.ferry.entity.proto.Wcf.DbQuery getQuery();
     /**
      * 
      * 数据库查询参数结构
@@ -542,7 +542,7 @@ public final class Wcf {
      *
      * .wcf.DbQuery query = 6;
      */
-    com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder getQueryOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder getQueryOrBuilder();
 
     /**
      * 
@@ -561,7 +561,7 @@ public final class Wcf {
      * .wcf.Verification v = 7;
      * @return The v.
      */
-    com.wechat.ferry.entity.po.Wcf.Verification getV();
+    com.wechat.ferry.entity.proto.Wcf.Verification getV();
     /**
      * 
      * 通过好友验证参数结构
@@ -569,7 +569,7 @@ public final class Wcf {
      *
      * .wcf.Verification v = 7;
      */
-    com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder getVOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder getVOrBuilder();
 
     /**
      * 
@@ -588,7 +588,7 @@ public final class Wcf {
      * .wcf.MemberMgmt m = 8;
      * @return The m.
      */
-    com.wechat.ferry.entity.po.Wcf.MemberMgmt getM();
+    com.wechat.ferry.entity.proto.Wcf.MemberMgmt getM();
     /**
      * 
      * 群成员管理,添加、删除、邀请
@@ -596,7 +596,7 @@ public final class Wcf {
      *
      * .wcf.MemberMgmt m = 8;
      */
-    com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder getMOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder getMOrBuilder();
 
     /**
      * 
@@ -615,7 +615,7 @@ public final class Wcf {
      * .wcf.XmlMsg xml = 9;
      * @return The xml.
      */
-    com.wechat.ferry.entity.po.Wcf.XmlMsg getXml();
+    com.wechat.ferry.entity.proto.Wcf.XmlMsg getXml();
     /**
      * 
      * XML参数结构
@@ -623,7 +623,7 @@ public final class Wcf {
      *
      * .wcf.XmlMsg xml = 9;
      */
-    com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder getXmlOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder getXmlOrBuilder();
 
     /**
      * 
@@ -642,7 +642,7 @@ public final class Wcf {
      * .wcf.DecPath dec = 10;
      * @return The dec.
      */
-    com.wechat.ferry.entity.po.Wcf.DecPath getDec();
+    com.wechat.ferry.entity.proto.Wcf.DecPath getDec();
     /**
      * 
      * 解密图片参数结构
@@ -650,7 +650,7 @@ public final class Wcf {
      *
      * .wcf.DecPath dec = 10;
      */
-    com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder getDecOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder getDecOrBuilder();
 
     /**
      * 
@@ -669,7 +669,7 @@ public final class Wcf {
      * .wcf.Transfer tf = 11;
      * @return The tf.
      */
-    com.wechat.ferry.entity.po.Wcf.Transfer getTf();
+    com.wechat.ferry.entity.proto.Wcf.Transfer getTf();
     /**
      * 
      * 接收转账参数结构
@@ -677,7 +677,7 @@ public final class Wcf {
      *
      * .wcf.Transfer tf = 11;
      */
-    com.wechat.ferry.entity.po.Wcf.TransferOrBuilder getTfOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder getTfOrBuilder();
 
     /**
      * 
@@ -734,7 +734,7 @@ public final class Wcf {
      * .wcf.AttachMsg att = 14;
      * @return The att.
      */
-    com.wechat.ferry.entity.po.Wcf.AttachMsg getAtt();
+    com.wechat.ferry.entity.proto.Wcf.AttachMsg getAtt();
     /**
      * 
      * 下载图片、视频、文件参数结构
@@ -742,7 +742,7 @@ public final class Wcf {
      *
      * .wcf.AttachMsg att = 14;
      */
-    com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder getAttOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder getAttOrBuilder();
 
     /**
      * 
@@ -761,7 +761,7 @@ public final class Wcf {
      * .wcf.AudioMsg am = 15;
      * @return The am.
      */
-    com.wechat.ferry.entity.po.Wcf.AudioMsg getAm();
+    com.wechat.ferry.entity.proto.Wcf.AudioMsg getAm();
     /**
      * 
      * 保存语音参数结构
@@ -769,7 +769,7 @@ public final class Wcf {
      *
      * .wcf.AudioMsg am = 15;
      */
-    com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder getAmOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder getAmOrBuilder();
 
     /**
      * 
@@ -788,7 +788,7 @@ public final class Wcf {
      * .wcf.RichText rt = 16;
      * @return The rt.
      */
-    com.wechat.ferry.entity.po.Wcf.RichText getRt();
+    com.wechat.ferry.entity.proto.Wcf.RichText getRt();
     /**
      * 
      * 发送卡片消息结构
@@ -796,7 +796,7 @@ public final class Wcf {
      *
      * .wcf.RichText rt = 16;
      */
-    com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder getRtOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder getRtOrBuilder();
 
     /**
      * 
@@ -815,7 +815,7 @@ public final class Wcf {
      * .wcf.PatMsg pm = 17;
      * @return The pm.
      */
-    com.wechat.ferry.entity.po.Wcf.PatMsg getPm();
+    com.wechat.ferry.entity.proto.Wcf.PatMsg getPm();
     /**
      * 
      * 发送拍一拍参数结构
@@ -823,7 +823,7 @@ public final class Wcf {
      *
      * .wcf.PatMsg pm = 17;
      */
-    com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder getPmOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder getPmOrBuilder();
 
     /**
      * 
@@ -842,7 +842,7 @@ public final class Wcf {
      * .wcf.ForwardMsg fm = 18;
      * @return The fm.
      */
-    com.wechat.ferry.entity.po.Wcf.ForwardMsg getFm();
+    com.wechat.ferry.entity.proto.Wcf.ForwardMsg getFm();
     /**
      * 
      * 转发消息参数结构
@@ -850,9 +850,9 @@ public final class Wcf {
      *
      * .wcf.ForwardMsg fm = 18;
      */
-    com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder getFmOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder getFmOrBuilder();
 
-    com.wechat.ferry.entity.po.Wcf.Request.MsgCase getMsgCase();
+    com.wechat.ferry.entity.proto.Wcf.Request.MsgCase getMsgCase();
   }
   /**
    * Protobuf type {@code wcf.Request}
@@ -879,15 +879,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Request_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Request_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Request_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Request_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.Request.class, com.wechat.ferry.entity.po.Wcf.Request.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.Request.class, com.wechat.ferry.entity.proto.Wcf.Request.Builder.class);
     }
 
     private int msgCase_ = 0;
@@ -975,9 +975,9 @@ public final class Wcf {
      * .wcf.Functions func = 1;
      * @return The func.
      */
-    @java.lang.Override public com.wechat.ferry.entity.po.Wcf.Functions getFunc() {
-      com.wechat.ferry.entity.po.Wcf.Functions result = com.wechat.ferry.entity.po.Wcf.Functions.forNumber(func_);
-      return result == null ? com.wechat.ferry.entity.po.Wcf.Functions.UNRECOGNIZED : result;
+    @java.lang.Override public com.wechat.ferry.entity.proto.Wcf.Functions getFunc() {
+      com.wechat.ferry.entity.proto.Wcf.Functions result = com.wechat.ferry.entity.proto.Wcf.Functions.forNumber(func_);
+      return result == null ? com.wechat.ferry.entity.proto.Wcf.Functions.UNRECOGNIZED : result;
     }
 
     public static final int EMPTY_FIELD_NUMBER = 2;
@@ -1002,11 +1002,11 @@ public final class Wcf {
      * @return The empty.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Empty getEmpty() {
+    public com.wechat.ferry.entity.proto.Wcf.Empty getEmpty() {
       if (msgCase_ == 2) {
-         return (com.wechat.ferry.entity.po.Wcf.Empty) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Empty) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
     }
     /**
      * 
@@ -1016,11 +1016,11 @@ public final class Wcf {
      * .wcf.Empty empty = 2;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder getEmptyOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder getEmptyOrBuilder() {
       if (msgCase_ == 2) {
-         return (com.wechat.ferry.entity.po.Wcf.Empty) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Empty) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
     }
 
     public static final int STR_FIELD_NUMBER = 3;
@@ -1109,11 +1109,11 @@ public final class Wcf {
      * @return The txt.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.TextMsg getTxt() {
+    public com.wechat.ferry.entity.proto.Wcf.TextMsg getTxt() {
       if (msgCase_ == 4) {
-         return (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1123,11 +1123,11 @@ public final class Wcf {
      * .wcf.TextMsg txt = 4;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder getTxtOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder getTxtOrBuilder() {
       if (msgCase_ == 4) {
-         return (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
     }
 
     public static final int FILE_FIELD_NUMBER = 5;
@@ -1152,11 +1152,11 @@ public final class Wcf {
      * @return The file.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PathMsg getFile() {
+    public com.wechat.ferry.entity.proto.Wcf.PathMsg getFile() {
       if (msgCase_ == 5) {
-         return (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1166,11 +1166,11 @@ public final class Wcf {
      * .wcf.PathMsg file = 5;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder getFileOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder getFileOrBuilder() {
       if (msgCase_ == 5) {
-         return (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
     }
 
     public static final int QUERY_FIELD_NUMBER = 6;
@@ -1195,11 +1195,11 @@ public final class Wcf {
      * @return The query.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbQuery getQuery() {
+    public com.wechat.ferry.entity.proto.Wcf.DbQuery getQuery() {
       if (msgCase_ == 6) {
-         return (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
     }
     /**
      * 
@@ -1209,11 +1209,11 @@ public final class Wcf {
      * .wcf.DbQuery query = 6;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder getQueryOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder getQueryOrBuilder() {
       if (msgCase_ == 6) {
-         return (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
     }
 
     public static final int V_FIELD_NUMBER = 7;
@@ -1238,11 +1238,11 @@ public final class Wcf {
      * @return The v.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Verification getV() {
+    public com.wechat.ferry.entity.proto.Wcf.Verification getV() {
       if (msgCase_ == 7) {
-         return (com.wechat.ferry.entity.po.Wcf.Verification) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Verification) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
     }
     /**
      * 
@@ -1252,11 +1252,11 @@ public final class Wcf {
      * .wcf.Verification v = 7;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder getVOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder getVOrBuilder() {
       if (msgCase_ == 7) {
-         return (com.wechat.ferry.entity.po.Wcf.Verification) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Verification) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
     }
 
     public static final int M_FIELD_NUMBER = 8;
@@ -1281,11 +1281,11 @@ public final class Wcf {
      * @return The m.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MemberMgmt getM() {
+    public com.wechat.ferry.entity.proto.Wcf.MemberMgmt getM() {
       if (msgCase_ == 8) {
-         return (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
     }
     /**
      * 
@@ -1295,11 +1295,11 @@ public final class Wcf {
      * .wcf.MemberMgmt m = 8;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder getMOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder getMOrBuilder() {
       if (msgCase_ == 8) {
-         return (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
     }
 
     public static final int XML_FIELD_NUMBER = 9;
@@ -1324,11 +1324,11 @@ public final class Wcf {
      * @return The xml.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.XmlMsg getXml() {
+    public com.wechat.ferry.entity.proto.Wcf.XmlMsg getXml() {
       if (msgCase_ == 9) {
-         return (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1338,11 +1338,11 @@ public final class Wcf {
      * .wcf.XmlMsg xml = 9;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder getXmlOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder getXmlOrBuilder() {
       if (msgCase_ == 9) {
-         return (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
     }
 
     public static final int DEC_FIELD_NUMBER = 10;
@@ -1367,11 +1367,11 @@ public final class Wcf {
      * @return The dec.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DecPath getDec() {
+    public com.wechat.ferry.entity.proto.Wcf.DecPath getDec() {
       if (msgCase_ == 10) {
-         return (com.wechat.ferry.entity.po.Wcf.DecPath) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
     }
     /**
      * 
@@ -1381,11 +1381,11 @@ public final class Wcf {
      * .wcf.DecPath dec = 10;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder getDecOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder getDecOrBuilder() {
       if (msgCase_ == 10) {
-         return (com.wechat.ferry.entity.po.Wcf.DecPath) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
     }
 
     public static final int TF_FIELD_NUMBER = 11;
@@ -1410,11 +1410,11 @@ public final class Wcf {
      * @return The tf.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Transfer getTf() {
+    public com.wechat.ferry.entity.proto.Wcf.Transfer getTf() {
       if (msgCase_ == 11) {
-         return (com.wechat.ferry.entity.po.Wcf.Transfer) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
     }
     /**
      * 
@@ -1424,11 +1424,11 @@ public final class Wcf {
      * .wcf.Transfer tf = 11;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.TransferOrBuilder getTfOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder getTfOrBuilder() {
       if (msgCase_ == 11) {
-         return (com.wechat.ferry.entity.po.Wcf.Transfer) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
     }
 
     public static final int UI64_FIELD_NUMBER = 12;
@@ -1511,11 +1511,11 @@ public final class Wcf {
      * @return The att.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AttachMsg getAtt() {
+    public com.wechat.ferry.entity.proto.Wcf.AttachMsg getAtt() {
       if (msgCase_ == 14) {
-         return (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1525,11 +1525,11 @@ public final class Wcf {
      * .wcf.AttachMsg att = 14;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder getAttOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder getAttOrBuilder() {
       if (msgCase_ == 14) {
-         return (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
     }
 
     public static final int AM_FIELD_NUMBER = 15;
@@ -1554,11 +1554,11 @@ public final class Wcf {
      * @return The am.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AudioMsg getAm() {
+    public com.wechat.ferry.entity.proto.Wcf.AudioMsg getAm() {
       if (msgCase_ == 15) {
-         return (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1568,11 +1568,11 @@ public final class Wcf {
      * .wcf.AudioMsg am = 15;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder getAmOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder getAmOrBuilder() {
       if (msgCase_ == 15) {
-         return (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
     }
 
     public static final int RT_FIELD_NUMBER = 16;
@@ -1597,11 +1597,11 @@ public final class Wcf {
      * @return The rt.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RichText getRt() {
+    public com.wechat.ferry.entity.proto.Wcf.RichText getRt() {
       if (msgCase_ == 16) {
-         return (com.wechat.ferry.entity.po.Wcf.RichText) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.RichText) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
     }
     /**
      * 
@@ -1611,11 +1611,11 @@ public final class Wcf {
      * .wcf.RichText rt = 16;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder getRtOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder getRtOrBuilder() {
       if (msgCase_ == 16) {
-         return (com.wechat.ferry.entity.po.Wcf.RichText) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.RichText) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
     }
 
     public static final int PM_FIELD_NUMBER = 17;
@@ -1640,11 +1640,11 @@ public final class Wcf {
      * @return The pm.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PatMsg getPm() {
+    public com.wechat.ferry.entity.proto.Wcf.PatMsg getPm() {
       if (msgCase_ == 17) {
-         return (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1654,11 +1654,11 @@ public final class Wcf {
      * .wcf.PatMsg pm = 17;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder getPmOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder getPmOrBuilder() {
       if (msgCase_ == 17) {
-         return (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
     }
 
     public static final int FM_FIELD_NUMBER = 18;
@@ -1683,11 +1683,11 @@ public final class Wcf {
      * @return The fm.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.ForwardMsg getFm() {
+    public com.wechat.ferry.entity.proto.Wcf.ForwardMsg getFm() {
       if (msgCase_ == 18) {
-         return (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
     }
     /**
      * 
@@ -1697,11 +1697,11 @@ public final class Wcf {
      * .wcf.ForwardMsg fm = 18;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder getFmOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder getFmOrBuilder() {
       if (msgCase_ == 18) {
-         return (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1718,38 +1718,38 @@ public final class Wcf {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (func_ != com.wechat.ferry.entity.po.Wcf.Functions.FUNC_RESERVED.getNumber()) {
+      if (func_ != com.wechat.ferry.entity.proto.Wcf.Functions.FUNC_RESERVED.getNumber()) {
         output.writeEnum(1, func_);
       }
       if (msgCase_ == 2) {
-        output.writeMessage(2, (com.wechat.ferry.entity.po.Wcf.Empty) msg_);
+        output.writeMessage(2, (com.wechat.ferry.entity.proto.Wcf.Empty) msg_);
       }
       if (msgCase_ == 3) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, msg_);
       }
       if (msgCase_ == 4) {
-        output.writeMessage(4, (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_);
+        output.writeMessage(4, (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_);
       }
       if (msgCase_ == 5) {
-        output.writeMessage(5, (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_);
+        output.writeMessage(5, (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_);
       }
       if (msgCase_ == 6) {
-        output.writeMessage(6, (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_);
+        output.writeMessage(6, (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_);
       }
       if (msgCase_ == 7) {
-        output.writeMessage(7, (com.wechat.ferry.entity.po.Wcf.Verification) msg_);
+        output.writeMessage(7, (com.wechat.ferry.entity.proto.Wcf.Verification) msg_);
       }
       if (msgCase_ == 8) {
-        output.writeMessage(8, (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_);
+        output.writeMessage(8, (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_);
       }
       if (msgCase_ == 9) {
-        output.writeMessage(9, (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_);
+        output.writeMessage(9, (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_);
       }
       if (msgCase_ == 10) {
-        output.writeMessage(10, (com.wechat.ferry.entity.po.Wcf.DecPath) msg_);
+        output.writeMessage(10, (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_);
       }
       if (msgCase_ == 11) {
-        output.writeMessage(11, (com.wechat.ferry.entity.po.Wcf.Transfer) msg_);
+        output.writeMessage(11, (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_);
       }
       if (msgCase_ == 12) {
         output.writeUInt64(
@@ -1760,19 +1760,19 @@ public final class Wcf {
             13, (boolean)((java.lang.Boolean) msg_));
       }
       if (msgCase_ == 14) {
-        output.writeMessage(14, (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_);
+        output.writeMessage(14, (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_);
       }
       if (msgCase_ == 15) {
-        output.writeMessage(15, (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_);
+        output.writeMessage(15, (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_);
       }
       if (msgCase_ == 16) {
-        output.writeMessage(16, (com.wechat.ferry.entity.po.Wcf.RichText) msg_);
+        output.writeMessage(16, (com.wechat.ferry.entity.proto.Wcf.RichText) msg_);
       }
       if (msgCase_ == 17) {
-        output.writeMessage(17, (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_);
+        output.writeMessage(17, (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_);
       }
       if (msgCase_ == 18) {
-        output.writeMessage(18, (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_);
+        output.writeMessage(18, (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1783,48 +1783,48 @@ public final class Wcf {
       if (size != -1) return size;
 
       size = 0;
-      if (func_ != com.wechat.ferry.entity.po.Wcf.Functions.FUNC_RESERVED.getNumber()) {
+      if (func_ != com.wechat.ferry.entity.proto.Wcf.Functions.FUNC_RESERVED.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(1, func_);
       }
       if (msgCase_ == 2) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, (com.wechat.ferry.entity.po.Wcf.Empty) msg_);
+          .computeMessageSize(2, (com.wechat.ferry.entity.proto.Wcf.Empty) msg_);
       }
       if (msgCase_ == 3) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, msg_);
       }
       if (msgCase_ == 4) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_);
+          .computeMessageSize(4, (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_);
       }
       if (msgCase_ == 5) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_);
+          .computeMessageSize(5, (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_);
       }
       if (msgCase_ == 6) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_);
+          .computeMessageSize(6, (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_);
       }
       if (msgCase_ == 7) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, (com.wechat.ferry.entity.po.Wcf.Verification) msg_);
+          .computeMessageSize(7, (com.wechat.ferry.entity.proto.Wcf.Verification) msg_);
       }
       if (msgCase_ == 8) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_);
+          .computeMessageSize(8, (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_);
       }
       if (msgCase_ == 9) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_);
+          .computeMessageSize(9, (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_);
       }
       if (msgCase_ == 10) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, (com.wechat.ferry.entity.po.Wcf.DecPath) msg_);
+          .computeMessageSize(10, (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_);
       }
       if (msgCase_ == 11) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, (com.wechat.ferry.entity.po.Wcf.Transfer) msg_);
+          .computeMessageSize(11, (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_);
       }
       if (msgCase_ == 12) {
         size += com.google.protobuf.CodedOutputStream
@@ -1838,23 +1838,23 @@ public final class Wcf {
       }
       if (msgCase_ == 14) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_);
+          .computeMessageSize(14, (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_);
       }
       if (msgCase_ == 15) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_);
+          .computeMessageSize(15, (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_);
       }
       if (msgCase_ == 16) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(16, (com.wechat.ferry.entity.po.Wcf.RichText) msg_);
+          .computeMessageSize(16, (com.wechat.ferry.entity.proto.Wcf.RichText) msg_);
       }
       if (msgCase_ == 17) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(17, (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_);
+          .computeMessageSize(17, (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_);
       }
       if (msgCase_ == 18) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(18, (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_);
+          .computeMessageSize(18, (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -1866,10 +1866,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.Request)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.Request)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.Request other = (com.wechat.ferry.entity.po.Wcf.Request) obj;
+      com.wechat.ferry.entity.proto.Wcf.Request other = (com.wechat.ferry.entity.proto.Wcf.Request) obj;
 
       if (func_ != other.func_) return false;
       if (!getMsgCase().equals(other.getMsgCase())) return false;
@@ -2037,69 +2037,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Request parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Request parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2112,7 +2112,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.Request prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.Request prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2133,21 +2133,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.Request)
-        com.wechat.ferry.entity.po.Wcf.RequestOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.RequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Request_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Request_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Request_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Request_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.Request.class, com.wechat.ferry.entity.po.Wcf.Request.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.Request.class, com.wechat.ferry.entity.proto.Wcf.Request.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.Request.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.Request.newBuilder()
       private Builder() {
 
       }
@@ -2212,17 +2212,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Request_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Request_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Request getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.Request.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.Request getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.Request.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Request build() {
-        com.wechat.ferry.entity.po.Wcf.Request result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.Request build() {
+        com.wechat.ferry.entity.proto.Wcf.Request result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2230,22 +2230,22 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Request buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.Request result = new com.wechat.ferry.entity.po.Wcf.Request(this);
+      public com.wechat.ferry.entity.proto.Wcf.Request buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.Request result = new com.wechat.ferry.entity.proto.Wcf.Request(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.Request result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.Request result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.func_ = func_;
         }
       }
 
-      private void buildPartialOneofs(com.wechat.ferry.entity.po.Wcf.Request result) {
+      private void buildPartialOneofs(com.wechat.ferry.entity.proto.Wcf.Request result) {
         result.msgCase_ = msgCase_;
         result.msg_ = this.msg_;
         if (msgCase_ == 2 &&
@@ -2308,16 +2308,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.Request) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.Request)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.Request) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.Request)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.Request other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.Request.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.Request other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.Request.getDefaultInstance()) return this;
         if (other.func_ != 0) {
           setFuncValue(other.getFuncValue());
         }
@@ -2597,16 +2597,16 @@ public final class Wcf {
        * @return The func.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Functions getFunc() {
-        com.wechat.ferry.entity.po.Wcf.Functions result = com.wechat.ferry.entity.po.Wcf.Functions.forNumber(func_);
-        return result == null ? com.wechat.ferry.entity.po.Wcf.Functions.UNRECOGNIZED : result;
+      public com.wechat.ferry.entity.proto.Wcf.Functions getFunc() {
+        com.wechat.ferry.entity.proto.Wcf.Functions result = com.wechat.ferry.entity.proto.Wcf.Functions.forNumber(func_);
+        return result == null ? com.wechat.ferry.entity.proto.Wcf.Functions.UNRECOGNIZED : result;
       }
       /**
        * .wcf.Functions func = 1;
        * @param value The func to set.
        * @return This builder for chaining.
        */
-      public Builder setFunc(com.wechat.ferry.entity.po.Wcf.Functions value) {
+      public Builder setFunc(com.wechat.ferry.entity.proto.Wcf.Functions value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2627,7 +2627,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Empty, com.wechat.ferry.entity.po.Wcf.Empty.Builder, com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder> emptyBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.Empty, com.wechat.ferry.entity.proto.Wcf.Empty.Builder, com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder> emptyBuilder_;
       /**
        * 
        * 无参数
@@ -2649,17 +2649,17 @@ public final class Wcf {
        * @return The empty.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Empty getEmpty() {
+      public com.wechat.ferry.entity.proto.Wcf.Empty getEmpty() {
         if (emptyBuilder_ == null) {
           if (msgCase_ == 2) {
-            return (com.wechat.ferry.entity.po.Wcf.Empty) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Empty) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
         } else {
           if (msgCase_ == 2) {
             return emptyBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
         }
       }
       /**
@@ -2669,7 +2669,7 @@ public final class Wcf {
        *
        * .wcf.Empty empty = 2;
        */
-      public Builder setEmpty(com.wechat.ferry.entity.po.Wcf.Empty value) {
+      public Builder setEmpty(com.wechat.ferry.entity.proto.Wcf.Empty value) {
         if (emptyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2690,7 +2690,7 @@ public final class Wcf {
        * .wcf.Empty empty = 2;
        */
       public Builder setEmpty(
-          com.wechat.ferry.entity.po.Wcf.Empty.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.Empty.Builder builderForValue) {
         if (emptyBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -2707,11 +2707,11 @@ public final class Wcf {
        *
        * .wcf.Empty empty = 2;
        */
-      public Builder mergeEmpty(com.wechat.ferry.entity.po.Wcf.Empty value) {
+      public Builder mergeEmpty(com.wechat.ferry.entity.proto.Wcf.Empty value) {
         if (emptyBuilder_ == null) {
           if (msgCase_ == 2 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Empty.newBuilder((com.wechat.ferry.entity.po.Wcf.Empty) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Empty.newBuilder((com.wechat.ferry.entity.proto.Wcf.Empty) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -2757,7 +2757,7 @@ public final class Wcf {
        *
        * .wcf.Empty empty = 2;
        */
-      public com.wechat.ferry.entity.po.Wcf.Empty.Builder getEmptyBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.Empty.Builder getEmptyBuilder() {
         return getEmptyFieldBuilder().getBuilder();
       }
       /**
@@ -2768,14 +2768,14 @@ public final class Wcf {
        * .wcf.Empty empty = 2;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder getEmptyOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder getEmptyOrBuilder() {
         if ((msgCase_ == 2) && (emptyBuilder_ != null)) {
           return emptyBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 2) {
-            return (com.wechat.ferry.entity.po.Wcf.Empty) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Empty) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
         }
       }
       /**
@@ -2786,15 +2786,15 @@ public final class Wcf {
        * .wcf.Empty empty = 2;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Empty, com.wechat.ferry.entity.po.Wcf.Empty.Builder, com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.Empty, com.wechat.ferry.entity.proto.Wcf.Empty.Builder, com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder> 
           getEmptyFieldBuilder() {
         if (emptyBuilder_ == null) {
           if (!(msgCase_ == 2)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
           }
           emptyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.Empty, com.wechat.ferry.entity.po.Wcf.Empty.Builder, com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.Empty) msg_,
+              com.wechat.ferry.entity.proto.Wcf.Empty, com.wechat.ferry.entity.proto.Wcf.Empty.Builder, com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.Empty) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -2922,7 +2922,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.TextMsg, com.wechat.ferry.entity.po.Wcf.TextMsg.Builder, com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder> txtBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.TextMsg, com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder, com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder> txtBuilder_;
       /**
        * 
        * 发送文本消息结构
@@ -2944,17 +2944,17 @@ public final class Wcf {
        * @return The txt.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TextMsg getTxt() {
+      public com.wechat.ferry.entity.proto.Wcf.TextMsg getTxt() {
         if (txtBuilder_ == null) {
           if (msgCase_ == 4) {
-            return (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 4) {
             return txtBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
         }
       }
       /**
@@ -2964,7 +2964,7 @@ public final class Wcf {
        *
        * .wcf.TextMsg txt = 4;
        */
-      public Builder setTxt(com.wechat.ferry.entity.po.Wcf.TextMsg value) {
+      public Builder setTxt(com.wechat.ferry.entity.proto.Wcf.TextMsg value) {
         if (txtBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2985,7 +2985,7 @@ public final class Wcf {
        * .wcf.TextMsg txt = 4;
        */
       public Builder setTxt(
-          com.wechat.ferry.entity.po.Wcf.TextMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder builderForValue) {
         if (txtBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3002,11 +3002,11 @@ public final class Wcf {
        *
        * .wcf.TextMsg txt = 4;
        */
-      public Builder mergeTxt(com.wechat.ferry.entity.po.Wcf.TextMsg value) {
+      public Builder mergeTxt(com.wechat.ferry.entity.proto.Wcf.TextMsg value) {
         if (txtBuilder_ == null) {
           if (msgCase_ == 4 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.TextMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.TextMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.TextMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3052,7 +3052,7 @@ public final class Wcf {
        *
        * .wcf.TextMsg txt = 4;
        */
-      public com.wechat.ferry.entity.po.Wcf.TextMsg.Builder getTxtBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder getTxtBuilder() {
         return getTxtFieldBuilder().getBuilder();
       }
       /**
@@ -3063,14 +3063,14 @@ public final class Wcf {
        * .wcf.TextMsg txt = 4;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder getTxtOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder getTxtOrBuilder() {
         if ((msgCase_ == 4) && (txtBuilder_ != null)) {
           return txtBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 4) {
-            return (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
         }
       }
       /**
@@ -3081,15 +3081,15 @@ public final class Wcf {
        * .wcf.TextMsg txt = 4;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.TextMsg, com.wechat.ferry.entity.po.Wcf.TextMsg.Builder, com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.TextMsg, com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder, com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder> 
           getTxtFieldBuilder() {
         if (txtBuilder_ == null) {
           if (!(msgCase_ == 4)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
           }
           txtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.TextMsg, com.wechat.ferry.entity.po.Wcf.TextMsg.Builder, com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.TextMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.TextMsg, com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder, com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.TextMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3100,7 +3100,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.PathMsg, com.wechat.ferry.entity.po.Wcf.PathMsg.Builder, com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder> fileBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.PathMsg, com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder> fileBuilder_;
       /**
        * 
        * 发送图片、文件消息结构
@@ -3122,17 +3122,17 @@ public final class Wcf {
        * @return The file.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PathMsg getFile() {
+      public com.wechat.ferry.entity.proto.Wcf.PathMsg getFile() {
         if (fileBuilder_ == null) {
           if (msgCase_ == 5) {
-            return (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 5) {
             return fileBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
         }
       }
       /**
@@ -3142,7 +3142,7 @@ public final class Wcf {
        *
        * .wcf.PathMsg file = 5;
        */
-      public Builder setFile(com.wechat.ferry.entity.po.Wcf.PathMsg value) {
+      public Builder setFile(com.wechat.ferry.entity.proto.Wcf.PathMsg value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3163,7 +3163,7 @@ public final class Wcf {
        * .wcf.PathMsg file = 5;
        */
       public Builder setFile(
-          com.wechat.ferry.entity.po.Wcf.PathMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder builderForValue) {
         if (fileBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3180,11 +3180,11 @@ public final class Wcf {
        *
        * .wcf.PathMsg file = 5;
        */
-      public Builder mergeFile(com.wechat.ferry.entity.po.Wcf.PathMsg value) {
+      public Builder mergeFile(com.wechat.ferry.entity.proto.Wcf.PathMsg value) {
         if (fileBuilder_ == null) {
           if (msgCase_ == 5 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.PathMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.PathMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.PathMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3230,7 +3230,7 @@ public final class Wcf {
        *
        * .wcf.PathMsg file = 5;
        */
-      public com.wechat.ferry.entity.po.Wcf.PathMsg.Builder getFileBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder getFileBuilder() {
         return getFileFieldBuilder().getBuilder();
       }
       /**
@@ -3241,14 +3241,14 @@ public final class Wcf {
        * .wcf.PathMsg file = 5;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder getFileOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder getFileOrBuilder() {
         if ((msgCase_ == 5) && (fileBuilder_ != null)) {
           return fileBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 5) {
-            return (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
         }
       }
       /**
@@ -3259,15 +3259,15 @@ public final class Wcf {
        * .wcf.PathMsg file = 5;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.PathMsg, com.wechat.ferry.entity.po.Wcf.PathMsg.Builder, com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.PathMsg, com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder> 
           getFileFieldBuilder() {
         if (fileBuilder_ == null) {
           if (!(msgCase_ == 5)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
           }
           fileBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.PathMsg, com.wechat.ferry.entity.po.Wcf.PathMsg.Builder, com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.PathMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.PathMsg, com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.PathMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3278,7 +3278,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbQuery, com.wechat.ferry.entity.po.Wcf.DbQuery.Builder, com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder> queryBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbQuery, com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder, com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder> queryBuilder_;
       /**
        * 
        * 数据库查询参数结构
@@ -3300,17 +3300,17 @@ public final class Wcf {
        * @return The query.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbQuery getQuery() {
+      public com.wechat.ferry.entity.proto.Wcf.DbQuery getQuery() {
         if (queryBuilder_ == null) {
           if (msgCase_ == 6) {
-            return (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
         } else {
           if (msgCase_ == 6) {
             return queryBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
         }
       }
       /**
@@ -3320,7 +3320,7 @@ public final class Wcf {
        *
        * .wcf.DbQuery query = 6;
        */
-      public Builder setQuery(com.wechat.ferry.entity.po.Wcf.DbQuery value) {
+      public Builder setQuery(com.wechat.ferry.entity.proto.Wcf.DbQuery value) {
         if (queryBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3341,7 +3341,7 @@ public final class Wcf {
        * .wcf.DbQuery query = 6;
        */
       public Builder setQuery(
-          com.wechat.ferry.entity.po.Wcf.DbQuery.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder builderForValue) {
         if (queryBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3358,11 +3358,11 @@ public final class Wcf {
        *
        * .wcf.DbQuery query = 6;
        */
-      public Builder mergeQuery(com.wechat.ferry.entity.po.Wcf.DbQuery value) {
+      public Builder mergeQuery(com.wechat.ferry.entity.proto.Wcf.DbQuery value) {
         if (queryBuilder_ == null) {
           if (msgCase_ == 6 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbQuery.newBuilder((com.wechat.ferry.entity.po.Wcf.DbQuery) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbQuery.newBuilder((com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3408,7 +3408,7 @@ public final class Wcf {
        *
        * .wcf.DbQuery query = 6;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbQuery.Builder getQueryBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder getQueryBuilder() {
         return getQueryFieldBuilder().getBuilder();
       }
       /**
@@ -3419,14 +3419,14 @@ public final class Wcf {
        * .wcf.DbQuery query = 6;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder getQueryOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder getQueryOrBuilder() {
         if ((msgCase_ == 6) && (queryBuilder_ != null)) {
           return queryBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 6) {
-            return (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
         }
       }
       /**
@@ -3437,15 +3437,15 @@ public final class Wcf {
        * .wcf.DbQuery query = 6;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbQuery, com.wechat.ferry.entity.po.Wcf.DbQuery.Builder, com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbQuery, com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder, com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder> 
           getQueryFieldBuilder() {
         if (queryBuilder_ == null) {
           if (!(msgCase_ == 6)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
           }
           queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbQuery, com.wechat.ferry.entity.po.Wcf.DbQuery.Builder, com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.DbQuery) msg_,
+              com.wechat.ferry.entity.proto.Wcf.DbQuery, com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder, com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.DbQuery) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3456,7 +3456,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Verification, com.wechat.ferry.entity.po.Wcf.Verification.Builder, com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder> vBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.Verification, com.wechat.ferry.entity.proto.Wcf.Verification.Builder, com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder> vBuilder_;
       /**
        * 
        * 通过好友验证参数结构
@@ -3478,17 +3478,17 @@ public final class Wcf {
        * @return The v.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Verification getV() {
+      public com.wechat.ferry.entity.proto.Wcf.Verification getV() {
         if (vBuilder_ == null) {
           if (msgCase_ == 7) {
-            return (com.wechat.ferry.entity.po.Wcf.Verification) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Verification) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
         } else {
           if (msgCase_ == 7) {
             return vBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
         }
       }
       /**
@@ -3498,7 +3498,7 @@ public final class Wcf {
        *
        * .wcf.Verification v = 7;
        */
-      public Builder setV(com.wechat.ferry.entity.po.Wcf.Verification value) {
+      public Builder setV(com.wechat.ferry.entity.proto.Wcf.Verification value) {
         if (vBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3519,7 +3519,7 @@ public final class Wcf {
        * .wcf.Verification v = 7;
        */
       public Builder setV(
-          com.wechat.ferry.entity.po.Wcf.Verification.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.Verification.Builder builderForValue) {
         if (vBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3536,11 +3536,11 @@ public final class Wcf {
        *
        * .wcf.Verification v = 7;
        */
-      public Builder mergeV(com.wechat.ferry.entity.po.Wcf.Verification value) {
+      public Builder mergeV(com.wechat.ferry.entity.proto.Wcf.Verification value) {
         if (vBuilder_ == null) {
           if (msgCase_ == 7 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Verification.newBuilder((com.wechat.ferry.entity.po.Wcf.Verification) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Verification.newBuilder((com.wechat.ferry.entity.proto.Wcf.Verification) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3586,7 +3586,7 @@ public final class Wcf {
        *
        * .wcf.Verification v = 7;
        */
-      public com.wechat.ferry.entity.po.Wcf.Verification.Builder getVBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.Verification.Builder getVBuilder() {
         return getVFieldBuilder().getBuilder();
       }
       /**
@@ -3597,14 +3597,14 @@ public final class Wcf {
        * .wcf.Verification v = 7;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder getVOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder getVOrBuilder() {
         if ((msgCase_ == 7) && (vBuilder_ != null)) {
           return vBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 7) {
-            return (com.wechat.ferry.entity.po.Wcf.Verification) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Verification) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
         }
       }
       /**
@@ -3615,15 +3615,15 @@ public final class Wcf {
        * .wcf.Verification v = 7;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Verification, com.wechat.ferry.entity.po.Wcf.Verification.Builder, com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.Verification, com.wechat.ferry.entity.proto.Wcf.Verification.Builder, com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder> 
           getVFieldBuilder() {
         if (vBuilder_ == null) {
           if (!(msgCase_ == 7)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
           }
           vBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.Verification, com.wechat.ferry.entity.po.Wcf.Verification.Builder, com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.Verification) msg_,
+              com.wechat.ferry.entity.proto.Wcf.Verification, com.wechat.ferry.entity.proto.Wcf.Verification.Builder, com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.Verification) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3634,7 +3634,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.MemberMgmt, com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder> mBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.MemberMgmt, com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder> mBuilder_;
       /**
        * 
        * 群成员管理,添加、删除、邀请
@@ -3656,17 +3656,17 @@ public final class Wcf {
        * @return The m.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmt getM() {
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmt getM() {
         if (mBuilder_ == null) {
           if (msgCase_ == 8) {
-            return (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
         } else {
           if (msgCase_ == 8) {
             return mBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
         }
       }
       /**
@@ -3676,7 +3676,7 @@ public final class Wcf {
        *
        * .wcf.MemberMgmt m = 8;
        */
-      public Builder setM(com.wechat.ferry.entity.po.Wcf.MemberMgmt value) {
+      public Builder setM(com.wechat.ferry.entity.proto.Wcf.MemberMgmt value) {
         if (mBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3697,7 +3697,7 @@ public final class Wcf {
        * .wcf.MemberMgmt m = 8;
        */
       public Builder setM(
-          com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder builderForValue) {
         if (mBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3714,11 +3714,11 @@ public final class Wcf {
        *
        * .wcf.MemberMgmt m = 8;
        */
-      public Builder mergeM(com.wechat.ferry.entity.po.Wcf.MemberMgmt value) {
+      public Builder mergeM(com.wechat.ferry.entity.proto.Wcf.MemberMgmt value) {
         if (mBuilder_ == null) {
           if (msgCase_ == 8 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.MemberMgmt.newBuilder((com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.MemberMgmt.newBuilder((com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3764,7 +3764,7 @@ public final class Wcf {
        *
        * .wcf.MemberMgmt m = 8;
        */
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder getMBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder getMBuilder() {
         return getMFieldBuilder().getBuilder();
       }
       /**
@@ -3775,14 +3775,14 @@ public final class Wcf {
        * .wcf.MemberMgmt m = 8;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder getMOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder getMOrBuilder() {
         if ((msgCase_ == 8) && (mBuilder_ != null)) {
           return mBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 8) {
-            return (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
         }
       }
       /**
@@ -3793,15 +3793,15 @@ public final class Wcf {
        * .wcf.MemberMgmt m = 8;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.MemberMgmt, com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.MemberMgmt, com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder> 
           getMFieldBuilder() {
         if (mBuilder_ == null) {
           if (!(msgCase_ == 8)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
           }
           mBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.MemberMgmt, com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.MemberMgmt) msg_,
+              com.wechat.ferry.entity.proto.Wcf.MemberMgmt, com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder, com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3812,7 +3812,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.XmlMsg, com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder> xmlBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.XmlMsg, com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder> xmlBuilder_;
       /**
        * 
        * XML参数结构
@@ -3834,17 +3834,17 @@ public final class Wcf {
        * @return The xml.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.XmlMsg getXml() {
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsg getXml() {
         if (xmlBuilder_ == null) {
           if (msgCase_ == 9) {
-            return (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 9) {
             return xmlBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
         }
       }
       /**
@@ -3854,7 +3854,7 @@ public final class Wcf {
        *
        * .wcf.XmlMsg xml = 9;
        */
-      public Builder setXml(com.wechat.ferry.entity.po.Wcf.XmlMsg value) {
+      public Builder setXml(com.wechat.ferry.entity.proto.Wcf.XmlMsg value) {
         if (xmlBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3875,7 +3875,7 @@ public final class Wcf {
        * .wcf.XmlMsg xml = 9;
        */
       public Builder setXml(
-          com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder builderForValue) {
         if (xmlBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -3892,11 +3892,11 @@ public final class Wcf {
        *
        * .wcf.XmlMsg xml = 9;
        */
-      public Builder mergeXml(com.wechat.ferry.entity.po.Wcf.XmlMsg value) {
+      public Builder mergeXml(com.wechat.ferry.entity.proto.Wcf.XmlMsg value) {
         if (xmlBuilder_ == null) {
           if (msgCase_ == 9 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.XmlMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.XmlMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -3942,7 +3942,7 @@ public final class Wcf {
        *
        * .wcf.XmlMsg xml = 9;
        */
-      public com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder getXmlBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder getXmlBuilder() {
         return getXmlFieldBuilder().getBuilder();
       }
       /**
@@ -3953,14 +3953,14 @@ public final class Wcf {
        * .wcf.XmlMsg xml = 9;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder getXmlOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder getXmlOrBuilder() {
         if ((msgCase_ == 9) && (xmlBuilder_ != null)) {
           return xmlBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 9) {
-            return (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
         }
       }
       /**
@@ -3971,15 +3971,15 @@ public final class Wcf {
        * .wcf.XmlMsg xml = 9;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.XmlMsg, com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.XmlMsg, com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder> 
           getXmlFieldBuilder() {
         if (xmlBuilder_ == null) {
           if (!(msgCase_ == 9)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
           }
           xmlBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.XmlMsg, com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.XmlMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.XmlMsg, com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder, com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.XmlMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -3990,7 +3990,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DecPath, com.wechat.ferry.entity.po.Wcf.DecPath.Builder, com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder> decBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DecPath, com.wechat.ferry.entity.proto.Wcf.DecPath.Builder, com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder> decBuilder_;
       /**
        * 
        * 解密图片参数结构
@@ -4012,17 +4012,17 @@ public final class Wcf {
        * @return The dec.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DecPath getDec() {
+      public com.wechat.ferry.entity.proto.Wcf.DecPath getDec() {
         if (decBuilder_ == null) {
           if (msgCase_ == 10) {
-            return (com.wechat.ferry.entity.po.Wcf.DecPath) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
         } else {
           if (msgCase_ == 10) {
             return decBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
         }
       }
       /**
@@ -4032,7 +4032,7 @@ public final class Wcf {
        *
        * .wcf.DecPath dec = 10;
        */
-      public Builder setDec(com.wechat.ferry.entity.po.Wcf.DecPath value) {
+      public Builder setDec(com.wechat.ferry.entity.proto.Wcf.DecPath value) {
         if (decBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4053,7 +4053,7 @@ public final class Wcf {
        * .wcf.DecPath dec = 10;
        */
       public Builder setDec(
-          com.wechat.ferry.entity.po.Wcf.DecPath.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DecPath.Builder builderForValue) {
         if (decBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -4070,11 +4070,11 @@ public final class Wcf {
        *
        * .wcf.DecPath dec = 10;
        */
-      public Builder mergeDec(com.wechat.ferry.entity.po.Wcf.DecPath value) {
+      public Builder mergeDec(com.wechat.ferry.entity.proto.Wcf.DecPath value) {
         if (decBuilder_ == null) {
           if (msgCase_ == 10 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DecPath.newBuilder((com.wechat.ferry.entity.po.Wcf.DecPath) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DecPath.newBuilder((com.wechat.ferry.entity.proto.Wcf.DecPath) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -4120,7 +4120,7 @@ public final class Wcf {
        *
        * .wcf.DecPath dec = 10;
        */
-      public com.wechat.ferry.entity.po.Wcf.DecPath.Builder getDecBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DecPath.Builder getDecBuilder() {
         return getDecFieldBuilder().getBuilder();
       }
       /**
@@ -4131,14 +4131,14 @@ public final class Wcf {
        * .wcf.DecPath dec = 10;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder getDecOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder getDecOrBuilder() {
         if ((msgCase_ == 10) && (decBuilder_ != null)) {
           return decBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 10) {
-            return (com.wechat.ferry.entity.po.Wcf.DecPath) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
         }
       }
       /**
@@ -4149,15 +4149,15 @@ public final class Wcf {
        * .wcf.DecPath dec = 10;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DecPath, com.wechat.ferry.entity.po.Wcf.DecPath.Builder, com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DecPath, com.wechat.ferry.entity.proto.Wcf.DecPath.Builder, com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder> 
           getDecFieldBuilder() {
         if (decBuilder_ == null) {
           if (!(msgCase_ == 10)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
           }
           decBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DecPath, com.wechat.ferry.entity.po.Wcf.DecPath.Builder, com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.DecPath) msg_,
+              com.wechat.ferry.entity.proto.Wcf.DecPath, com.wechat.ferry.entity.proto.Wcf.DecPath.Builder, com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.DecPath) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -4168,7 +4168,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Transfer, com.wechat.ferry.entity.po.Wcf.Transfer.Builder, com.wechat.ferry.entity.po.Wcf.TransferOrBuilder> tfBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.Transfer, com.wechat.ferry.entity.proto.Wcf.Transfer.Builder, com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder> tfBuilder_;
       /**
        * 
        * 接收转账参数结构
@@ -4190,17 +4190,17 @@ public final class Wcf {
        * @return The tf.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Transfer getTf() {
+      public com.wechat.ferry.entity.proto.Wcf.Transfer getTf() {
         if (tfBuilder_ == null) {
           if (msgCase_ == 11) {
-            return (com.wechat.ferry.entity.po.Wcf.Transfer) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
         } else {
           if (msgCase_ == 11) {
             return tfBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
         }
       }
       /**
@@ -4210,7 +4210,7 @@ public final class Wcf {
        *
        * .wcf.Transfer tf = 11;
        */
-      public Builder setTf(com.wechat.ferry.entity.po.Wcf.Transfer value) {
+      public Builder setTf(com.wechat.ferry.entity.proto.Wcf.Transfer value) {
         if (tfBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4231,7 +4231,7 @@ public final class Wcf {
        * .wcf.Transfer tf = 11;
        */
       public Builder setTf(
-          com.wechat.ferry.entity.po.Wcf.Transfer.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.Transfer.Builder builderForValue) {
         if (tfBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -4248,11 +4248,11 @@ public final class Wcf {
        *
        * .wcf.Transfer tf = 11;
        */
-      public Builder mergeTf(com.wechat.ferry.entity.po.Wcf.Transfer value) {
+      public Builder mergeTf(com.wechat.ferry.entity.proto.Wcf.Transfer value) {
         if (tfBuilder_ == null) {
           if (msgCase_ == 11 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Transfer.newBuilder((com.wechat.ferry.entity.po.Wcf.Transfer) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Transfer.newBuilder((com.wechat.ferry.entity.proto.Wcf.Transfer) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -4298,7 +4298,7 @@ public final class Wcf {
        *
        * .wcf.Transfer tf = 11;
        */
-      public com.wechat.ferry.entity.po.Wcf.Transfer.Builder getTfBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.Transfer.Builder getTfBuilder() {
         return getTfFieldBuilder().getBuilder();
       }
       /**
@@ -4309,14 +4309,14 @@ public final class Wcf {
        * .wcf.Transfer tf = 11;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TransferOrBuilder getTfOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder getTfOrBuilder() {
         if ((msgCase_ == 11) && (tfBuilder_ != null)) {
           return tfBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 11) {
-            return (com.wechat.ferry.entity.po.Wcf.Transfer) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
         }
       }
       /**
@@ -4327,15 +4327,15 @@ public final class Wcf {
        * .wcf.Transfer tf = 11;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.Transfer, com.wechat.ferry.entity.po.Wcf.Transfer.Builder, com.wechat.ferry.entity.po.Wcf.TransferOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.Transfer, com.wechat.ferry.entity.proto.Wcf.Transfer.Builder, com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder> 
           getTfFieldBuilder() {
         if (tfBuilder_ == null) {
           if (!(msgCase_ == 11)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
           }
           tfBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.Transfer, com.wechat.ferry.entity.po.Wcf.Transfer.Builder, com.wechat.ferry.entity.po.Wcf.TransferOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.Transfer) msg_,
+              com.wechat.ferry.entity.proto.Wcf.Transfer, com.wechat.ferry.entity.proto.Wcf.Transfer.Builder, com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.Transfer) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -4462,7 +4462,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.AttachMsg, com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder> attBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.AttachMsg, com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder> attBuilder_;
       /**
        * 
        * 下载图片、视频、文件参数结构
@@ -4484,17 +4484,17 @@ public final class Wcf {
        * @return The att.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AttachMsg getAtt() {
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsg getAtt() {
         if (attBuilder_ == null) {
           if (msgCase_ == 14) {
-            return (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 14) {
             return attBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
         }
       }
       /**
@@ -4504,7 +4504,7 @@ public final class Wcf {
        *
        * .wcf.AttachMsg att = 14;
        */
-      public Builder setAtt(com.wechat.ferry.entity.po.Wcf.AttachMsg value) {
+      public Builder setAtt(com.wechat.ferry.entity.proto.Wcf.AttachMsg value) {
         if (attBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4525,7 +4525,7 @@ public final class Wcf {
        * .wcf.AttachMsg att = 14;
        */
       public Builder setAtt(
-          com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder builderForValue) {
         if (attBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -4542,11 +4542,11 @@ public final class Wcf {
        *
        * .wcf.AttachMsg att = 14;
        */
-      public Builder mergeAtt(com.wechat.ferry.entity.po.Wcf.AttachMsg value) {
+      public Builder mergeAtt(com.wechat.ferry.entity.proto.Wcf.AttachMsg value) {
         if (attBuilder_ == null) {
           if (msgCase_ == 14 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.AttachMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.AttachMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -4592,7 +4592,7 @@ public final class Wcf {
        *
        * .wcf.AttachMsg att = 14;
        */
-      public com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder getAttBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder getAttBuilder() {
         return getAttFieldBuilder().getBuilder();
       }
       /**
@@ -4603,14 +4603,14 @@ public final class Wcf {
        * .wcf.AttachMsg att = 14;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder getAttOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder getAttOrBuilder() {
         if ((msgCase_ == 14) && (attBuilder_ != null)) {
           return attBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 14) {
-            return (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
         }
       }
       /**
@@ -4621,15 +4621,15 @@ public final class Wcf {
        * .wcf.AttachMsg att = 14;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.AttachMsg, com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.AttachMsg, com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder> 
           getAttFieldBuilder() {
         if (attBuilder_ == null) {
           if (!(msgCase_ == 14)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
           }
           attBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.AttachMsg, com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.AttachMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.AttachMsg, com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.AttachMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -4640,7 +4640,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.AudioMsg, com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder> amBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.AudioMsg, com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder> amBuilder_;
       /**
        * 
        * 保存语音参数结构
@@ -4662,17 +4662,17 @@ public final class Wcf {
        * @return The am.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AudioMsg getAm() {
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsg getAm() {
         if (amBuilder_ == null) {
           if (msgCase_ == 15) {
-            return (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 15) {
             return amBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
         }
       }
       /**
@@ -4682,7 +4682,7 @@ public final class Wcf {
        *
        * .wcf.AudioMsg am = 15;
        */
-      public Builder setAm(com.wechat.ferry.entity.po.Wcf.AudioMsg value) {
+      public Builder setAm(com.wechat.ferry.entity.proto.Wcf.AudioMsg value) {
         if (amBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4703,7 +4703,7 @@ public final class Wcf {
        * .wcf.AudioMsg am = 15;
        */
       public Builder setAm(
-          com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder builderForValue) {
         if (amBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -4720,11 +4720,11 @@ public final class Wcf {
        *
        * .wcf.AudioMsg am = 15;
        */
-      public Builder mergeAm(com.wechat.ferry.entity.po.Wcf.AudioMsg value) {
+      public Builder mergeAm(com.wechat.ferry.entity.proto.Wcf.AudioMsg value) {
         if (amBuilder_ == null) {
           if (msgCase_ == 15 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.AudioMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.AudioMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -4770,7 +4770,7 @@ public final class Wcf {
        *
        * .wcf.AudioMsg am = 15;
        */
-      public com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder getAmBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder getAmBuilder() {
         return getAmFieldBuilder().getBuilder();
       }
       /**
@@ -4781,14 +4781,14 @@ public final class Wcf {
        * .wcf.AudioMsg am = 15;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder getAmOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder getAmOrBuilder() {
         if ((msgCase_ == 15) && (amBuilder_ != null)) {
           return amBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 15) {
-            return (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
         }
       }
       /**
@@ -4799,15 +4799,15 @@ public final class Wcf {
        * .wcf.AudioMsg am = 15;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.AudioMsg, com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.AudioMsg, com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder> 
           getAmFieldBuilder() {
         if (amBuilder_ == null) {
           if (!(msgCase_ == 15)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
           }
           amBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.AudioMsg, com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.AudioMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.AudioMsg, com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder, com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.AudioMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -4818,7 +4818,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RichText, com.wechat.ferry.entity.po.Wcf.RichText.Builder, com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder> rtBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.RichText, com.wechat.ferry.entity.proto.Wcf.RichText.Builder, com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder> rtBuilder_;
       /**
        * 
        * 发送卡片消息结构
@@ -4840,17 +4840,17 @@ public final class Wcf {
        * @return The rt.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RichText getRt() {
+      public com.wechat.ferry.entity.proto.Wcf.RichText getRt() {
         if (rtBuilder_ == null) {
           if (msgCase_ == 16) {
-            return (com.wechat.ferry.entity.po.Wcf.RichText) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.RichText) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
         } else {
           if (msgCase_ == 16) {
             return rtBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
         }
       }
       /**
@@ -4860,7 +4860,7 @@ public final class Wcf {
        *
        * .wcf.RichText rt = 16;
        */
-      public Builder setRt(com.wechat.ferry.entity.po.Wcf.RichText value) {
+      public Builder setRt(com.wechat.ferry.entity.proto.Wcf.RichText value) {
         if (rtBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4881,7 +4881,7 @@ public final class Wcf {
        * .wcf.RichText rt = 16;
        */
       public Builder setRt(
-          com.wechat.ferry.entity.po.Wcf.RichText.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.RichText.Builder builderForValue) {
         if (rtBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -4898,11 +4898,11 @@ public final class Wcf {
        *
        * .wcf.RichText rt = 16;
        */
-      public Builder mergeRt(com.wechat.ferry.entity.po.Wcf.RichText value) {
+      public Builder mergeRt(com.wechat.ferry.entity.proto.Wcf.RichText value) {
         if (rtBuilder_ == null) {
           if (msgCase_ == 16 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.RichText.newBuilder((com.wechat.ferry.entity.po.Wcf.RichText) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.RichText.newBuilder((com.wechat.ferry.entity.proto.Wcf.RichText) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -4948,7 +4948,7 @@ public final class Wcf {
        *
        * .wcf.RichText rt = 16;
        */
-      public com.wechat.ferry.entity.po.Wcf.RichText.Builder getRtBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.RichText.Builder getRtBuilder() {
         return getRtFieldBuilder().getBuilder();
       }
       /**
@@ -4959,14 +4959,14 @@ public final class Wcf {
        * .wcf.RichText rt = 16;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder getRtOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder getRtOrBuilder() {
         if ((msgCase_ == 16) && (rtBuilder_ != null)) {
           return rtBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 16) {
-            return (com.wechat.ferry.entity.po.Wcf.RichText) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.RichText) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
         }
       }
       /**
@@ -4977,15 +4977,15 @@ public final class Wcf {
        * .wcf.RichText rt = 16;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RichText, com.wechat.ferry.entity.po.Wcf.RichText.Builder, com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.RichText, com.wechat.ferry.entity.proto.Wcf.RichText.Builder, com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder> 
           getRtFieldBuilder() {
         if (rtBuilder_ == null) {
           if (!(msgCase_ == 16)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
           }
           rtBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.RichText, com.wechat.ferry.entity.po.Wcf.RichText.Builder, com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.RichText) msg_,
+              com.wechat.ferry.entity.proto.Wcf.RichText, com.wechat.ferry.entity.proto.Wcf.RichText.Builder, com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.RichText) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -4996,7 +4996,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.PatMsg, com.wechat.ferry.entity.po.Wcf.PatMsg.Builder, com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder> pmBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.PatMsg, com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder> pmBuilder_;
       /**
        * 
        * 发送拍一拍参数结构
@@ -5018,17 +5018,17 @@ public final class Wcf {
        * @return The pm.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PatMsg getPm() {
+      public com.wechat.ferry.entity.proto.Wcf.PatMsg getPm() {
         if (pmBuilder_ == null) {
           if (msgCase_ == 17) {
-            return (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 17) {
             return pmBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
         }
       }
       /**
@@ -5038,7 +5038,7 @@ public final class Wcf {
        *
        * .wcf.PatMsg pm = 17;
        */
-      public Builder setPm(com.wechat.ferry.entity.po.Wcf.PatMsg value) {
+      public Builder setPm(com.wechat.ferry.entity.proto.Wcf.PatMsg value) {
         if (pmBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5059,7 +5059,7 @@ public final class Wcf {
        * .wcf.PatMsg pm = 17;
        */
       public Builder setPm(
-          com.wechat.ferry.entity.po.Wcf.PatMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder builderForValue) {
         if (pmBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -5076,11 +5076,11 @@ public final class Wcf {
        *
        * .wcf.PatMsg pm = 17;
        */
-      public Builder mergePm(com.wechat.ferry.entity.po.Wcf.PatMsg value) {
+      public Builder mergePm(com.wechat.ferry.entity.proto.Wcf.PatMsg value) {
         if (pmBuilder_ == null) {
           if (msgCase_ == 17 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.PatMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.PatMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.PatMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -5126,7 +5126,7 @@ public final class Wcf {
        *
        * .wcf.PatMsg pm = 17;
        */
-      public com.wechat.ferry.entity.po.Wcf.PatMsg.Builder getPmBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder getPmBuilder() {
         return getPmFieldBuilder().getBuilder();
       }
       /**
@@ -5137,14 +5137,14 @@ public final class Wcf {
        * .wcf.PatMsg pm = 17;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder getPmOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder getPmOrBuilder() {
         if ((msgCase_ == 17) && (pmBuilder_ != null)) {
           return pmBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 17) {
-            return (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
         }
       }
       /**
@@ -5155,15 +5155,15 @@ public final class Wcf {
        * .wcf.PatMsg pm = 17;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.PatMsg, com.wechat.ferry.entity.po.Wcf.PatMsg.Builder, com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.PatMsg, com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder> 
           getPmFieldBuilder() {
         if (pmBuilder_ == null) {
           if (!(msgCase_ == 17)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
           }
           pmBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.PatMsg, com.wechat.ferry.entity.po.Wcf.PatMsg.Builder, com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.PatMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.PatMsg, com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder, com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.PatMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -5174,7 +5174,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.ForwardMsg, com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder> fmBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.ForwardMsg, com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder> fmBuilder_;
       /**
        * 
        * 转发消息参数结构
@@ -5196,17 +5196,17 @@ public final class Wcf {
        * @return The fm.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsg getFm() {
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsg getFm() {
         if (fmBuilder_ == null) {
           if (msgCase_ == 18) {
-            return (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 18) {
             return fmBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
         }
       }
       /**
@@ -5216,7 +5216,7 @@ public final class Wcf {
        *
        * .wcf.ForwardMsg fm = 18;
        */
-      public Builder setFm(com.wechat.ferry.entity.po.Wcf.ForwardMsg value) {
+      public Builder setFm(com.wechat.ferry.entity.proto.Wcf.ForwardMsg value) {
         if (fmBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5237,7 +5237,7 @@ public final class Wcf {
        * .wcf.ForwardMsg fm = 18;
        */
       public Builder setFm(
-          com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder builderForValue) {
         if (fmBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -5254,11 +5254,11 @@ public final class Wcf {
        *
        * .wcf.ForwardMsg fm = 18;
        */
-      public Builder mergeFm(com.wechat.ferry.entity.po.Wcf.ForwardMsg value) {
+      public Builder mergeFm(com.wechat.ferry.entity.proto.Wcf.ForwardMsg value) {
         if (fmBuilder_ == null) {
           if (msgCase_ == 18 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.ForwardMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.ForwardMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -5304,7 +5304,7 @@ public final class Wcf {
        *
        * .wcf.ForwardMsg fm = 18;
        */
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder getFmBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder getFmBuilder() {
         return getFmFieldBuilder().getBuilder();
       }
       /**
@@ -5315,14 +5315,14 @@ public final class Wcf {
        * .wcf.ForwardMsg fm = 18;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder getFmOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder getFmOrBuilder() {
         if ((msgCase_ == 18) && (fmBuilder_ != null)) {
           return fmBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 18) {
-            return (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
         }
       }
       /**
@@ -5333,15 +5333,15 @@ public final class Wcf {
        * .wcf.ForwardMsg fm = 18;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.ForwardMsg, com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.ForwardMsg, com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder> 
           getFmFieldBuilder() {
         if (fmBuilder_ == null) {
           if (!(msgCase_ == 18)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
           }
           fmBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.ForwardMsg, com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.ForwardMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.ForwardMsg, com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder, com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -5367,12 +5367,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.Request)
-    private static final com.wechat.ferry.entity.po.Wcf.Request DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.Request DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.Request();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.Request();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Request getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.Request getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5408,7 +5408,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Request getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.Request getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5427,7 +5427,7 @@ public final class Wcf {
      * .wcf.Functions func = 1;
      * @return The func.
      */
-    com.wechat.ferry.entity.po.Wcf.Functions getFunc();
+    com.wechat.ferry.entity.proto.Wcf.Functions getFunc();
 
     /**
      * 
@@ -5494,7 +5494,7 @@ public final class Wcf {
      * .wcf.WxMsg wxmsg = 4;
      * @return The wxmsg.
      */
-    com.wechat.ferry.entity.po.Wcf.WxMsg getWxmsg();
+    com.wechat.ferry.entity.proto.Wcf.WxMsg getWxmsg();
     /**
      * 
      * 微信消息
@@ -5502,7 +5502,7 @@ public final class Wcf {
      *
      * .wcf.WxMsg wxmsg = 4;
      */
-    com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder getWxmsgOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder getWxmsgOrBuilder();
 
     /**
      * 
@@ -5521,7 +5521,7 @@ public final class Wcf {
      * .wcf.MsgTypes types = 5;
      * @return The types.
      */
-    com.wechat.ferry.entity.po.Wcf.MsgTypes getTypes();
+    com.wechat.ferry.entity.proto.Wcf.MsgTypes getTypes();
     /**
      * 
      * 消息类型
@@ -5529,7 +5529,7 @@ public final class Wcf {
      *
      * .wcf.MsgTypes types = 5;
      */
-    com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder getTypesOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder getTypesOrBuilder();
 
     /**
      * 
@@ -5548,7 +5548,7 @@ public final class Wcf {
      * .wcf.RpcContacts contacts = 6;
      * @return The contacts.
      */
-    com.wechat.ferry.entity.po.Wcf.RpcContacts getContacts();
+    com.wechat.ferry.entity.proto.Wcf.RpcContacts getContacts();
     /**
      * 
      * 联系人
@@ -5556,7 +5556,7 @@ public final class Wcf {
      *
      * .wcf.RpcContacts contacts = 6;
      */
-    com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder getContactsOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder getContactsOrBuilder();
 
     /**
      * 
@@ -5575,7 +5575,7 @@ public final class Wcf {
      * .wcf.DbNames dbs = 7;
      * @return The dbs.
      */
-    com.wechat.ferry.entity.po.Wcf.DbNames getDbs();
+    com.wechat.ferry.entity.proto.Wcf.DbNames getDbs();
     /**
      * 
      * 数据库列表
@@ -5583,7 +5583,7 @@ public final class Wcf {
      *
      * .wcf.DbNames dbs = 7;
      */
-    com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder getDbsOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder getDbsOrBuilder();
 
     /**
      * 
@@ -5602,7 +5602,7 @@ public final class Wcf {
      * .wcf.DbTables tables = 8;
      * @return The tables.
      */
-    com.wechat.ferry.entity.po.Wcf.DbTables getTables();
+    com.wechat.ferry.entity.proto.Wcf.DbTables getTables();
     /**
      * 
      * 表列表
@@ -5610,7 +5610,7 @@ public final class Wcf {
      *
      * .wcf.DbTables tables = 8;
      */
-    com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder getTablesOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder getTablesOrBuilder();
 
     /**
      * 
@@ -5629,7 +5629,7 @@ public final class Wcf {
      * .wcf.DbRows rows = 9;
      * @return The rows.
      */
-    com.wechat.ferry.entity.po.Wcf.DbRows getRows();
+    com.wechat.ferry.entity.proto.Wcf.DbRows getRows();
     /**
      * 
      * 行列表
@@ -5637,7 +5637,7 @@ public final class Wcf {
      *
      * .wcf.DbRows rows = 9;
      */
-    com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder getRowsOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder getRowsOrBuilder();
 
     /**
      * 
@@ -5656,7 +5656,7 @@ public final class Wcf {
      * .wcf.UserInfo ui = 10;
      * @return The ui.
      */
-    com.wechat.ferry.entity.po.Wcf.UserInfo getUi();
+    com.wechat.ferry.entity.proto.Wcf.UserInfo getUi();
     /**
      * 
      * 个人信息
@@ -5664,7 +5664,7 @@ public final class Wcf {
      *
      * .wcf.UserInfo ui = 10;
      */
-    com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder getUiOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder getUiOrBuilder();
 
     /**
      * 
@@ -5683,7 +5683,7 @@ public final class Wcf {
      * .wcf.OcrMsg ocr = 11;
      * @return The ocr.
      */
-    com.wechat.ferry.entity.po.Wcf.OcrMsg getOcr();
+    com.wechat.ferry.entity.proto.Wcf.OcrMsg getOcr();
     /**
      * 
      * OCR 结果
@@ -5691,9 +5691,9 @@ public final class Wcf {
      *
      * .wcf.OcrMsg ocr = 11;
      */
-    com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder getOcrOrBuilder();
+    com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder getOcrOrBuilder();
 
-    com.wechat.ferry.entity.po.Wcf.Response.MsgCase getMsgCase();
+    com.wechat.ferry.entity.proto.Wcf.Response.MsgCase getMsgCase();
   }
   /**
    * Protobuf type {@code wcf.Response}
@@ -5720,15 +5720,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Response_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Response_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Response_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Response_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.Response.class, com.wechat.ferry.entity.po.Wcf.Response.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.Response.class, com.wechat.ferry.entity.proto.Wcf.Response.Builder.class);
     }
 
     private int msgCase_ = 0;
@@ -5802,9 +5802,9 @@ public final class Wcf {
      * .wcf.Functions func = 1;
      * @return The func.
      */
-    @java.lang.Override public com.wechat.ferry.entity.po.Wcf.Functions getFunc() {
-      com.wechat.ferry.entity.po.Wcf.Functions result = com.wechat.ferry.entity.po.Wcf.Functions.forNumber(func_);
-      return result == null ? com.wechat.ferry.entity.po.Wcf.Functions.UNRECOGNIZED : result;
+    @java.lang.Override public com.wechat.ferry.entity.proto.Wcf.Functions getFunc() {
+      com.wechat.ferry.entity.proto.Wcf.Functions result = com.wechat.ferry.entity.proto.Wcf.Functions.forNumber(func_);
+      return result == null ? com.wechat.ferry.entity.proto.Wcf.Functions.UNRECOGNIZED : result;
     }
 
     public static final int STATUS_FIELD_NUMBER = 2;
@@ -5922,11 +5922,11 @@ public final class Wcf {
      * @return The wxmsg.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.WxMsg getWxmsg() {
+    public com.wechat.ferry.entity.proto.Wcf.WxMsg getWxmsg() {
       if (msgCase_ == 4) {
-         return (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
     }
     /**
      * 
@@ -5936,11 +5936,11 @@ public final class Wcf {
      * .wcf.WxMsg wxmsg = 4;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder getWxmsgOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder getWxmsgOrBuilder() {
       if (msgCase_ == 4) {
-         return (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
     }
 
     public static final int TYPES_FIELD_NUMBER = 5;
@@ -5965,11 +5965,11 @@ public final class Wcf {
      * @return The types.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MsgTypes getTypes() {
+    public com.wechat.ferry.entity.proto.Wcf.MsgTypes getTypes() {
       if (msgCase_ == 5) {
-         return (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
     }
     /**
      * 
@@ -5979,11 +5979,11 @@ public final class Wcf {
      * .wcf.MsgTypes types = 5;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder getTypesOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder getTypesOrBuilder() {
       if (msgCase_ == 5) {
-         return (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
     }
 
     public static final int CONTACTS_FIELD_NUMBER = 6;
@@ -6008,11 +6008,11 @@ public final class Wcf {
      * @return The contacts.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContacts getContacts() {
+    public com.wechat.ferry.entity.proto.Wcf.RpcContacts getContacts() {
       if (msgCase_ == 6) {
-         return (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
     }
     /**
      * 
@@ -6022,11 +6022,11 @@ public final class Wcf {
      * .wcf.RpcContacts contacts = 6;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder getContactsOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder getContactsOrBuilder() {
       if (msgCase_ == 6) {
-         return (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
     }
 
     public static final int DBS_FIELD_NUMBER = 7;
@@ -6051,11 +6051,11 @@ public final class Wcf {
      * @return The dbs.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbNames getDbs() {
+    public com.wechat.ferry.entity.proto.Wcf.DbNames getDbs() {
       if (msgCase_ == 7) {
-         return (com.wechat.ferry.entity.po.Wcf.DbNames) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
     }
     /**
      * 
@@ -6065,11 +6065,11 @@ public final class Wcf {
      * .wcf.DbNames dbs = 7;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder getDbsOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder getDbsOrBuilder() {
       if (msgCase_ == 7) {
-         return (com.wechat.ferry.entity.po.Wcf.DbNames) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
     }
 
     public static final int TABLES_FIELD_NUMBER = 8;
@@ -6094,11 +6094,11 @@ public final class Wcf {
      * @return The tables.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTables getTables() {
+    public com.wechat.ferry.entity.proto.Wcf.DbTables getTables() {
       if (msgCase_ == 8) {
-         return (com.wechat.ferry.entity.po.Wcf.DbTables) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
     }
     /**
      * 
@@ -6108,11 +6108,11 @@ public final class Wcf {
      * .wcf.DbTables tables = 8;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder getTablesOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder getTablesOrBuilder() {
       if (msgCase_ == 8) {
-         return (com.wechat.ferry.entity.po.Wcf.DbTables) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
     }
 
     public static final int ROWS_FIELD_NUMBER = 9;
@@ -6137,11 +6137,11 @@ public final class Wcf {
      * @return The rows.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRows getRows() {
+    public com.wechat.ferry.entity.proto.Wcf.DbRows getRows() {
       if (msgCase_ == 9) {
-         return (com.wechat.ferry.entity.po.Wcf.DbRows) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
     }
     /**
      * 
@@ -6151,11 +6151,11 @@ public final class Wcf {
      * .wcf.DbRows rows = 9;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder getRowsOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder getRowsOrBuilder() {
       if (msgCase_ == 9) {
-         return (com.wechat.ferry.entity.po.Wcf.DbRows) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
     }
 
     public static final int UI_FIELD_NUMBER = 10;
@@ -6180,11 +6180,11 @@ public final class Wcf {
      * @return The ui.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.UserInfo getUi() {
+    public com.wechat.ferry.entity.proto.Wcf.UserInfo getUi() {
       if (msgCase_ == 10) {
-         return (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
     }
     /**
      * 
@@ -6194,11 +6194,11 @@ public final class Wcf {
      * .wcf.UserInfo ui = 10;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder getUiOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder getUiOrBuilder() {
       if (msgCase_ == 10) {
-         return (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
     }
 
     public static final int OCR_FIELD_NUMBER = 11;
@@ -6223,11 +6223,11 @@ public final class Wcf {
      * @return The ocr.
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.OcrMsg getOcr() {
+    public com.wechat.ferry.entity.proto.Wcf.OcrMsg getOcr() {
       if (msgCase_ == 11) {
-         return (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
     }
     /**
      * 
@@ -6237,11 +6237,11 @@ public final class Wcf {
      * .wcf.OcrMsg ocr = 11;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder getOcrOrBuilder() {
+    public com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder getOcrOrBuilder() {
       if (msgCase_ == 11) {
-         return (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_;
+         return (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_;
       }
-      return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+      return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6258,7 +6258,7 @@ public final class Wcf {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (func_ != com.wechat.ferry.entity.po.Wcf.Functions.FUNC_RESERVED.getNumber()) {
+      if (func_ != com.wechat.ferry.entity.proto.Wcf.Functions.FUNC_RESERVED.getNumber()) {
         output.writeEnum(1, func_);
       }
       if (msgCase_ == 2) {
@@ -6269,28 +6269,28 @@ public final class Wcf {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, msg_);
       }
       if (msgCase_ == 4) {
-        output.writeMessage(4, (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_);
+        output.writeMessage(4, (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_);
       }
       if (msgCase_ == 5) {
-        output.writeMessage(5, (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_);
+        output.writeMessage(5, (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_);
       }
       if (msgCase_ == 6) {
-        output.writeMessage(6, (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_);
+        output.writeMessage(6, (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_);
       }
       if (msgCase_ == 7) {
-        output.writeMessage(7, (com.wechat.ferry.entity.po.Wcf.DbNames) msg_);
+        output.writeMessage(7, (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_);
       }
       if (msgCase_ == 8) {
-        output.writeMessage(8, (com.wechat.ferry.entity.po.Wcf.DbTables) msg_);
+        output.writeMessage(8, (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_);
       }
       if (msgCase_ == 9) {
-        output.writeMessage(9, (com.wechat.ferry.entity.po.Wcf.DbRows) msg_);
+        output.writeMessage(9, (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_);
       }
       if (msgCase_ == 10) {
-        output.writeMessage(10, (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_);
+        output.writeMessage(10, (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_);
       }
       if (msgCase_ == 11) {
-        output.writeMessage(11, (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_);
+        output.writeMessage(11, (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -6301,7 +6301,7 @@ public final class Wcf {
       if (size != -1) return size;
 
       size = 0;
-      if (func_ != com.wechat.ferry.entity.po.Wcf.Functions.FUNC_RESERVED.getNumber()) {
+      if (func_ != com.wechat.ferry.entity.proto.Wcf.Functions.FUNC_RESERVED.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(1, func_);
       }
@@ -6315,35 +6315,35 @@ public final class Wcf {
       }
       if (msgCase_ == 4) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_);
+          .computeMessageSize(4, (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_);
       }
       if (msgCase_ == 5) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_);
+          .computeMessageSize(5, (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_);
       }
       if (msgCase_ == 6) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_);
+          .computeMessageSize(6, (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_);
       }
       if (msgCase_ == 7) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, (com.wechat.ferry.entity.po.Wcf.DbNames) msg_);
+          .computeMessageSize(7, (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_);
       }
       if (msgCase_ == 8) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, (com.wechat.ferry.entity.po.Wcf.DbTables) msg_);
+          .computeMessageSize(8, (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_);
       }
       if (msgCase_ == 9) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, (com.wechat.ferry.entity.po.Wcf.DbRows) msg_);
+          .computeMessageSize(9, (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_);
       }
       if (msgCase_ == 10) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_);
+          .computeMessageSize(10, (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_);
       }
       if (msgCase_ == 11) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_);
+          .computeMessageSize(11, (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
@@ -6355,10 +6355,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.Response)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.Response)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.Response other = (com.wechat.ferry.entity.po.Wcf.Response) obj;
+      com.wechat.ferry.entity.proto.Wcf.Response other = (com.wechat.ferry.entity.proto.Wcf.Response) obj;
 
       if (func_ != other.func_) return false;
       if (!getMsgCase().equals(other.getMsgCase())) return false;
@@ -6468,69 +6468,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Response parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Response parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6543,7 +6543,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.Response prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.Response prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6564,21 +6564,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.Response)
-        com.wechat.ferry.entity.po.Wcf.ResponseOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.ResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Response_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Response_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Response_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Response_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.Response.class, com.wechat.ferry.entity.po.Wcf.Response.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.Response.class, com.wechat.ferry.entity.proto.Wcf.Response.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.Response.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.Response.newBuilder()
       private Builder() {
 
       }
@@ -6625,17 +6625,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Response_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Response_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Response getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.Response.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.Response getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.Response.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Response build() {
-        com.wechat.ferry.entity.po.Wcf.Response result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.Response build() {
+        com.wechat.ferry.entity.proto.Wcf.Response result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6643,22 +6643,22 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Response buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.Response result = new com.wechat.ferry.entity.po.Wcf.Response(this);
+      public com.wechat.ferry.entity.proto.Wcf.Response buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.Response result = new com.wechat.ferry.entity.proto.Wcf.Response(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         buildPartialOneofs(result);
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.Response result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.Response result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.func_ = func_;
         }
       }
 
-      private void buildPartialOneofs(com.wechat.ferry.entity.po.Wcf.Response result) {
+      private void buildPartialOneofs(com.wechat.ferry.entity.proto.Wcf.Response result) {
         result.msgCase_ = msgCase_;
         result.msg_ = this.msg_;
         if (msgCase_ == 4 &&
@@ -6697,16 +6697,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.Response) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.Response)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.Response) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.Response)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.Response other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.Response.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.Response other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.Response.getDefaultInstance()) return this;
         if (other.func_ != 0) {
           setFuncValue(other.getFuncValue());
         }
@@ -6911,16 +6911,16 @@ public final class Wcf {
        * @return The func.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Functions getFunc() {
-        com.wechat.ferry.entity.po.Wcf.Functions result = com.wechat.ferry.entity.po.Wcf.Functions.forNumber(func_);
-        return result == null ? com.wechat.ferry.entity.po.Wcf.Functions.UNRECOGNIZED : result;
+      public com.wechat.ferry.entity.proto.Wcf.Functions getFunc() {
+        com.wechat.ferry.entity.proto.Wcf.Functions result = com.wechat.ferry.entity.proto.Wcf.Functions.forNumber(func_);
+        return result == null ? com.wechat.ferry.entity.proto.Wcf.Functions.UNRECOGNIZED : result;
       }
       /**
        * .wcf.Functions func = 1;
        * @param value The func to set.
        * @return This builder for chaining.
        */
-      public Builder setFunc(com.wechat.ferry.entity.po.Wcf.Functions value) {
+      public Builder setFunc(com.wechat.ferry.entity.proto.Wcf.Functions value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7116,7 +7116,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.WxMsg, com.wechat.ferry.entity.po.Wcf.WxMsg.Builder, com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder> wxmsgBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.WxMsg, com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder, com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder> wxmsgBuilder_;
       /**
        * 
        * 微信消息
@@ -7138,17 +7138,17 @@ public final class Wcf {
        * @return The wxmsg.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.WxMsg getWxmsg() {
+      public com.wechat.ferry.entity.proto.Wcf.WxMsg getWxmsg() {
         if (wxmsgBuilder_ == null) {
           if (msgCase_ == 4) {
-            return (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 4) {
             return wxmsgBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
         }
       }
       /**
@@ -7158,7 +7158,7 @@ public final class Wcf {
        *
        * .wcf.WxMsg wxmsg = 4;
        */
-      public Builder setWxmsg(com.wechat.ferry.entity.po.Wcf.WxMsg value) {
+      public Builder setWxmsg(com.wechat.ferry.entity.proto.Wcf.WxMsg value) {
         if (wxmsgBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7179,7 +7179,7 @@ public final class Wcf {
        * .wcf.WxMsg wxmsg = 4;
        */
       public Builder setWxmsg(
-          com.wechat.ferry.entity.po.Wcf.WxMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder builderForValue) {
         if (wxmsgBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -7196,11 +7196,11 @@ public final class Wcf {
        *
        * .wcf.WxMsg wxmsg = 4;
        */
-      public Builder mergeWxmsg(com.wechat.ferry.entity.po.Wcf.WxMsg value) {
+      public Builder mergeWxmsg(com.wechat.ferry.entity.proto.Wcf.WxMsg value) {
         if (wxmsgBuilder_ == null) {
           if (msgCase_ == 4 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.WxMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.WxMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.WxMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -7246,7 +7246,7 @@ public final class Wcf {
        *
        * .wcf.WxMsg wxmsg = 4;
        */
-      public com.wechat.ferry.entity.po.Wcf.WxMsg.Builder getWxmsgBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder getWxmsgBuilder() {
         return getWxmsgFieldBuilder().getBuilder();
       }
       /**
@@ -7257,14 +7257,14 @@ public final class Wcf {
        * .wcf.WxMsg wxmsg = 4;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder getWxmsgOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder getWxmsgOrBuilder() {
         if ((msgCase_ == 4) && (wxmsgBuilder_ != null)) {
           return wxmsgBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 4) {
-            return (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
         }
       }
       /**
@@ -7275,15 +7275,15 @@ public final class Wcf {
        * .wcf.WxMsg wxmsg = 4;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.WxMsg, com.wechat.ferry.entity.po.Wcf.WxMsg.Builder, com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.WxMsg, com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder, com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder> 
           getWxmsgFieldBuilder() {
         if (wxmsgBuilder_ == null) {
           if (!(msgCase_ == 4)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
           }
           wxmsgBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.WxMsg, com.wechat.ferry.entity.po.Wcf.WxMsg.Builder, com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.WxMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.WxMsg, com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder, com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.WxMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -7294,7 +7294,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.MsgTypes, com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder> typesBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.MsgTypes, com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder> typesBuilder_;
       /**
        * 
        * 消息类型
@@ -7316,17 +7316,17 @@ public final class Wcf {
        * @return The types.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MsgTypes getTypes() {
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypes getTypes() {
         if (typesBuilder_ == null) {
           if (msgCase_ == 5) {
-            return (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
         } else {
           if (msgCase_ == 5) {
             return typesBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
         }
       }
       /**
@@ -7336,7 +7336,7 @@ public final class Wcf {
        *
        * .wcf.MsgTypes types = 5;
        */
-      public Builder setTypes(com.wechat.ferry.entity.po.Wcf.MsgTypes value) {
+      public Builder setTypes(com.wechat.ferry.entity.proto.Wcf.MsgTypes value) {
         if (typesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7357,7 +7357,7 @@ public final class Wcf {
        * .wcf.MsgTypes types = 5;
        */
       public Builder setTypes(
-          com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder builderForValue) {
         if (typesBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -7374,11 +7374,11 @@ public final class Wcf {
        *
        * .wcf.MsgTypes types = 5;
        */
-      public Builder mergeTypes(com.wechat.ferry.entity.po.Wcf.MsgTypes value) {
+      public Builder mergeTypes(com.wechat.ferry.entity.proto.Wcf.MsgTypes value) {
         if (typesBuilder_ == null) {
           if (msgCase_ == 5 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.MsgTypes.newBuilder((com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.MsgTypes.newBuilder((com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -7424,7 +7424,7 @@ public final class Wcf {
        *
        * .wcf.MsgTypes types = 5;
        */
-      public com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder getTypesBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder getTypesBuilder() {
         return getTypesFieldBuilder().getBuilder();
       }
       /**
@@ -7435,14 +7435,14 @@ public final class Wcf {
        * .wcf.MsgTypes types = 5;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder getTypesOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder getTypesOrBuilder() {
         if ((msgCase_ == 5) && (typesBuilder_ != null)) {
           return typesBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 5) {
-            return (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
         }
       }
       /**
@@ -7453,15 +7453,15 @@ public final class Wcf {
        * .wcf.MsgTypes types = 5;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.MsgTypes, com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.MsgTypes, com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder> 
           getTypesFieldBuilder() {
         if (typesBuilder_ == null) {
           if (!(msgCase_ == 5)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
           }
           typesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.MsgTypes, com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.MsgTypes) msg_,
+              com.wechat.ferry.entity.proto.Wcf.MsgTypes, com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder, com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.MsgTypes) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -7472,7 +7472,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RpcContacts, com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder> contactsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.RpcContacts, com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder> contactsBuilder_;
       /**
        * 
        * 联系人
@@ -7494,17 +7494,17 @@ public final class Wcf {
        * @return The contacts.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContacts getContacts() {
+      public com.wechat.ferry.entity.proto.Wcf.RpcContacts getContacts() {
         if (contactsBuilder_ == null) {
           if (msgCase_ == 6) {
-            return (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
         } else {
           if (msgCase_ == 6) {
             return contactsBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
         }
       }
       /**
@@ -7514,7 +7514,7 @@ public final class Wcf {
        *
        * .wcf.RpcContacts contacts = 6;
        */
-      public Builder setContacts(com.wechat.ferry.entity.po.Wcf.RpcContacts value) {
+      public Builder setContacts(com.wechat.ferry.entity.proto.Wcf.RpcContacts value) {
         if (contactsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7535,7 +7535,7 @@ public final class Wcf {
        * .wcf.RpcContacts contacts = 6;
        */
       public Builder setContacts(
-          com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder builderForValue) {
         if (contactsBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -7552,11 +7552,11 @@ public final class Wcf {
        *
        * .wcf.RpcContacts contacts = 6;
        */
-      public Builder mergeContacts(com.wechat.ferry.entity.po.Wcf.RpcContacts value) {
+      public Builder mergeContacts(com.wechat.ferry.entity.proto.Wcf.RpcContacts value) {
         if (contactsBuilder_ == null) {
           if (msgCase_ == 6 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.RpcContacts.newBuilder((com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.RpcContacts.newBuilder((com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -7602,7 +7602,7 @@ public final class Wcf {
        *
        * .wcf.RpcContacts contacts = 6;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder getContactsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder getContactsBuilder() {
         return getContactsFieldBuilder().getBuilder();
       }
       /**
@@ -7613,14 +7613,14 @@ public final class Wcf {
        * .wcf.RpcContacts contacts = 6;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder getContactsOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder getContactsOrBuilder() {
         if ((msgCase_ == 6) && (contactsBuilder_ != null)) {
           return contactsBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 6) {
-            return (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
         }
       }
       /**
@@ -7631,15 +7631,15 @@ public final class Wcf {
        * .wcf.RpcContacts contacts = 6;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RpcContacts, com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.RpcContacts, com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder> 
           getContactsFieldBuilder() {
         if (contactsBuilder_ == null) {
           if (!(msgCase_ == 6)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
           }
           contactsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.RpcContacts, com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.RpcContacts) msg_,
+              com.wechat.ferry.entity.proto.Wcf.RpcContacts, com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.RpcContacts) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -7650,7 +7650,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbNames, com.wechat.ferry.entity.po.Wcf.DbNames.Builder, com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder> dbsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbNames, com.wechat.ferry.entity.proto.Wcf.DbNames.Builder, com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder> dbsBuilder_;
       /**
        * 
        * 数据库列表
@@ -7672,17 +7672,17 @@ public final class Wcf {
        * @return The dbs.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbNames getDbs() {
+      public com.wechat.ferry.entity.proto.Wcf.DbNames getDbs() {
         if (dbsBuilder_ == null) {
           if (msgCase_ == 7) {
-            return (com.wechat.ferry.entity.po.Wcf.DbNames) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
         } else {
           if (msgCase_ == 7) {
             return dbsBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
         }
       }
       /**
@@ -7692,7 +7692,7 @@ public final class Wcf {
        *
        * .wcf.DbNames dbs = 7;
        */
-      public Builder setDbs(com.wechat.ferry.entity.po.Wcf.DbNames value) {
+      public Builder setDbs(com.wechat.ferry.entity.proto.Wcf.DbNames value) {
         if (dbsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7713,7 +7713,7 @@ public final class Wcf {
        * .wcf.DbNames dbs = 7;
        */
       public Builder setDbs(
-          com.wechat.ferry.entity.po.Wcf.DbNames.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbNames.Builder builderForValue) {
         if (dbsBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -7730,11 +7730,11 @@ public final class Wcf {
        *
        * .wcf.DbNames dbs = 7;
        */
-      public Builder mergeDbs(com.wechat.ferry.entity.po.Wcf.DbNames value) {
+      public Builder mergeDbs(com.wechat.ferry.entity.proto.Wcf.DbNames value) {
         if (dbsBuilder_ == null) {
           if (msgCase_ == 7 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbNames.newBuilder((com.wechat.ferry.entity.po.Wcf.DbNames) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbNames.newBuilder((com.wechat.ferry.entity.proto.Wcf.DbNames) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -7780,7 +7780,7 @@ public final class Wcf {
        *
        * .wcf.DbNames dbs = 7;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbNames.Builder getDbsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbNames.Builder getDbsBuilder() {
         return getDbsFieldBuilder().getBuilder();
       }
       /**
@@ -7791,14 +7791,14 @@ public final class Wcf {
        * .wcf.DbNames dbs = 7;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder getDbsOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder getDbsOrBuilder() {
         if ((msgCase_ == 7) && (dbsBuilder_ != null)) {
           return dbsBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 7) {
-            return (com.wechat.ferry.entity.po.Wcf.DbNames) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
         }
       }
       /**
@@ -7809,15 +7809,15 @@ public final class Wcf {
        * .wcf.DbNames dbs = 7;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbNames, com.wechat.ferry.entity.po.Wcf.DbNames.Builder, com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbNames, com.wechat.ferry.entity.proto.Wcf.DbNames.Builder, com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder> 
           getDbsFieldBuilder() {
         if (dbsBuilder_ == null) {
           if (!(msgCase_ == 7)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
           }
           dbsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbNames, com.wechat.ferry.entity.po.Wcf.DbNames.Builder, com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.DbNames) msg_,
+              com.wechat.ferry.entity.proto.Wcf.DbNames, com.wechat.ferry.entity.proto.Wcf.DbNames.Builder, com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.DbNames) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -7828,7 +7828,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbTables, com.wechat.ferry.entity.po.Wcf.DbTables.Builder, com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder> tablesBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbTables, com.wechat.ferry.entity.proto.Wcf.DbTables.Builder, com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder> tablesBuilder_;
       /**
        * 
        * 表列表
@@ -7850,17 +7850,17 @@ public final class Wcf {
        * @return The tables.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTables getTables() {
+      public com.wechat.ferry.entity.proto.Wcf.DbTables getTables() {
         if (tablesBuilder_ == null) {
           if (msgCase_ == 8) {
-            return (com.wechat.ferry.entity.po.Wcf.DbTables) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
         } else {
           if (msgCase_ == 8) {
             return tablesBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
         }
       }
       /**
@@ -7870,7 +7870,7 @@ public final class Wcf {
        *
        * .wcf.DbTables tables = 8;
        */
-      public Builder setTables(com.wechat.ferry.entity.po.Wcf.DbTables value) {
+      public Builder setTables(com.wechat.ferry.entity.proto.Wcf.DbTables value) {
         if (tablesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7891,7 +7891,7 @@ public final class Wcf {
        * .wcf.DbTables tables = 8;
        */
       public Builder setTables(
-          com.wechat.ferry.entity.po.Wcf.DbTables.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbTables.Builder builderForValue) {
         if (tablesBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -7908,11 +7908,11 @@ public final class Wcf {
        *
        * .wcf.DbTables tables = 8;
        */
-      public Builder mergeTables(com.wechat.ferry.entity.po.Wcf.DbTables value) {
+      public Builder mergeTables(com.wechat.ferry.entity.proto.Wcf.DbTables value) {
         if (tablesBuilder_ == null) {
           if (msgCase_ == 8 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbTables.newBuilder((com.wechat.ferry.entity.po.Wcf.DbTables) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbTables.newBuilder((com.wechat.ferry.entity.proto.Wcf.DbTables) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -7958,7 +7958,7 @@ public final class Wcf {
        *
        * .wcf.DbTables tables = 8;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTables.Builder getTablesBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbTables.Builder getTablesBuilder() {
         return getTablesFieldBuilder().getBuilder();
       }
       /**
@@ -7969,14 +7969,14 @@ public final class Wcf {
        * .wcf.DbTables tables = 8;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder getTablesOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder getTablesOrBuilder() {
         if ((msgCase_ == 8) && (tablesBuilder_ != null)) {
           return tablesBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 8) {
-            return (com.wechat.ferry.entity.po.Wcf.DbTables) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
         }
       }
       /**
@@ -7987,15 +7987,15 @@ public final class Wcf {
        * .wcf.DbTables tables = 8;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbTables, com.wechat.ferry.entity.po.Wcf.DbTables.Builder, com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbTables, com.wechat.ferry.entity.proto.Wcf.DbTables.Builder, com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder> 
           getTablesFieldBuilder() {
         if (tablesBuilder_ == null) {
           if (!(msgCase_ == 8)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
           }
           tablesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbTables, com.wechat.ferry.entity.po.Wcf.DbTables.Builder, com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.DbTables) msg_,
+              com.wechat.ferry.entity.proto.Wcf.DbTables, com.wechat.ferry.entity.proto.Wcf.DbTables.Builder, com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.DbTables) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -8006,7 +8006,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbRows, com.wechat.ferry.entity.po.Wcf.DbRows.Builder, com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder> rowsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbRows, com.wechat.ferry.entity.proto.Wcf.DbRows.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder> rowsBuilder_;
       /**
        * 
        * 行列表
@@ -8028,17 +8028,17 @@ public final class Wcf {
        * @return The rows.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRows getRows() {
+      public com.wechat.ferry.entity.proto.Wcf.DbRows getRows() {
         if (rowsBuilder_ == null) {
           if (msgCase_ == 9) {
-            return (com.wechat.ferry.entity.po.Wcf.DbRows) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
         } else {
           if (msgCase_ == 9) {
             return rowsBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
         }
       }
       /**
@@ -8048,7 +8048,7 @@ public final class Wcf {
        *
        * .wcf.DbRows rows = 9;
        */
-      public Builder setRows(com.wechat.ferry.entity.po.Wcf.DbRows value) {
+      public Builder setRows(com.wechat.ferry.entity.proto.Wcf.DbRows value) {
         if (rowsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8069,7 +8069,7 @@ public final class Wcf {
        * .wcf.DbRows rows = 9;
        */
       public Builder setRows(
-          com.wechat.ferry.entity.po.Wcf.DbRows.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbRows.Builder builderForValue) {
         if (rowsBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -8086,11 +8086,11 @@ public final class Wcf {
        *
        * .wcf.DbRows rows = 9;
        */
-      public Builder mergeRows(com.wechat.ferry.entity.po.Wcf.DbRows value) {
+      public Builder mergeRows(com.wechat.ferry.entity.proto.Wcf.DbRows value) {
         if (rowsBuilder_ == null) {
           if (msgCase_ == 9 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbRows.newBuilder((com.wechat.ferry.entity.po.Wcf.DbRows) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbRows.newBuilder((com.wechat.ferry.entity.proto.Wcf.DbRows) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -8136,7 +8136,7 @@ public final class Wcf {
        *
        * .wcf.DbRows rows = 9;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRows.Builder getRowsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbRows.Builder getRowsBuilder() {
         return getRowsFieldBuilder().getBuilder();
       }
       /**
@@ -8147,14 +8147,14 @@ public final class Wcf {
        * .wcf.DbRows rows = 9;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder getRowsOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder getRowsOrBuilder() {
         if ((msgCase_ == 9) && (rowsBuilder_ != null)) {
           return rowsBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 9) {
-            return (com.wechat.ferry.entity.po.Wcf.DbRows) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
         }
       }
       /**
@@ -8165,15 +8165,15 @@ public final class Wcf {
        * .wcf.DbRows rows = 9;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbRows, com.wechat.ferry.entity.po.Wcf.DbRows.Builder, com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbRows, com.wechat.ferry.entity.proto.Wcf.DbRows.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder> 
           getRowsFieldBuilder() {
         if (rowsBuilder_ == null) {
           if (!(msgCase_ == 9)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
           }
           rowsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbRows, com.wechat.ferry.entity.po.Wcf.DbRows.Builder, com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.DbRows) msg_,
+              com.wechat.ferry.entity.proto.Wcf.DbRows, com.wechat.ferry.entity.proto.Wcf.DbRows.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.DbRows) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -8184,7 +8184,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.UserInfo, com.wechat.ferry.entity.po.Wcf.UserInfo.Builder, com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder> uiBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.UserInfo, com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder, com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder> uiBuilder_;
       /**
        * 
        * 个人信息
@@ -8206,17 +8206,17 @@ public final class Wcf {
        * @return The ui.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.UserInfo getUi() {
+      public com.wechat.ferry.entity.proto.Wcf.UserInfo getUi() {
         if (uiBuilder_ == null) {
           if (msgCase_ == 10) {
-            return (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
         } else {
           if (msgCase_ == 10) {
             return uiBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
         }
       }
       /**
@@ -8226,7 +8226,7 @@ public final class Wcf {
        *
        * .wcf.UserInfo ui = 10;
        */
-      public Builder setUi(com.wechat.ferry.entity.po.Wcf.UserInfo value) {
+      public Builder setUi(com.wechat.ferry.entity.proto.Wcf.UserInfo value) {
         if (uiBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8247,7 +8247,7 @@ public final class Wcf {
        * .wcf.UserInfo ui = 10;
        */
       public Builder setUi(
-          com.wechat.ferry.entity.po.Wcf.UserInfo.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder builderForValue) {
         if (uiBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -8264,11 +8264,11 @@ public final class Wcf {
        *
        * .wcf.UserInfo ui = 10;
        */
-      public Builder mergeUi(com.wechat.ferry.entity.po.Wcf.UserInfo value) {
+      public Builder mergeUi(com.wechat.ferry.entity.proto.Wcf.UserInfo value) {
         if (uiBuilder_ == null) {
           if (msgCase_ == 10 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.UserInfo.newBuilder((com.wechat.ferry.entity.po.Wcf.UserInfo) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.UserInfo.newBuilder((com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -8314,7 +8314,7 @@ public final class Wcf {
        *
        * .wcf.UserInfo ui = 10;
        */
-      public com.wechat.ferry.entity.po.Wcf.UserInfo.Builder getUiBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder getUiBuilder() {
         return getUiFieldBuilder().getBuilder();
       }
       /**
@@ -8325,14 +8325,14 @@ public final class Wcf {
        * .wcf.UserInfo ui = 10;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder getUiOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder getUiOrBuilder() {
         if ((msgCase_ == 10) && (uiBuilder_ != null)) {
           return uiBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 10) {
-            return (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
         }
       }
       /**
@@ -8343,15 +8343,15 @@ public final class Wcf {
        * .wcf.UserInfo ui = 10;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.UserInfo, com.wechat.ferry.entity.po.Wcf.UserInfo.Builder, com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.UserInfo, com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder, com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder> 
           getUiFieldBuilder() {
         if (uiBuilder_ == null) {
           if (!(msgCase_ == 10)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
           }
           uiBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.UserInfo, com.wechat.ferry.entity.po.Wcf.UserInfo.Builder, com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.UserInfo) msg_,
+              com.wechat.ferry.entity.proto.Wcf.UserInfo, com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder, com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.UserInfo) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -8362,7 +8362,7 @@ public final class Wcf {
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.OcrMsg, com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder> ocrBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.OcrMsg, com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder> ocrBuilder_;
       /**
        * 
        * OCR 结果
@@ -8384,17 +8384,17 @@ public final class Wcf {
        * @return The ocr.
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.OcrMsg getOcr() {
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsg getOcr() {
         if (ocrBuilder_ == null) {
           if (msgCase_ == 11) {
-            return (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
         } else {
           if (msgCase_ == 11) {
             return ocrBuilder_.getMessage();
           }
-          return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
         }
       }
       /**
@@ -8404,7 +8404,7 @@ public final class Wcf {
        *
        * .wcf.OcrMsg ocr = 11;
        */
-      public Builder setOcr(com.wechat.ferry.entity.po.Wcf.OcrMsg value) {
+      public Builder setOcr(com.wechat.ferry.entity.proto.Wcf.OcrMsg value) {
         if (ocrBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8425,7 +8425,7 @@ public final class Wcf {
        * .wcf.OcrMsg ocr = 11;
        */
       public Builder setOcr(
-          com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder builderForValue) {
         if (ocrBuilder_ == null) {
           msg_ = builderForValue.build();
           onChanged();
@@ -8442,11 +8442,11 @@ public final class Wcf {
        *
        * .wcf.OcrMsg ocr = 11;
        */
-      public Builder mergeOcr(com.wechat.ferry.entity.po.Wcf.OcrMsg value) {
+      public Builder mergeOcr(com.wechat.ferry.entity.proto.Wcf.OcrMsg value) {
         if (ocrBuilder_ == null) {
           if (msgCase_ == 11 &&
-              msg_ != com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance()) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.OcrMsg.newBuilder((com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_)
+              msg_ != com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance()) {
+            msg_ = com.wechat.ferry.entity.proto.Wcf.OcrMsg.newBuilder((com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_)
                 .mergeFrom(value).buildPartial();
           } else {
             msg_ = value;
@@ -8492,7 +8492,7 @@ public final class Wcf {
        *
        * .wcf.OcrMsg ocr = 11;
        */
-      public com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder getOcrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder getOcrBuilder() {
         return getOcrFieldBuilder().getBuilder();
       }
       /**
@@ -8503,14 +8503,14 @@ public final class Wcf {
        * .wcf.OcrMsg ocr = 11;
        */
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder getOcrOrBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder getOcrOrBuilder() {
         if ((msgCase_ == 11) && (ocrBuilder_ != null)) {
           return ocrBuilder_.getMessageOrBuilder();
         } else {
           if (msgCase_ == 11) {
-            return (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_;
+            return (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_;
           }
-          return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+          return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
         }
       }
       /**
@@ -8521,15 +8521,15 @@ public final class Wcf {
        * .wcf.OcrMsg ocr = 11;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.OcrMsg, com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.OcrMsg, com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder> 
           getOcrFieldBuilder() {
         if (ocrBuilder_ == null) {
           if (!(msgCase_ == 11)) {
-            msg_ = com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+            msg_ = com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
           }
           ocrBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.OcrMsg, com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder>(
-                  (com.wechat.ferry.entity.po.Wcf.OcrMsg) msg_,
+              com.wechat.ferry.entity.proto.Wcf.OcrMsg, com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder, com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder>(
+                  (com.wechat.ferry.entity.proto.Wcf.OcrMsg) msg_,
                   getParentForChildren(),
                   isClean());
           msg_ = null;
@@ -8555,12 +8555,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.Response)
-    private static final com.wechat.ferry.entity.po.Wcf.Response DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.Response DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.Response();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.Response();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Response getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.Response getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8596,7 +8596,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Response getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.Response getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8630,15 +8630,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Empty_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Empty_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Empty_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Empty_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.Empty.class, com.wechat.ferry.entity.po.Wcf.Empty.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.Empty.class, com.wechat.ferry.entity.proto.Wcf.Empty.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -8674,10 +8674,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.Empty)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.Empty)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.Empty other = (com.wechat.ferry.entity.po.Wcf.Empty) obj;
+      com.wechat.ferry.entity.proto.Wcf.Empty other = (com.wechat.ferry.entity.proto.Wcf.Empty) obj;
 
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
@@ -8695,69 +8695,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Empty parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Empty parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8770,7 +8770,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.Empty prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.Empty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8791,21 +8791,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.Empty)
-        com.wechat.ferry.entity.po.Wcf.EmptyOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.EmptyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Empty_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Empty_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Empty_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Empty_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.Empty.class, com.wechat.ferry.entity.po.Wcf.Empty.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.Empty.class, com.wechat.ferry.entity.proto.Wcf.Empty.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.Empty.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.Empty.newBuilder()
       private Builder() {
 
       }
@@ -8824,17 +8824,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Empty_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Empty_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Empty getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.Empty getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Empty build() {
-        com.wechat.ferry.entity.po.Wcf.Empty result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.Empty build() {
+        com.wechat.ferry.entity.proto.Wcf.Empty result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8842,24 +8842,24 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Empty buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.Empty result = new com.wechat.ferry.entity.po.Wcf.Empty(this);
+      public com.wechat.ferry.entity.proto.Wcf.Empty buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.Empty result = new com.wechat.ferry.entity.proto.Wcf.Empty(this);
         onBuilt();
         return result;
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.Empty) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.Empty)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.Empty) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.Empty)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.Empty other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.Empty.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.Empty other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.Empty.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -8918,12 +8918,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.Empty)
-    private static final com.wechat.ferry.entity.po.Wcf.Empty DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.Empty DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.Empty();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.Empty();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Empty getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.Empty getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8959,7 +8959,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Empty getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.Empty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9190,15 +9190,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_WxMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_WxMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_WxMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_WxMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.WxMsg.class, com.wechat.ferry.entity.po.Wcf.WxMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.WxMsg.class, com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder.class);
     }
 
     public static final int IS_SELF_FIELD_NUMBER = 1;
@@ -9715,10 +9715,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.WxMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.WxMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.WxMsg other = (com.wechat.ferry.entity.po.Wcf.WxMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.WxMsg other = (com.wechat.ferry.entity.proto.Wcf.WxMsg) obj;
 
       if (getIsSelf()
           != other.getIsSelf()) return false;
@@ -9787,69 +9787,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9862,7 +9862,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.WxMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.WxMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9883,21 +9883,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.WxMsg)
-        com.wechat.ferry.entity.po.Wcf.WxMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.WxMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_WxMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_WxMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_WxMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_WxMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.WxMsg.class, com.wechat.ferry.entity.po.Wcf.WxMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.WxMsg.class, com.wechat.ferry.entity.proto.Wcf.WxMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.WxMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.WxMsg.newBuilder()
       private Builder() {
 
       }
@@ -9929,17 +9929,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_WxMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_WxMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.WxMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.WxMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.WxMsg build() {
-        com.wechat.ferry.entity.po.Wcf.WxMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.WxMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.WxMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9947,14 +9947,14 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.WxMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.WxMsg result = new com.wechat.ferry.entity.po.Wcf.WxMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.WxMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.WxMsg result = new com.wechat.ferry.entity.proto.Wcf.WxMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.WxMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.WxMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.isSelf_ = isSelf_;
@@ -9996,16 +9996,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.WxMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.WxMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.WxMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.WxMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.WxMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.WxMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.WxMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.WxMsg.getDefaultInstance()) return this;
         if (other.getIsSelf() != false) {
           setIsSelf(other.getIsSelf());
         }
@@ -11039,12 +11039,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.WxMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.WxMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.WxMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.WxMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.WxMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.WxMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.WxMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11080,7 +11080,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.WxMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.WxMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11177,15 +11177,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_TextMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_TextMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_TextMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_TextMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.TextMsg.class, com.wechat.ferry.entity.po.Wcf.TextMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.TextMsg.class, com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder.class);
     }
 
     public static final int MSG_FIELD_NUMBER = 1;
@@ -11380,10 +11380,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.TextMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.TextMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.TextMsg other = (com.wechat.ferry.entity.po.Wcf.TextMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.TextMsg other = (com.wechat.ferry.entity.proto.Wcf.TextMsg) obj;
 
       if (!getMsg()
           .equals(other.getMsg())) return false;
@@ -11413,69 +11413,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -11488,7 +11488,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.TextMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.TextMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -11509,21 +11509,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.TextMsg)
-        com.wechat.ferry.entity.po.Wcf.TextMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.TextMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_TextMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_TextMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_TextMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_TextMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.TextMsg.class, com.wechat.ferry.entity.po.Wcf.TextMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.TextMsg.class, com.wechat.ferry.entity.proto.Wcf.TextMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.TextMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.TextMsg.newBuilder()
       private Builder() {
 
       }
@@ -11546,17 +11546,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_TextMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_TextMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TextMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.TextMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TextMsg build() {
-        com.wechat.ferry.entity.po.Wcf.TextMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.TextMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.TextMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11564,14 +11564,14 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.TextMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.TextMsg result = new com.wechat.ferry.entity.po.Wcf.TextMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.TextMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.TextMsg result = new com.wechat.ferry.entity.proto.Wcf.TextMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.TextMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.TextMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.msg_ = msg_;
@@ -11586,16 +11586,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.TextMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.TextMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.TextMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.TextMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.TextMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.TextMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.TextMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.TextMsg.getDefaultInstance()) return this;
         if (!other.getMsg().isEmpty()) {
           msg_ = other.msg_;
           bitField0_ |= 0x00000001;
@@ -11961,12 +11961,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.TextMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.TextMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.TextMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.TextMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.TextMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.TextMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.TextMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12002,7 +12002,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.TextMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.TextMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12078,15 +12078,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PathMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PathMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PathMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PathMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.PathMsg.class, com.wechat.ferry.entity.po.Wcf.PathMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.PathMsg.class, com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder.class);
     }
 
     public static final int PATH_FIELD_NUMBER = 1;
@@ -12228,10 +12228,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.PathMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.PathMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.PathMsg other = (com.wechat.ferry.entity.po.Wcf.PathMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.PathMsg other = (com.wechat.ferry.entity.proto.Wcf.PathMsg) obj;
 
       if (!getPath()
           .equals(other.getPath())) return false;
@@ -12257,69 +12257,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -12332,7 +12332,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.PathMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.PathMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -12353,21 +12353,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.PathMsg)
-        com.wechat.ferry.entity.po.Wcf.PathMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.PathMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PathMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PathMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PathMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PathMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.PathMsg.class, com.wechat.ferry.entity.po.Wcf.PathMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.PathMsg.class, com.wechat.ferry.entity.proto.Wcf.PathMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.PathMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.PathMsg.newBuilder()
       private Builder() {
 
       }
@@ -12389,17 +12389,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PathMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PathMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PathMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.PathMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PathMsg build() {
-        com.wechat.ferry.entity.po.Wcf.PathMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.PathMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.PathMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -12407,14 +12407,14 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PathMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.PathMsg result = new com.wechat.ferry.entity.po.Wcf.PathMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.PathMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.PathMsg result = new com.wechat.ferry.entity.proto.Wcf.PathMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.PathMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.PathMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.path_ = path_;
@@ -12426,16 +12426,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.PathMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.PathMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.PathMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.PathMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.PathMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.PathMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.PathMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.PathMsg.getDefaultInstance()) return this;
         if (!other.getPath().isEmpty()) {
           path_ = other.path_;
           bitField0_ |= 0x00000001;
@@ -12699,12 +12699,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.PathMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.PathMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.PathMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.PathMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.PathMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.PathMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.PathMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12740,7 +12740,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PathMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.PathMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12847,15 +12847,15 @@ public final class Wcf {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_XmlMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_XmlMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_XmlMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_XmlMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.XmlMsg.class, com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.XmlMsg.class, com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder.class);
     }
 
     public static final int RECEIVER_FIELD_NUMBER = 1;
@@ -13072,10 +13072,10 @@ public final class Wcf {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.XmlMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.XmlMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.XmlMsg other = (com.wechat.ferry.entity.po.Wcf.XmlMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.XmlMsg other = (com.wechat.ferry.entity.proto.Wcf.XmlMsg) obj;
 
       if (!getReceiver()
           .equals(other.getReceiver())) return false;
@@ -13109,69 +13109,69 @@ public final class Wcf {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -13184,7 +13184,7 @@ public final class Wcf {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.XmlMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.XmlMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -13205,21 +13205,21 @@ public final class Wcf {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.XmlMsg)
-        com.wechat.ferry.entity.po.Wcf.XmlMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.XmlMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_XmlMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_XmlMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_XmlMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_XmlMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.XmlMsg.class, com.wechat.ferry.entity.po.Wcf.XmlMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.XmlMsg.class, com.wechat.ferry.entity.proto.Wcf.XmlMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.XmlMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.XmlMsg.newBuilder()
       private Builder() {
 
       }
@@ -13243,17 +13243,17 @@ public final class Wcf {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_XmlMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_XmlMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.XmlMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.XmlMsg build() {
-        com.wechat.ferry.entity.po.Wcf.XmlMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.XmlMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -13261,14 +13261,14 @@ public final class Wcf {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.XmlMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.XmlMsg result = new com.wechat.ferry.entity.po.Wcf.XmlMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.XmlMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.XmlMsg result = new com.wechat.ferry.entity.proto.Wcf.XmlMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.XmlMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.XmlMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.receiver_ = receiver_;
@@ -13286,16 +13286,16 @@ public final class Wcf {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.XmlMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.XmlMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.XmlMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.XmlMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.XmlMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.XmlMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.XmlMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.XmlMsg.getDefaultInstance()) return this;
         if (!other.getReceiver().isEmpty()) {
           receiver_ = other.receiver_;
           bitField0_ |= 0x00000001;
@@ -13713,12 +13713,12 @@ public final class Wcf {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.XmlMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.XmlMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.XmlMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.XmlMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.XmlMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.XmlMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.XmlMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13754,7 +13754,7 @@ public final class Wcf {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.XmlMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.XmlMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13822,7 +13822,7 @@ java.lang.String defaultValue);
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -13840,9 +13840,9 @@ java.lang.String defaultValue);
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.MsgTypes.class, com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.MsgTypes.class, com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder.class);
     }
 
     public static final int TYPES_FIELD_NUMBER = 1;
@@ -13851,7 +13851,7 @@ java.lang.String defaultValue);
           java.lang.Integer, java.lang.String> defaultEntry =
               com.google.protobuf.MapEntry
               .newDefaultInstance(
-                  com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_TypesEntry_descriptor, 
+                  com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_TypesEntry_descriptor, 
                   com.google.protobuf.WireFormat.FieldType.INT32,
                   0,
                   com.google.protobuf.WireFormat.FieldType.STRING,
@@ -13973,10 +13973,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.MsgTypes)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.MsgTypes)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.MsgTypes other = (com.wechat.ferry.entity.po.Wcf.MsgTypes) obj;
+      com.wechat.ferry.entity.proto.Wcf.MsgTypes other = (com.wechat.ferry.entity.proto.Wcf.MsgTypes) obj;
 
       if (!internalGetTypes().equals(
           other.internalGetTypes())) return false;
@@ -14000,69 +14000,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14075,7 +14075,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.MsgTypes prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.MsgTypes prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14096,10 +14096,10 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.MsgTypes)
-        com.wechat.ferry.entity.po.Wcf.MsgTypesOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.MsgTypesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -14127,12 +14127,12 @@ java.lang.String defaultValue) {
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.MsgTypes.class, com.wechat.ferry.entity.po.Wcf.MsgTypes.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.MsgTypes.class, com.wechat.ferry.entity.proto.Wcf.MsgTypes.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.MsgTypes.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.MsgTypes.newBuilder()
       private Builder() {
 
       }
@@ -14153,17 +14153,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MsgTypes_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MsgTypes_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MsgTypes getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypes getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MsgTypes build() {
-        com.wechat.ferry.entity.po.Wcf.MsgTypes result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypes build() {
+        com.wechat.ferry.entity.proto.Wcf.MsgTypes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14171,14 +14171,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MsgTypes buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.MsgTypes result = new com.wechat.ferry.entity.po.Wcf.MsgTypes(this);
+      public com.wechat.ferry.entity.proto.Wcf.MsgTypes buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.MsgTypes result = new com.wechat.ferry.entity.proto.Wcf.MsgTypes(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.MsgTypes result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.MsgTypes result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.types_ = internalGetTypes();
@@ -14188,16 +14188,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.MsgTypes) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.MsgTypes)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.MsgTypes) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.MsgTypes)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.MsgTypes other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.MsgTypes.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.MsgTypes other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.MsgTypes.getDefaultInstance()) return this;
         internalGetMutableTypes().mergeFrom(
             other.internalGetTypes());
         bitField0_ |= 0x00000001;
@@ -14396,12 +14396,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.MsgTypes)
-    private static final com.wechat.ferry.entity.po.Wcf.MsgTypes DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.MsgTypes DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.MsgTypes();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.MsgTypes();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.MsgTypes getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.MsgTypes getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14437,7 +14437,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MsgTypes getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.MsgTypes getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14628,15 +14628,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContact_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContact_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContact_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContact_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.RpcContact.class, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.RpcContact.class, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder.class);
     }
 
     public static final int WXID_FIELD_NUMBER = 1;
@@ -15065,10 +15065,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.RpcContact)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.RpcContact)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.RpcContact other = (com.wechat.ferry.entity.po.Wcf.RpcContact) obj;
+      com.wechat.ferry.entity.proto.Wcf.RpcContact other = (com.wechat.ferry.entity.proto.Wcf.RpcContact) obj;
 
       if (!getWxid()
           .equals(other.getWxid())) return false;
@@ -15118,69 +15118,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -15193,7 +15193,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.RpcContact prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.RpcContact prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -15214,21 +15214,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.RpcContact)
-        com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContact_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContact_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContact_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContact_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.RpcContact.class, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.RpcContact.class, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.RpcContact.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.RpcContact.newBuilder()
       private Builder() {
 
       }
@@ -15256,17 +15256,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContact_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContact_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContact getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.RpcContact.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.RpcContact.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContact build() {
-        com.wechat.ferry.entity.po.Wcf.RpcContact result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact build() {
+        com.wechat.ferry.entity.proto.Wcf.RpcContact result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -15274,14 +15274,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContact buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.RpcContact result = new com.wechat.ferry.entity.po.Wcf.RpcContact(this);
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.RpcContact result = new com.wechat.ferry.entity.proto.Wcf.RpcContact(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.RpcContact result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.RpcContact result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.wxid_ = wxid_;
@@ -15311,16 +15311,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.RpcContact) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.RpcContact)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.RpcContact) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.RpcContact)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.RpcContact other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.RpcContact.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.RpcContact other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.RpcContact.getDefaultInstance()) return this;
         if (!other.getWxid().isEmpty()) {
           wxid_ = other.wxid_;
           bitField0_ |= 0x00000001;
@@ -16146,12 +16146,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.RpcContact)
-    private static final com.wechat.ferry.entity.po.Wcf.RpcContact DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.RpcContact DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.RpcContact();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.RpcContact();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RpcContact getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContact getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16187,7 +16187,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContact getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.RpcContact getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16200,12 +16200,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
-    java.util.List 
+    java.util.List 
         getContactsList();
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.RpcContact getContacts(int index);
+    com.wechat.ferry.entity.proto.Wcf.RpcContact getContacts(int index);
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
@@ -16213,12 +16213,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
-    java.util.List 
+    java.util.List 
         getContactsOrBuilderList();
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder getContactsOrBuilder(
+    com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder getContactsOrBuilder(
         int index);
   }
   /**
@@ -16246,32 +16246,32 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContacts_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContacts_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContacts_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContacts_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.RpcContacts.class, com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.RpcContacts.class, com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder.class);
     }
 
     public static final int CONTACTS_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List contacts_;
+    private java.util.List contacts_;
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
     @java.lang.Override
-    public java.util.List getContactsList() {
+    public java.util.List getContactsList() {
       return contacts_;
     }
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
     @java.lang.Override
-    public java.util.List 
+    public java.util.List 
         getContactsOrBuilderList() {
       return contacts_;
     }
@@ -16286,14 +16286,14 @@ java.lang.String defaultValue) {
      * repeated .wcf.RpcContact contacts = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContact getContacts(int index) {
+    public com.wechat.ferry.entity.proto.Wcf.RpcContact getContacts(int index) {
       return contacts_.get(index);
     }
     /**
      * repeated .wcf.RpcContact contacts = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder getContactsOrBuilder(
+    public com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder getContactsOrBuilder(
         int index) {
       return contacts_.get(index);
     }
@@ -16338,10 +16338,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.RpcContacts)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.RpcContacts)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.RpcContacts other = (com.wechat.ferry.entity.po.Wcf.RpcContacts) obj;
+      com.wechat.ferry.entity.proto.Wcf.RpcContacts other = (com.wechat.ferry.entity.proto.Wcf.RpcContacts) obj;
 
       if (!getContactsList()
           .equals(other.getContactsList())) return false;
@@ -16365,69 +16365,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -16440,7 +16440,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.RpcContacts prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.RpcContacts prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -16461,21 +16461,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.RpcContacts)
-        com.wechat.ferry.entity.po.Wcf.RpcContactsOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.RpcContactsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContacts_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContacts_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContacts_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContacts_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.RpcContacts.class, com.wechat.ferry.entity.po.Wcf.RpcContacts.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.RpcContacts.class, com.wechat.ferry.entity.proto.Wcf.RpcContacts.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.RpcContacts.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.RpcContacts.newBuilder()
       private Builder() {
 
       }
@@ -16502,17 +16502,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RpcContacts_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RpcContacts_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContacts getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.RpcContacts getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContacts build() {
-        com.wechat.ferry.entity.po.Wcf.RpcContacts result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.RpcContacts build() {
+        com.wechat.ferry.entity.proto.Wcf.RpcContacts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -16520,15 +16520,15 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RpcContacts buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.RpcContacts result = new com.wechat.ferry.entity.po.Wcf.RpcContacts(this);
+      public com.wechat.ferry.entity.proto.Wcf.RpcContacts buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.RpcContacts result = new com.wechat.ferry.entity.proto.Wcf.RpcContacts(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(com.wechat.ferry.entity.po.Wcf.RpcContacts result) {
+      private void buildPartialRepeatedFields(com.wechat.ferry.entity.proto.Wcf.RpcContacts result) {
         if (contactsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             contacts_ = java.util.Collections.unmodifiableList(contacts_);
@@ -16540,22 +16540,22 @@ java.lang.String defaultValue) {
         }
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.RpcContacts result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.RpcContacts result) {
         int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.RpcContacts) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.RpcContacts)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.RpcContacts) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.RpcContacts)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.RpcContacts other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.RpcContacts.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.RpcContacts other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.RpcContacts.getDefaultInstance()) return this;
         if (contactsBuilder_ == null) {
           if (!other.contacts_.isEmpty()) {
             if (contacts_.isEmpty()) {
@@ -16609,9 +16609,9 @@ java.lang.String defaultValue) {
                 done = true;
                 break;
               case 10: {
-                com.wechat.ferry.entity.po.Wcf.RpcContact m =
+                com.wechat.ferry.entity.proto.Wcf.RpcContact m =
                     input.readMessage(
-                        com.wechat.ferry.entity.po.Wcf.RpcContact.parser(),
+                        com.wechat.ferry.entity.proto.Wcf.RpcContact.parser(),
                         extensionRegistry);
                 if (contactsBuilder_ == null) {
                   ensureContactsIsMutable();
@@ -16638,22 +16638,22 @@ java.lang.String defaultValue) {
       }
       private int bitField0_;
 
-      private java.util.List contacts_ =
+      private java.util.List contacts_ =
         java.util.Collections.emptyList();
       private void ensureContactsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          contacts_ = new java.util.ArrayList(contacts_);
+          contacts_ = new java.util.ArrayList(contacts_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RpcContact, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder> contactsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.RpcContact, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder> contactsBuilder_;
 
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public java.util.List getContactsList() {
+      public java.util.List getContactsList() {
         if (contactsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(contacts_);
         } else {
@@ -16673,7 +16673,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContact getContacts(int index) {
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact getContacts(int index) {
         if (contactsBuilder_ == null) {
           return contacts_.get(index);
         } else {
@@ -16684,7 +16684,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder setContacts(
-          int index, com.wechat.ferry.entity.po.Wcf.RpcContact value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.RpcContact value) {
         if (contactsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16701,7 +16701,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder setContacts(
-          int index, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder builderForValue) {
         if (contactsBuilder_ == null) {
           ensureContactsIsMutable();
           contacts_.set(index, builderForValue.build());
@@ -16714,7 +16714,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public Builder addContacts(com.wechat.ferry.entity.po.Wcf.RpcContact value) {
+      public Builder addContacts(com.wechat.ferry.entity.proto.Wcf.RpcContact value) {
         if (contactsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16731,7 +16731,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder addContacts(
-          int index, com.wechat.ferry.entity.po.Wcf.RpcContact value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.RpcContact value) {
         if (contactsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16748,7 +16748,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder addContacts(
-          com.wechat.ferry.entity.po.Wcf.RpcContact.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder builderForValue) {
         if (contactsBuilder_ == null) {
           ensureContactsIsMutable();
           contacts_.add(builderForValue.build());
@@ -16762,7 +16762,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder addContacts(
-          int index, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder builderForValue) {
         if (contactsBuilder_ == null) {
           ensureContactsIsMutable();
           contacts_.add(index, builderForValue.build());
@@ -16776,7 +16776,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.RpcContact contacts = 1;
        */
       public Builder addAllContacts(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (contactsBuilder_ == null) {
           ensureContactsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -16816,14 +16816,14 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContact.Builder getContactsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder getContactsBuilder(
           int index) {
         return getContactsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder getContactsOrBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder getContactsOrBuilder(
           int index) {
         if (contactsBuilder_ == null) {
           return contacts_.get(index);  } else {
@@ -16833,7 +16833,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getContactsOrBuilderList() {
         if (contactsBuilder_ != null) {
           return contactsBuilder_.getMessageOrBuilderList();
@@ -16844,31 +16844,31 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContact.Builder addContactsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder addContactsBuilder() {
         return getContactsFieldBuilder().addBuilder(
-            com.wechat.ferry.entity.po.Wcf.RpcContact.getDefaultInstance());
+            com.wechat.ferry.entity.proto.Wcf.RpcContact.getDefaultInstance());
       }
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.RpcContact.Builder addContactsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder addContactsBuilder(
           int index) {
         return getContactsFieldBuilder().addBuilder(
-            index, com.wechat.ferry.entity.po.Wcf.RpcContact.getDefaultInstance());
+            index, com.wechat.ferry.entity.proto.Wcf.RpcContact.getDefaultInstance());
       }
       /**
        * repeated .wcf.RpcContact contacts = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getContactsBuilderList() {
         return getContactsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.RpcContact, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.RpcContact, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder> 
           getContactsFieldBuilder() {
         if (contactsBuilder_ == null) {
           contactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.RpcContact, com.wechat.ferry.entity.po.Wcf.RpcContact.Builder, com.wechat.ferry.entity.po.Wcf.RpcContactOrBuilder>(
+              com.wechat.ferry.entity.proto.Wcf.RpcContact, com.wechat.ferry.entity.proto.Wcf.RpcContact.Builder, com.wechat.ferry.entity.proto.Wcf.RpcContactOrBuilder>(
                   contacts_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -16894,12 +16894,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.RpcContacts)
-    private static final com.wechat.ferry.entity.po.Wcf.RpcContacts DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.RpcContacts DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.RpcContacts();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.RpcContacts();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RpcContacts getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.RpcContacts getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16935,7 +16935,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RpcContacts getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.RpcContacts getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16996,15 +16996,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbNames_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbNames_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbNames_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbNames_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbNames.class, com.wechat.ferry.entity.po.Wcf.DbNames.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbNames.class, com.wechat.ferry.entity.proto.Wcf.DbNames.Builder.class);
     }
 
     public static final int NAMES_FIELD_NUMBER = 1;
@@ -17088,10 +17088,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbNames)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbNames)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbNames other = (com.wechat.ferry.entity.po.Wcf.DbNames) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbNames other = (com.wechat.ferry.entity.proto.Wcf.DbNames) obj;
 
       if (!getNamesList()
           .equals(other.getNamesList())) return false;
@@ -17115,69 +17115,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbNames parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -17190,7 +17190,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbNames prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbNames prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17211,21 +17211,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbNames)
-        com.wechat.ferry.entity.po.Wcf.DbNamesOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbNamesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbNames_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbNames_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbNames_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbNames_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbNames.class, com.wechat.ferry.entity.po.Wcf.DbNames.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbNames.class, com.wechat.ferry.entity.proto.Wcf.DbNames.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbNames.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbNames.newBuilder()
       private Builder() {
 
       }
@@ -17247,17 +17247,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbNames_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbNames_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbNames getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbNames getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbNames build() {
-        com.wechat.ferry.entity.po.Wcf.DbNames result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbNames build() {
+        com.wechat.ferry.entity.proto.Wcf.DbNames result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17265,14 +17265,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbNames buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbNames result = new com.wechat.ferry.entity.po.Wcf.DbNames(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbNames buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbNames result = new com.wechat.ferry.entity.proto.Wcf.DbNames(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbNames result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbNames result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           names_.makeImmutable();
@@ -17282,16 +17282,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbNames) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbNames)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbNames) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbNames)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbNames other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbNames.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbNames other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbNames.getDefaultInstance()) return this;
         if (!other.names_.isEmpty()) {
           if (names_.isEmpty()) {
             names_ = other.names_;
@@ -17478,12 +17478,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbNames)
-    private static final com.wechat.ferry.entity.po.Wcf.DbNames DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbNames DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbNames();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbNames();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbNames getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbNames getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -17519,7 +17519,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbNames getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbNames getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -17595,15 +17595,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTable_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTable_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTable_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbTable.class, com.wechat.ferry.entity.po.Wcf.DbTable.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbTable.class, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder.class);
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
@@ -17745,10 +17745,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbTable)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbTable)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbTable other = (com.wechat.ferry.entity.po.Wcf.DbTable) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbTable other = (com.wechat.ferry.entity.proto.Wcf.DbTable) obj;
 
       if (!getName()
           .equals(other.getName())) return false;
@@ -17774,69 +17774,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTable parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -17849,7 +17849,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbTable prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbTable prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17870,21 +17870,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbTable)
-        com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTable_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTable_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTable_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbTable.class, com.wechat.ferry.entity.po.Wcf.DbTable.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbTable.class, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbTable.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbTable.newBuilder()
       private Builder() {
 
       }
@@ -17906,17 +17906,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTable_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTable_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTable getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbTable.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbTable getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbTable.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTable build() {
-        com.wechat.ferry.entity.po.Wcf.DbTable result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbTable build() {
+        com.wechat.ferry.entity.proto.Wcf.DbTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17924,14 +17924,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTable buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbTable result = new com.wechat.ferry.entity.po.Wcf.DbTable(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbTable buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbTable result = new com.wechat.ferry.entity.proto.Wcf.DbTable(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbTable result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbTable result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.name_ = name_;
@@ -17943,16 +17943,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbTable) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbTable)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbTable) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbTable)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbTable other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbTable other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbTable.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           bitField0_ |= 0x00000001;
@@ -18216,12 +18216,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbTable)
-    private static final com.wechat.ferry.entity.po.Wcf.DbTable DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbTable DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbTable();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbTable();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbTable getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbTable getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -18257,7 +18257,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTable getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbTable getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -18270,12 +18270,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbTable tables = 1;
      */
-    java.util.List 
+    java.util.List 
         getTablesList();
     /**
      * repeated .wcf.DbTable tables = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbTable getTables(int index);
+    com.wechat.ferry.entity.proto.Wcf.DbTable getTables(int index);
     /**
      * repeated .wcf.DbTable tables = 1;
      */
@@ -18283,12 +18283,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbTable tables = 1;
      */
-    java.util.List 
+    java.util.List 
         getTablesOrBuilderList();
     /**
      * repeated .wcf.DbTable tables = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder getTablesOrBuilder(
+    com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder getTablesOrBuilder(
         int index);
   }
   /**
@@ -18316,32 +18316,32 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTables_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTables_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTables_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTables_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbTables.class, com.wechat.ferry.entity.po.Wcf.DbTables.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbTables.class, com.wechat.ferry.entity.proto.Wcf.DbTables.Builder.class);
     }
 
     public static final int TABLES_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List tables_;
+    private java.util.List tables_;
     /**
      * repeated .wcf.DbTable tables = 1;
      */
     @java.lang.Override
-    public java.util.List getTablesList() {
+    public java.util.List getTablesList() {
       return tables_;
     }
     /**
      * repeated .wcf.DbTable tables = 1;
      */
     @java.lang.Override
-    public java.util.List 
+    public java.util.List 
         getTablesOrBuilderList() {
       return tables_;
     }
@@ -18356,14 +18356,14 @@ java.lang.String defaultValue) {
      * repeated .wcf.DbTable tables = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTable getTables(int index) {
+    public com.wechat.ferry.entity.proto.Wcf.DbTable getTables(int index) {
       return tables_.get(index);
     }
     /**
      * repeated .wcf.DbTable tables = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder getTablesOrBuilder(
+    public com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder getTablesOrBuilder(
         int index) {
       return tables_.get(index);
     }
@@ -18408,10 +18408,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbTables)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbTables)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbTables other = (com.wechat.ferry.entity.po.Wcf.DbTables) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbTables other = (com.wechat.ferry.entity.proto.Wcf.DbTables) obj;
 
       if (!getTablesList()
           .equals(other.getTablesList())) return false;
@@ -18435,69 +18435,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbTables parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -18510,7 +18510,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbTables prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbTables prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18531,21 +18531,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbTables)
-        com.wechat.ferry.entity.po.Wcf.DbTablesOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbTablesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTables_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTables_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTables_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTables_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbTables.class, com.wechat.ferry.entity.po.Wcf.DbTables.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbTables.class, com.wechat.ferry.entity.proto.Wcf.DbTables.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbTables.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbTables.newBuilder()
       private Builder() {
 
       }
@@ -18572,17 +18572,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbTables_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbTables_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTables getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbTables getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTables build() {
-        com.wechat.ferry.entity.po.Wcf.DbTables result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbTables build() {
+        com.wechat.ferry.entity.proto.Wcf.DbTables result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -18590,15 +18590,15 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbTables buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbTables result = new com.wechat.ferry.entity.po.Wcf.DbTables(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbTables buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbTables result = new com.wechat.ferry.entity.proto.Wcf.DbTables(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(com.wechat.ferry.entity.po.Wcf.DbTables result) {
+      private void buildPartialRepeatedFields(com.wechat.ferry.entity.proto.Wcf.DbTables result) {
         if (tablesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             tables_ = java.util.Collections.unmodifiableList(tables_);
@@ -18610,22 +18610,22 @@ java.lang.String defaultValue) {
         }
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbTables result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbTables result) {
         int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbTables) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbTables)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbTables) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbTables)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbTables other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbTables.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbTables other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbTables.getDefaultInstance()) return this;
         if (tablesBuilder_ == null) {
           if (!other.tables_.isEmpty()) {
             if (tables_.isEmpty()) {
@@ -18679,9 +18679,9 @@ java.lang.String defaultValue) {
                 done = true;
                 break;
               case 10: {
-                com.wechat.ferry.entity.po.Wcf.DbTable m =
+                com.wechat.ferry.entity.proto.Wcf.DbTable m =
                     input.readMessage(
-                        com.wechat.ferry.entity.po.Wcf.DbTable.parser(),
+                        com.wechat.ferry.entity.proto.Wcf.DbTable.parser(),
                         extensionRegistry);
                 if (tablesBuilder_ == null) {
                   ensureTablesIsMutable();
@@ -18708,22 +18708,22 @@ java.lang.String defaultValue) {
       }
       private int bitField0_;
 
-      private java.util.List tables_ =
+      private java.util.List tables_ =
         java.util.Collections.emptyList();
       private void ensureTablesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          tables_ = new java.util.ArrayList(tables_);
+          tables_ = new java.util.ArrayList(tables_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbTable, com.wechat.ferry.entity.po.Wcf.DbTable.Builder, com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder> tablesBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbTable, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder, com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder> tablesBuilder_;
 
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public java.util.List getTablesList() {
+      public java.util.List getTablesList() {
         if (tablesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(tables_);
         } else {
@@ -18743,7 +18743,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTable getTables(int index) {
+      public com.wechat.ferry.entity.proto.Wcf.DbTable getTables(int index) {
         if (tablesBuilder_ == null) {
           return tables_.get(index);
         } else {
@@ -18754,7 +18754,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder setTables(
-          int index, com.wechat.ferry.entity.po.Wcf.DbTable value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbTable value) {
         if (tablesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -18771,7 +18771,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder setTables(
-          int index, com.wechat.ferry.entity.po.Wcf.DbTable.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder builderForValue) {
         if (tablesBuilder_ == null) {
           ensureTablesIsMutable();
           tables_.set(index, builderForValue.build());
@@ -18784,7 +18784,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public Builder addTables(com.wechat.ferry.entity.po.Wcf.DbTable value) {
+      public Builder addTables(com.wechat.ferry.entity.proto.Wcf.DbTable value) {
         if (tablesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -18801,7 +18801,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder addTables(
-          int index, com.wechat.ferry.entity.po.Wcf.DbTable value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbTable value) {
         if (tablesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -18818,7 +18818,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder addTables(
-          com.wechat.ferry.entity.po.Wcf.DbTable.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbTable.Builder builderForValue) {
         if (tablesBuilder_ == null) {
           ensureTablesIsMutable();
           tables_.add(builderForValue.build());
@@ -18832,7 +18832,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder addTables(
-          int index, com.wechat.ferry.entity.po.Wcf.DbTable.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder builderForValue) {
         if (tablesBuilder_ == null) {
           ensureTablesIsMutable();
           tables_.add(index, builderForValue.build());
@@ -18846,7 +18846,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbTable tables = 1;
        */
       public Builder addAllTables(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (tablesBuilder_ == null) {
           ensureTablesIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -18886,14 +18886,14 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTable.Builder getTablesBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbTable.Builder getTablesBuilder(
           int index) {
         return getTablesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder getTablesOrBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder getTablesOrBuilder(
           int index) {
         if (tablesBuilder_ == null) {
           return tables_.get(index);  } else {
@@ -18903,7 +18903,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getTablesOrBuilderList() {
         if (tablesBuilder_ != null) {
           return tablesBuilder_.getMessageOrBuilderList();
@@ -18914,31 +18914,31 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTable.Builder addTablesBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbTable.Builder addTablesBuilder() {
         return getTablesFieldBuilder().addBuilder(
-            com.wechat.ferry.entity.po.Wcf.DbTable.getDefaultInstance());
+            com.wechat.ferry.entity.proto.Wcf.DbTable.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbTable.Builder addTablesBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbTable.Builder addTablesBuilder(
           int index) {
         return getTablesFieldBuilder().addBuilder(
-            index, com.wechat.ferry.entity.po.Wcf.DbTable.getDefaultInstance());
+            index, com.wechat.ferry.entity.proto.Wcf.DbTable.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbTable tables = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getTablesBuilderList() {
         return getTablesFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbTable, com.wechat.ferry.entity.po.Wcf.DbTable.Builder, com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbTable, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder, com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder> 
           getTablesFieldBuilder() {
         if (tablesBuilder_ == null) {
           tablesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbTable, com.wechat.ferry.entity.po.Wcf.DbTable.Builder, com.wechat.ferry.entity.po.Wcf.DbTableOrBuilder>(
+              com.wechat.ferry.entity.proto.Wcf.DbTable, com.wechat.ferry.entity.proto.Wcf.DbTable.Builder, com.wechat.ferry.entity.proto.Wcf.DbTableOrBuilder>(
                   tables_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -18964,12 +18964,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbTables)
-    private static final com.wechat.ferry.entity.po.Wcf.DbTables DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbTables DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbTables();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbTables();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbTables getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbTables getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19005,7 +19005,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbTables getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbTables getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19081,15 +19081,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbQuery_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbQuery_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbQuery_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbQuery_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbQuery.class, com.wechat.ferry.entity.po.Wcf.DbQuery.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbQuery.class, com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder.class);
     }
 
     public static final int DB_FIELD_NUMBER = 1;
@@ -19231,10 +19231,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbQuery)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbQuery)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbQuery other = (com.wechat.ferry.entity.po.Wcf.DbQuery) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbQuery other = (com.wechat.ferry.entity.proto.Wcf.DbQuery) obj;
 
       if (!getDb()
           .equals(other.getDb())) return false;
@@ -19260,69 +19260,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -19335,7 +19335,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbQuery prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbQuery prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19356,21 +19356,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbQuery)
-        com.wechat.ferry.entity.po.Wcf.DbQueryOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbQueryOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbQuery_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbQuery_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbQuery_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbQuery_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbQuery.class, com.wechat.ferry.entity.po.Wcf.DbQuery.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbQuery.class, com.wechat.ferry.entity.proto.Wcf.DbQuery.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbQuery.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbQuery.newBuilder()
       private Builder() {
 
       }
@@ -19392,17 +19392,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbQuery_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbQuery_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbQuery getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbQuery getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbQuery build() {
-        com.wechat.ferry.entity.po.Wcf.DbQuery result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbQuery build() {
+        com.wechat.ferry.entity.proto.Wcf.DbQuery result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19410,14 +19410,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbQuery buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbQuery result = new com.wechat.ferry.entity.po.Wcf.DbQuery(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbQuery buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbQuery result = new com.wechat.ferry.entity.proto.Wcf.DbQuery(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbQuery result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbQuery result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.db_ = db_;
@@ -19429,16 +19429,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbQuery) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbQuery)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbQuery) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbQuery)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbQuery other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbQuery.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbQuery other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbQuery.getDefaultInstance()) return this;
         if (!other.getDb().isEmpty()) {
           db_ = other.db_;
           bitField0_ |= 0x00000001;
@@ -19702,12 +19702,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbQuery)
-    private static final com.wechat.ferry.entity.po.Wcf.DbQuery DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbQuery DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbQuery();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbQuery();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbQuery getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbQuery getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19743,7 +19743,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbQuery getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbQuery getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19819,15 +19819,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbField_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbField_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbField_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbField_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbField.class, com.wechat.ferry.entity.po.Wcf.DbField.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbField.class, com.wechat.ferry.entity.proto.Wcf.DbField.Builder.class);
     }
 
     public static final int TYPE_FIELD_NUMBER = 1;
@@ -19960,10 +19960,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbField)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbField)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbField other = (com.wechat.ferry.entity.po.Wcf.DbField) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbField other = (com.wechat.ferry.entity.proto.Wcf.DbField) obj;
 
       if (getType()
           != other.getType()) return false;
@@ -19993,69 +19993,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbField parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbField parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -20068,7 +20068,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbField prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbField prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -20089,21 +20089,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbField)
-        com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbField_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbField_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbField_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbField_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbField.class, com.wechat.ferry.entity.po.Wcf.DbField.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbField.class, com.wechat.ferry.entity.proto.Wcf.DbField.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbField.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbField.newBuilder()
       private Builder() {
 
       }
@@ -20126,17 +20126,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbField_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbField_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbField getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbField.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbField getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbField.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbField build() {
-        com.wechat.ferry.entity.po.Wcf.DbField result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbField build() {
+        com.wechat.ferry.entity.proto.Wcf.DbField result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -20144,14 +20144,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbField buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbField result = new com.wechat.ferry.entity.po.Wcf.DbField(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbField buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbField result = new com.wechat.ferry.entity.proto.Wcf.DbField(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbField result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbField result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.type_ = type_;
@@ -20166,16 +20166,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbField) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbField)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbField) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbField)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbField other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbField.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbField other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbField.getDefaultInstance()) return this;
         if (other.getType() != 0) {
           setType(other.getType());
         }
@@ -20441,12 +20441,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbField)
-    private static final com.wechat.ferry.entity.po.Wcf.DbField DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbField DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbField();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbField();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbField getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbField getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -20482,7 +20482,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbField getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbField getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -20495,12 +20495,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbField fields = 1;
      */
-    java.util.List 
+    java.util.List 
         getFieldsList();
     /**
      * repeated .wcf.DbField fields = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbField getFields(int index);
+    com.wechat.ferry.entity.proto.Wcf.DbField getFields(int index);
     /**
      * repeated .wcf.DbField fields = 1;
      */
@@ -20508,12 +20508,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbField fields = 1;
      */
-    java.util.List 
+    java.util.List 
         getFieldsOrBuilderList();
     /**
      * repeated .wcf.DbField fields = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
+    com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
         int index);
   }
   /**
@@ -20541,32 +20541,32 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRow_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRow_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRow_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRow_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbRow.class, com.wechat.ferry.entity.po.Wcf.DbRow.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbRow.class, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder.class);
     }
 
     public static final int FIELDS_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List fields_;
+    private java.util.List fields_;
     /**
      * repeated .wcf.DbField fields = 1;
      */
     @java.lang.Override
-    public java.util.List getFieldsList() {
+    public java.util.List getFieldsList() {
       return fields_;
     }
     /**
      * repeated .wcf.DbField fields = 1;
      */
     @java.lang.Override
-    public java.util.List 
+    public java.util.List 
         getFieldsOrBuilderList() {
       return fields_;
     }
@@ -20581,14 +20581,14 @@ java.lang.String defaultValue) {
      * repeated .wcf.DbField fields = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbField getFields(int index) {
+    public com.wechat.ferry.entity.proto.Wcf.DbField getFields(int index) {
       return fields_.get(index);
     }
     /**
      * repeated .wcf.DbField fields = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
+    public com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
         int index) {
       return fields_.get(index);
     }
@@ -20633,10 +20633,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbRow)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbRow)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbRow other = (com.wechat.ferry.entity.po.Wcf.DbRow) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbRow other = (com.wechat.ferry.entity.proto.Wcf.DbRow) obj;
 
       if (!getFieldsList()
           .equals(other.getFieldsList())) return false;
@@ -20660,69 +20660,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRow parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -20735,7 +20735,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbRow prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbRow prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -20756,21 +20756,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbRow)
-        com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRow_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRow_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRow_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRow_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbRow.class, com.wechat.ferry.entity.po.Wcf.DbRow.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbRow.class, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbRow.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbRow.newBuilder()
       private Builder() {
 
       }
@@ -20797,17 +20797,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRow_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRow_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRow getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbRow.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbRow getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbRow.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRow build() {
-        com.wechat.ferry.entity.po.Wcf.DbRow result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbRow build() {
+        com.wechat.ferry.entity.proto.Wcf.DbRow result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -20815,15 +20815,15 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRow buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbRow result = new com.wechat.ferry.entity.po.Wcf.DbRow(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbRow buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbRow result = new com.wechat.ferry.entity.proto.Wcf.DbRow(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(com.wechat.ferry.entity.po.Wcf.DbRow result) {
+      private void buildPartialRepeatedFields(com.wechat.ferry.entity.proto.Wcf.DbRow result) {
         if (fieldsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             fields_ = java.util.Collections.unmodifiableList(fields_);
@@ -20835,22 +20835,22 @@ java.lang.String defaultValue) {
         }
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbRow result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbRow result) {
         int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbRow) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbRow)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbRow) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbRow)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbRow other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbRow.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbRow other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbRow.getDefaultInstance()) return this;
         if (fieldsBuilder_ == null) {
           if (!other.fields_.isEmpty()) {
             if (fields_.isEmpty()) {
@@ -20904,9 +20904,9 @@ java.lang.String defaultValue) {
                 done = true;
                 break;
               case 10: {
-                com.wechat.ferry.entity.po.Wcf.DbField m =
+                com.wechat.ferry.entity.proto.Wcf.DbField m =
                     input.readMessage(
-                        com.wechat.ferry.entity.po.Wcf.DbField.parser(),
+                        com.wechat.ferry.entity.proto.Wcf.DbField.parser(),
                         extensionRegistry);
                 if (fieldsBuilder_ == null) {
                   ensureFieldsIsMutable();
@@ -20933,22 +20933,22 @@ java.lang.String defaultValue) {
       }
       private int bitField0_;
 
-      private java.util.List fields_ =
+      private java.util.List fields_ =
         java.util.Collections.emptyList();
       private void ensureFieldsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          fields_ = new java.util.ArrayList(fields_);
+          fields_ = new java.util.ArrayList(fields_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbField, com.wechat.ferry.entity.po.Wcf.DbField.Builder, com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder> fieldsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbField, com.wechat.ferry.entity.proto.Wcf.DbField.Builder, com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder> fieldsBuilder_;
 
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public java.util.List getFieldsList() {
+      public java.util.List getFieldsList() {
         if (fieldsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(fields_);
         } else {
@@ -20968,7 +20968,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbField getFields(int index) {
+      public com.wechat.ferry.entity.proto.Wcf.DbField getFields(int index) {
         if (fieldsBuilder_ == null) {
           return fields_.get(index);
         } else {
@@ -20979,7 +20979,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder setFields(
-          int index, com.wechat.ferry.entity.po.Wcf.DbField value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbField value) {
         if (fieldsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20996,7 +20996,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder setFields(
-          int index, com.wechat.ferry.entity.po.Wcf.DbField.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbField.Builder builderForValue) {
         if (fieldsBuilder_ == null) {
           ensureFieldsIsMutable();
           fields_.set(index, builderForValue.build());
@@ -21009,7 +21009,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public Builder addFields(com.wechat.ferry.entity.po.Wcf.DbField value) {
+      public Builder addFields(com.wechat.ferry.entity.proto.Wcf.DbField value) {
         if (fieldsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21026,7 +21026,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder addFields(
-          int index, com.wechat.ferry.entity.po.Wcf.DbField value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbField value) {
         if (fieldsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21043,7 +21043,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder addFields(
-          com.wechat.ferry.entity.po.Wcf.DbField.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbField.Builder builderForValue) {
         if (fieldsBuilder_ == null) {
           ensureFieldsIsMutable();
           fields_.add(builderForValue.build());
@@ -21057,7 +21057,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder addFields(
-          int index, com.wechat.ferry.entity.po.Wcf.DbField.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbField.Builder builderForValue) {
         if (fieldsBuilder_ == null) {
           ensureFieldsIsMutable();
           fields_.add(index, builderForValue.build());
@@ -21071,7 +21071,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbField fields = 1;
        */
       public Builder addAllFields(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (fieldsBuilder_ == null) {
           ensureFieldsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -21111,14 +21111,14 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbField.Builder getFieldsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbField.Builder getFieldsBuilder(
           int index) {
         return getFieldsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder getFieldsOrBuilder(
           int index) {
         if (fieldsBuilder_ == null) {
           return fields_.get(index);  } else {
@@ -21128,7 +21128,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFieldsOrBuilderList() {
         if (fieldsBuilder_ != null) {
           return fieldsBuilder_.getMessageOrBuilderList();
@@ -21139,31 +21139,31 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbField.Builder addFieldsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbField.Builder addFieldsBuilder() {
         return getFieldsFieldBuilder().addBuilder(
-            com.wechat.ferry.entity.po.Wcf.DbField.getDefaultInstance());
+            com.wechat.ferry.entity.proto.Wcf.DbField.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbField.Builder addFieldsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbField.Builder addFieldsBuilder(
           int index) {
         return getFieldsFieldBuilder().addBuilder(
-            index, com.wechat.ferry.entity.po.Wcf.DbField.getDefaultInstance());
+            index, com.wechat.ferry.entity.proto.Wcf.DbField.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbField fields = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFieldsBuilderList() {
         return getFieldsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbField, com.wechat.ferry.entity.po.Wcf.DbField.Builder, com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbField, com.wechat.ferry.entity.proto.Wcf.DbField.Builder, com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder> 
           getFieldsFieldBuilder() {
         if (fieldsBuilder_ == null) {
           fieldsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbField, com.wechat.ferry.entity.po.Wcf.DbField.Builder, com.wechat.ferry.entity.po.Wcf.DbFieldOrBuilder>(
+              com.wechat.ferry.entity.proto.Wcf.DbField, com.wechat.ferry.entity.proto.Wcf.DbField.Builder, com.wechat.ferry.entity.proto.Wcf.DbFieldOrBuilder>(
                   fields_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -21189,12 +21189,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbRow)
-    private static final com.wechat.ferry.entity.po.Wcf.DbRow DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbRow DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbRow();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbRow();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbRow getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbRow getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -21230,7 +21230,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRow getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbRow getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -21243,12 +21243,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbRow rows = 1;
      */
-    java.util.List 
+    java.util.List 
         getRowsList();
     /**
      * repeated .wcf.DbRow rows = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbRow getRows(int index);
+    com.wechat.ferry.entity.proto.Wcf.DbRow getRows(int index);
     /**
      * repeated .wcf.DbRow rows = 1;
      */
@@ -21256,12 +21256,12 @@ java.lang.String defaultValue) {
     /**
      * repeated .wcf.DbRow rows = 1;
      */
-    java.util.List 
+    java.util.List 
         getRowsOrBuilderList();
     /**
      * repeated .wcf.DbRow rows = 1;
      */
-    com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder getRowsOrBuilder(
+    com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder getRowsOrBuilder(
         int index);
   }
   /**
@@ -21289,32 +21289,32 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRows_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRows_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRows_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRows_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DbRows.class, com.wechat.ferry.entity.po.Wcf.DbRows.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DbRows.class, com.wechat.ferry.entity.proto.Wcf.DbRows.Builder.class);
     }
 
     public static final int ROWS_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List rows_;
+    private java.util.List rows_;
     /**
      * repeated .wcf.DbRow rows = 1;
      */
     @java.lang.Override
-    public java.util.List getRowsList() {
+    public java.util.List getRowsList() {
       return rows_;
     }
     /**
      * repeated .wcf.DbRow rows = 1;
      */
     @java.lang.Override
-    public java.util.List 
+    public java.util.List 
         getRowsOrBuilderList() {
       return rows_;
     }
@@ -21329,14 +21329,14 @@ java.lang.String defaultValue) {
      * repeated .wcf.DbRow rows = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRow getRows(int index) {
+    public com.wechat.ferry.entity.proto.Wcf.DbRow getRows(int index) {
       return rows_.get(index);
     }
     /**
      * repeated .wcf.DbRow rows = 1;
      */
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder getRowsOrBuilder(
+    public com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder getRowsOrBuilder(
         int index) {
       return rows_.get(index);
     }
@@ -21381,10 +21381,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DbRows)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DbRows)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DbRows other = (com.wechat.ferry.entity.po.Wcf.DbRows) obj;
+      com.wechat.ferry.entity.proto.Wcf.DbRows other = (com.wechat.ferry.entity.proto.Wcf.DbRows) obj;
 
       if (!getRowsList()
           .equals(other.getRowsList())) return false;
@@ -21408,69 +21408,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DbRows parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -21483,7 +21483,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DbRows prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DbRows prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -21504,21 +21504,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DbRows)
-        com.wechat.ferry.entity.po.Wcf.DbRowsOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DbRowsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRows_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRows_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRows_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRows_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DbRows.class, com.wechat.ferry.entity.po.Wcf.DbRows.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DbRows.class, com.wechat.ferry.entity.proto.Wcf.DbRows.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DbRows.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DbRows.newBuilder()
       private Builder() {
 
       }
@@ -21545,17 +21545,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DbRows_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DbRows_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRows getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DbRows getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRows build() {
-        com.wechat.ferry.entity.po.Wcf.DbRows result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DbRows build() {
+        com.wechat.ferry.entity.proto.Wcf.DbRows result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -21563,15 +21563,15 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DbRows buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DbRows result = new com.wechat.ferry.entity.po.Wcf.DbRows(this);
+      public com.wechat.ferry.entity.proto.Wcf.DbRows buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DbRows result = new com.wechat.ferry.entity.proto.Wcf.DbRows(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(com.wechat.ferry.entity.po.Wcf.DbRows result) {
+      private void buildPartialRepeatedFields(com.wechat.ferry.entity.proto.Wcf.DbRows result) {
         if (rowsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             rows_ = java.util.Collections.unmodifiableList(rows_);
@@ -21583,22 +21583,22 @@ java.lang.String defaultValue) {
         }
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DbRows result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DbRows result) {
         int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DbRows) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DbRows)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DbRows) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DbRows)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DbRows other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DbRows.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DbRows other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DbRows.getDefaultInstance()) return this;
         if (rowsBuilder_ == null) {
           if (!other.rows_.isEmpty()) {
             if (rows_.isEmpty()) {
@@ -21652,9 +21652,9 @@ java.lang.String defaultValue) {
                 done = true;
                 break;
               case 10: {
-                com.wechat.ferry.entity.po.Wcf.DbRow m =
+                com.wechat.ferry.entity.proto.Wcf.DbRow m =
                     input.readMessage(
-                        com.wechat.ferry.entity.po.Wcf.DbRow.parser(),
+                        com.wechat.ferry.entity.proto.Wcf.DbRow.parser(),
                         extensionRegistry);
                 if (rowsBuilder_ == null) {
                   ensureRowsIsMutable();
@@ -21681,22 +21681,22 @@ java.lang.String defaultValue) {
       }
       private int bitField0_;
 
-      private java.util.List rows_ =
+      private java.util.List rows_ =
         java.util.Collections.emptyList();
       private void ensureRowsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          rows_ = new java.util.ArrayList(rows_);
+          rows_ = new java.util.ArrayList(rows_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbRow, com.wechat.ferry.entity.po.Wcf.DbRow.Builder, com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder> rowsBuilder_;
+          com.wechat.ferry.entity.proto.Wcf.DbRow, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder> rowsBuilder_;
 
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public java.util.List getRowsList() {
+      public java.util.List getRowsList() {
         if (rowsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(rows_);
         } else {
@@ -21716,7 +21716,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRow getRows(int index) {
+      public com.wechat.ferry.entity.proto.Wcf.DbRow getRows(int index) {
         if (rowsBuilder_ == null) {
           return rows_.get(index);
         } else {
@@ -21727,7 +21727,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder setRows(
-          int index, com.wechat.ferry.entity.po.Wcf.DbRow value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbRow value) {
         if (rowsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21744,7 +21744,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder setRows(
-          int index, com.wechat.ferry.entity.po.Wcf.DbRow.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder builderForValue) {
         if (rowsBuilder_ == null) {
           ensureRowsIsMutable();
           rows_.set(index, builderForValue.build());
@@ -21757,7 +21757,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public Builder addRows(com.wechat.ferry.entity.po.Wcf.DbRow value) {
+      public Builder addRows(com.wechat.ferry.entity.proto.Wcf.DbRow value) {
         if (rowsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21774,7 +21774,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder addRows(
-          int index, com.wechat.ferry.entity.po.Wcf.DbRow value) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbRow value) {
         if (rowsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21791,7 +21791,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder addRows(
-          com.wechat.ferry.entity.po.Wcf.DbRow.Builder builderForValue) {
+          com.wechat.ferry.entity.proto.Wcf.DbRow.Builder builderForValue) {
         if (rowsBuilder_ == null) {
           ensureRowsIsMutable();
           rows_.add(builderForValue.build());
@@ -21805,7 +21805,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder addRows(
-          int index, com.wechat.ferry.entity.po.Wcf.DbRow.Builder builderForValue) {
+          int index, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder builderForValue) {
         if (rowsBuilder_ == null) {
           ensureRowsIsMutable();
           rows_.add(index, builderForValue.build());
@@ -21819,7 +21819,7 @@ java.lang.String defaultValue) {
        * repeated .wcf.DbRow rows = 1;
        */
       public Builder addAllRows(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (rowsBuilder_ == null) {
           ensureRowsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -21859,14 +21859,14 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRow.Builder getRowsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbRow.Builder getRowsBuilder(
           int index) {
         return getRowsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder getRowsOrBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder getRowsOrBuilder(
           int index) {
         if (rowsBuilder_ == null) {
           return rows_.get(index);  } else {
@@ -21876,7 +21876,7 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRowsOrBuilderList() {
         if (rowsBuilder_ != null) {
           return rowsBuilder_.getMessageOrBuilderList();
@@ -21887,31 +21887,31 @@ java.lang.String defaultValue) {
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRow.Builder addRowsBuilder() {
+      public com.wechat.ferry.entity.proto.Wcf.DbRow.Builder addRowsBuilder() {
         return getRowsFieldBuilder().addBuilder(
-            com.wechat.ferry.entity.po.Wcf.DbRow.getDefaultInstance());
+            com.wechat.ferry.entity.proto.Wcf.DbRow.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public com.wechat.ferry.entity.po.Wcf.DbRow.Builder addRowsBuilder(
+      public com.wechat.ferry.entity.proto.Wcf.DbRow.Builder addRowsBuilder(
           int index) {
         return getRowsFieldBuilder().addBuilder(
-            index, com.wechat.ferry.entity.po.Wcf.DbRow.getDefaultInstance());
+            index, com.wechat.ferry.entity.proto.Wcf.DbRow.getDefaultInstance());
       }
       /**
        * repeated .wcf.DbRow rows = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRowsBuilderList() {
         return getRowsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.wechat.ferry.entity.po.Wcf.DbRow, com.wechat.ferry.entity.po.Wcf.DbRow.Builder, com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder> 
+          com.wechat.ferry.entity.proto.Wcf.DbRow, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder> 
           getRowsFieldBuilder() {
         if (rowsBuilder_ == null) {
           rowsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.wechat.ferry.entity.po.Wcf.DbRow, com.wechat.ferry.entity.po.Wcf.DbRow.Builder, com.wechat.ferry.entity.po.Wcf.DbRowOrBuilder>(
+              com.wechat.ferry.entity.proto.Wcf.DbRow, com.wechat.ferry.entity.proto.Wcf.DbRow.Builder, com.wechat.ferry.entity.proto.Wcf.DbRowOrBuilder>(
                   rows_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -21937,12 +21937,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DbRows)
-    private static final com.wechat.ferry.entity.po.Wcf.DbRows DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DbRows DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DbRows();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DbRows();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DbRows getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DbRows getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -21978,7 +21978,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DbRows getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DbRows getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -22064,15 +22064,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Verification_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Verification_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Verification_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Verification_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.Verification.class, com.wechat.ferry.entity.po.Wcf.Verification.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.Verification.class, com.wechat.ferry.entity.proto.Wcf.Verification.Builder.class);
     }
 
     public static final int V3_FIELD_NUMBER = 1;
@@ -22236,10 +22236,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.Verification)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.Verification)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.Verification other = (com.wechat.ferry.entity.po.Wcf.Verification) obj;
+      com.wechat.ferry.entity.proto.Wcf.Verification other = (com.wechat.ferry.entity.proto.Wcf.Verification) obj;
 
       if (!getV3()
           .equals(other.getV3())) return false;
@@ -22269,69 +22269,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Verification parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Verification parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -22344,7 +22344,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.Verification prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.Verification prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -22365,21 +22365,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.Verification)
-        com.wechat.ferry.entity.po.Wcf.VerificationOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.VerificationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Verification_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Verification_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Verification_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Verification_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.Verification.class, com.wechat.ferry.entity.po.Wcf.Verification.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.Verification.class, com.wechat.ferry.entity.proto.Wcf.Verification.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.Verification.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.Verification.newBuilder()
       private Builder() {
 
       }
@@ -22402,17 +22402,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Verification_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Verification_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Verification getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.Verification getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Verification build() {
-        com.wechat.ferry.entity.po.Wcf.Verification result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.Verification build() {
+        com.wechat.ferry.entity.proto.Wcf.Verification result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -22420,14 +22420,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Verification buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.Verification result = new com.wechat.ferry.entity.po.Wcf.Verification(this);
+      public com.wechat.ferry.entity.proto.Wcf.Verification buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.Verification result = new com.wechat.ferry.entity.proto.Wcf.Verification(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.Verification result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.Verification result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.v3_ = v3_;
@@ -22442,16 +22442,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.Verification) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.Verification)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.Verification) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.Verification)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.Verification other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.Verification.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.Verification other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.Verification.getDefaultInstance()) return this;
         if (!other.getV3().isEmpty()) {
           v3_ = other.v3_;
           bitField0_ |= 0x00000001;
@@ -22767,12 +22767,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.Verification)
-    private static final com.wechat.ferry.entity.po.Wcf.Verification DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.Verification DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.Verification();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.Verification();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Verification getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.Verification getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -22808,7 +22808,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Verification getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.Verification getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -22884,15 +22884,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MemberMgmt_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MemberMgmt_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MemberMgmt_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MemberMgmt_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.MemberMgmt.class, com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.MemberMgmt.class, com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder.class);
     }
 
     public static final int ROOMID_FIELD_NUMBER = 1;
@@ -23034,10 +23034,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.MemberMgmt)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.MemberMgmt)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.MemberMgmt other = (com.wechat.ferry.entity.po.Wcf.MemberMgmt) obj;
+      com.wechat.ferry.entity.proto.Wcf.MemberMgmt other = (com.wechat.ferry.entity.proto.Wcf.MemberMgmt) obj;
 
       if (!getRoomid()
           .equals(other.getRoomid())) return false;
@@ -23063,69 +23063,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -23138,7 +23138,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.MemberMgmt prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.MemberMgmt prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -23159,21 +23159,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.MemberMgmt)
-        com.wechat.ferry.entity.po.Wcf.MemberMgmtOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.MemberMgmtOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MemberMgmt_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MemberMgmt_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MemberMgmt_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MemberMgmt_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.MemberMgmt.class, com.wechat.ferry.entity.po.Wcf.MemberMgmt.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.MemberMgmt.class, com.wechat.ferry.entity.proto.Wcf.MemberMgmt.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.MemberMgmt.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.MemberMgmt.newBuilder()
       private Builder() {
 
       }
@@ -23195,17 +23195,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_MemberMgmt_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_MemberMgmt_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmt getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmt getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmt build() {
-        com.wechat.ferry.entity.po.Wcf.MemberMgmt result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmt build() {
+        com.wechat.ferry.entity.proto.Wcf.MemberMgmt result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -23213,14 +23213,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.MemberMgmt buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.MemberMgmt result = new com.wechat.ferry.entity.po.Wcf.MemberMgmt(this);
+      public com.wechat.ferry.entity.proto.Wcf.MemberMgmt buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.MemberMgmt result = new com.wechat.ferry.entity.proto.Wcf.MemberMgmt(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.MemberMgmt result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.MemberMgmt result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.roomid_ = roomid_;
@@ -23232,16 +23232,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.MemberMgmt) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.MemberMgmt)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.MemberMgmt) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.MemberMgmt)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.MemberMgmt other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.MemberMgmt.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.MemberMgmt other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.MemberMgmt.getDefaultInstance()) return this;
         if (!other.getRoomid().isEmpty()) {
           roomid_ = other.roomid_;
           bitField0_ |= 0x00000001;
@@ -23505,12 +23505,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.MemberMgmt)
-    private static final com.wechat.ferry.entity.po.Wcf.MemberMgmt DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.MemberMgmt DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.MemberMgmt();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.MemberMgmt();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.MemberMgmt getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.MemberMgmt getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -23546,7 +23546,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.MemberMgmt getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.MemberMgmt getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -23664,15 +23664,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_UserInfo_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_UserInfo_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_UserInfo_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_UserInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.UserInfo.class, com.wechat.ferry.entity.po.Wcf.UserInfo.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.UserInfo.class, com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder.class);
     }
 
     public static final int WXID_FIELD_NUMBER = 1;
@@ -23920,10 +23920,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.UserInfo)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.UserInfo)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.UserInfo other = (com.wechat.ferry.entity.po.Wcf.UserInfo) obj;
+      com.wechat.ferry.entity.proto.Wcf.UserInfo other = (com.wechat.ferry.entity.proto.Wcf.UserInfo) obj;
 
       if (!getWxid()
           .equals(other.getWxid())) return false;
@@ -23957,69 +23957,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -24032,7 +24032,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.UserInfo prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.UserInfo prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -24053,21 +24053,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.UserInfo)
-        com.wechat.ferry.entity.po.Wcf.UserInfoOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.UserInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_UserInfo_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_UserInfo_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_UserInfo_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_UserInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.UserInfo.class, com.wechat.ferry.entity.po.Wcf.UserInfo.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.UserInfo.class, com.wechat.ferry.entity.proto.Wcf.UserInfo.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.UserInfo.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.UserInfo.newBuilder()
       private Builder() {
 
       }
@@ -24091,17 +24091,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_UserInfo_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_UserInfo_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.UserInfo getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.UserInfo getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.UserInfo build() {
-        com.wechat.ferry.entity.po.Wcf.UserInfo result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.UserInfo build() {
+        com.wechat.ferry.entity.proto.Wcf.UserInfo result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -24109,14 +24109,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.UserInfo buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.UserInfo result = new com.wechat.ferry.entity.po.Wcf.UserInfo(this);
+      public com.wechat.ferry.entity.proto.Wcf.UserInfo buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.UserInfo result = new com.wechat.ferry.entity.proto.Wcf.UserInfo(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.UserInfo result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.UserInfo result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.wxid_ = wxid_;
@@ -24134,16 +24134,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.UserInfo) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.UserInfo)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.UserInfo) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.UserInfo)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.UserInfo other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.UserInfo.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.UserInfo other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.UserInfo.getDefaultInstance()) return this;
         if (!other.getWxid().isEmpty()) {
           wxid_ = other.wxid_;
           bitField0_ |= 0x00000001;
@@ -24611,12 +24611,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.UserInfo)
-    private static final com.wechat.ferry.entity.po.Wcf.UserInfo DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.UserInfo DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.UserInfo();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.UserInfo();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.UserInfo getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.UserInfo getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -24652,7 +24652,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.UserInfo getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.UserInfo getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -24728,15 +24728,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DecPath_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DecPath_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DecPath_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DecPath_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.DecPath.class, com.wechat.ferry.entity.po.Wcf.DecPath.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.DecPath.class, com.wechat.ferry.entity.proto.Wcf.DecPath.Builder.class);
     }
 
     public static final int SRC_FIELD_NUMBER = 1;
@@ -24878,10 +24878,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.DecPath)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.DecPath)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.DecPath other = (com.wechat.ferry.entity.po.Wcf.DecPath) obj;
+      com.wechat.ferry.entity.proto.Wcf.DecPath other = (com.wechat.ferry.entity.proto.Wcf.DecPath) obj;
 
       if (!getSrc()
           .equals(other.getSrc())) return false;
@@ -24907,69 +24907,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.DecPath parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -24982,7 +24982,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.DecPath prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.DecPath prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -25003,21 +25003,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.DecPath)
-        com.wechat.ferry.entity.po.Wcf.DecPathOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.DecPathOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DecPath_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DecPath_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DecPath_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DecPath_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.DecPath.class, com.wechat.ferry.entity.po.Wcf.DecPath.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.DecPath.class, com.wechat.ferry.entity.proto.Wcf.DecPath.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.DecPath.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.DecPath.newBuilder()
       private Builder() {
 
       }
@@ -25039,17 +25039,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_DecPath_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_DecPath_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DecPath getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.DecPath getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DecPath build() {
-        com.wechat.ferry.entity.po.Wcf.DecPath result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.DecPath build() {
+        com.wechat.ferry.entity.proto.Wcf.DecPath result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -25057,14 +25057,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.DecPath buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.DecPath result = new com.wechat.ferry.entity.po.Wcf.DecPath(this);
+      public com.wechat.ferry.entity.proto.Wcf.DecPath buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.DecPath result = new com.wechat.ferry.entity.proto.Wcf.DecPath(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.DecPath result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.DecPath result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.src_ = src_;
@@ -25076,16 +25076,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.DecPath) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.DecPath)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.DecPath) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.DecPath)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.DecPath other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.DecPath.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.DecPath other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.DecPath.getDefaultInstance()) return this;
         if (!other.getSrc().isEmpty()) {
           src_ = other.src_;
           bitField0_ |= 0x00000001;
@@ -25349,12 +25349,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.DecPath)
-    private static final com.wechat.ferry.entity.po.Wcf.DecPath DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.DecPath DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.DecPath();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.DecPath();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.DecPath getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.DecPath getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -25390,7 +25390,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.DecPath getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.DecPath getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -25487,15 +25487,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Transfer_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Transfer_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Transfer_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Transfer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.Transfer.class, com.wechat.ferry.entity.po.Wcf.Transfer.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.Transfer.class, com.wechat.ferry.entity.proto.Wcf.Transfer.Builder.class);
     }
 
     public static final int WXID_FIELD_NUMBER = 1;
@@ -25690,10 +25690,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.Transfer)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.Transfer)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.Transfer other = (com.wechat.ferry.entity.po.Wcf.Transfer) obj;
+      com.wechat.ferry.entity.proto.Wcf.Transfer other = (com.wechat.ferry.entity.proto.Wcf.Transfer) obj;
 
       if (!getWxid()
           .equals(other.getWxid())) return false;
@@ -25723,69 +25723,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.Transfer parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -25798,7 +25798,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.Transfer prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.Transfer prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -25819,21 +25819,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.Transfer)
-        com.wechat.ferry.entity.po.Wcf.TransferOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.TransferOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Transfer_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Transfer_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Transfer_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Transfer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.Transfer.class, com.wechat.ferry.entity.po.Wcf.Transfer.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.Transfer.class, com.wechat.ferry.entity.proto.Wcf.Transfer.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.Transfer.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.Transfer.newBuilder()
       private Builder() {
 
       }
@@ -25856,17 +25856,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_Transfer_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_Transfer_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Transfer getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.Transfer getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Transfer build() {
-        com.wechat.ferry.entity.po.Wcf.Transfer result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.Transfer build() {
+        com.wechat.ferry.entity.proto.Wcf.Transfer result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -25874,14 +25874,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.Transfer buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.Transfer result = new com.wechat.ferry.entity.po.Wcf.Transfer(this);
+      public com.wechat.ferry.entity.proto.Wcf.Transfer buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.Transfer result = new com.wechat.ferry.entity.proto.Wcf.Transfer(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.Transfer result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.Transfer result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.wxid_ = wxid_;
@@ -25896,16 +25896,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.Transfer) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.Transfer)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.Transfer) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.Transfer)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.Transfer other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.Transfer.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.Transfer other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.Transfer.getDefaultInstance()) return this;
         if (!other.getWxid().isEmpty()) {
           wxid_ = other.wxid_;
           bitField0_ |= 0x00000001;
@@ -26271,12 +26271,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.Transfer)
-    private static final com.wechat.ferry.entity.po.Wcf.Transfer DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.Transfer DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.Transfer();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.Transfer();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.Transfer getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.Transfer getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -26312,7 +26312,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.Transfer getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.Transfer getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -26398,15 +26398,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AttachMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AttachMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AttachMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AttachMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.AttachMsg.class, com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.AttachMsg.class, com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder.class);
     }
 
     public static final int ID_FIELD_NUMBER = 1;
@@ -26570,10 +26570,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.AttachMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.AttachMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.AttachMsg other = (com.wechat.ferry.entity.po.Wcf.AttachMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.AttachMsg other = (com.wechat.ferry.entity.proto.Wcf.AttachMsg) obj;
 
       if (getId()
           != other.getId()) return false;
@@ -26604,69 +26604,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -26679,7 +26679,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.AttachMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.AttachMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -26700,21 +26700,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.AttachMsg)
-        com.wechat.ferry.entity.po.Wcf.AttachMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.AttachMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AttachMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AttachMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AttachMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AttachMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.AttachMsg.class, com.wechat.ferry.entity.po.Wcf.AttachMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.AttachMsg.class, com.wechat.ferry.entity.proto.Wcf.AttachMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.AttachMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.AttachMsg.newBuilder()
       private Builder() {
 
       }
@@ -26737,17 +26737,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AttachMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AttachMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AttachMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AttachMsg build() {
-        com.wechat.ferry.entity.po.Wcf.AttachMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.AttachMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -26755,14 +26755,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AttachMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.AttachMsg result = new com.wechat.ferry.entity.po.Wcf.AttachMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.AttachMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.AttachMsg result = new com.wechat.ferry.entity.proto.Wcf.AttachMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.AttachMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.AttachMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.id_ = id_;
@@ -26777,16 +26777,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.AttachMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.AttachMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.AttachMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.AttachMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.AttachMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.AttachMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.AttachMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.AttachMsg.getDefaultInstance()) return this;
         if (other.getId() != 0L) {
           setId(other.getId());
         }
@@ -27102,12 +27102,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.AttachMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.AttachMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.AttachMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.AttachMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.AttachMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.AttachMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.AttachMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -27143,7 +27143,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AttachMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.AttachMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -27208,15 +27208,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AudioMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AudioMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AudioMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AudioMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.AudioMsg.class, com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.AudioMsg.class, com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder.class);
     }
 
     public static final int ID_FIELD_NUMBER = 1;
@@ -27327,10 +27327,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.AudioMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.AudioMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.AudioMsg other = (com.wechat.ferry.entity.po.Wcf.AudioMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.AudioMsg other = (com.wechat.ferry.entity.proto.Wcf.AudioMsg) obj;
 
       if (getId()
           != other.getId()) return false;
@@ -27357,69 +27357,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -27432,7 +27432,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.AudioMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.AudioMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -27453,21 +27453,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.AudioMsg)
-        com.wechat.ferry.entity.po.Wcf.AudioMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.AudioMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AudioMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AudioMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AudioMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AudioMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.AudioMsg.class, com.wechat.ferry.entity.po.Wcf.AudioMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.AudioMsg.class, com.wechat.ferry.entity.proto.Wcf.AudioMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.AudioMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.AudioMsg.newBuilder()
       private Builder() {
 
       }
@@ -27489,17 +27489,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_AudioMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_AudioMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AudioMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AudioMsg build() {
-        com.wechat.ferry.entity.po.Wcf.AudioMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.AudioMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -27507,14 +27507,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.AudioMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.AudioMsg result = new com.wechat.ferry.entity.po.Wcf.AudioMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.AudioMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.AudioMsg result = new com.wechat.ferry.entity.proto.Wcf.AudioMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.AudioMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.AudioMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.id_ = id_;
@@ -27526,16 +27526,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.AudioMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.AudioMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.AudioMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.AudioMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.AudioMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.AudioMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.AudioMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.AudioMsg.getDefaultInstance()) return this;
         if (other.getId() != 0L) {
           setId(other.getId());
         }
@@ -27749,12 +27749,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.AudioMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.AudioMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.AudioMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.AudioMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.AudioMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.AudioMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.AudioMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -27790,7 +27790,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.AudioMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.AudioMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -27971,15 +27971,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RichText_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RichText_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RichText_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RichText_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.RichText.class, com.wechat.ferry.entity.po.Wcf.RichText.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.RichText.class, com.wechat.ferry.entity.proto.Wcf.RichText.Builder.class);
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
@@ -28386,10 +28386,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.RichText)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.RichText)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.RichText other = (com.wechat.ferry.entity.po.Wcf.RichText) obj;
+      com.wechat.ferry.entity.proto.Wcf.RichText other = (com.wechat.ferry.entity.proto.Wcf.RichText) obj;
 
       if (!getName()
           .equals(other.getName())) return false;
@@ -28435,69 +28435,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.RichText parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.RichText parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -28510,7 +28510,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.RichText prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.RichText prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -28531,21 +28531,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.RichText)
-        com.wechat.ferry.entity.po.Wcf.RichTextOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.RichTextOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RichText_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RichText_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RichText_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RichText_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.RichText.class, com.wechat.ferry.entity.po.Wcf.RichText.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.RichText.class, com.wechat.ferry.entity.proto.Wcf.RichText.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.RichText.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.RichText.newBuilder()
       private Builder() {
 
       }
@@ -28572,17 +28572,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_RichText_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RichText_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RichText getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.RichText getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RichText build() {
-        com.wechat.ferry.entity.po.Wcf.RichText result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.RichText build() {
+        com.wechat.ferry.entity.proto.Wcf.RichText result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -28590,14 +28590,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.RichText buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.RichText result = new com.wechat.ferry.entity.po.Wcf.RichText(this);
+      public com.wechat.ferry.entity.proto.Wcf.RichText buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.RichText result = new com.wechat.ferry.entity.proto.Wcf.RichText(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.RichText result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.RichText result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.name_ = name_;
@@ -28624,16 +28624,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.RichText) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.RichText)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.RichText) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.RichText)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.RichText other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.RichText.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.RichText other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.RichText.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           bitField0_ |= 0x00000001;
@@ -29407,12 +29407,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.RichText)
-    private static final com.wechat.ferry.entity.po.Wcf.RichText DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.RichText DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.RichText();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.RichText();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.RichText getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.RichText getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -29448,7 +29448,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.RichText getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.RichText getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -29524,15 +29524,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PatMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PatMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PatMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PatMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.PatMsg.class, com.wechat.ferry.entity.po.Wcf.PatMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.PatMsg.class, com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder.class);
     }
 
     public static final int ROOMID_FIELD_NUMBER = 1;
@@ -29674,10 +29674,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.PatMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.PatMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.PatMsg other = (com.wechat.ferry.entity.po.Wcf.PatMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.PatMsg other = (com.wechat.ferry.entity.proto.Wcf.PatMsg) obj;
 
       if (!getRoomid()
           .equals(other.getRoomid())) return false;
@@ -29703,69 +29703,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -29778,7 +29778,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.PatMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.PatMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -29799,21 +29799,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.PatMsg)
-        com.wechat.ferry.entity.po.Wcf.PatMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.PatMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PatMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PatMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PatMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PatMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.PatMsg.class, com.wechat.ferry.entity.po.Wcf.PatMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.PatMsg.class, com.wechat.ferry.entity.proto.Wcf.PatMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.PatMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.PatMsg.newBuilder()
       private Builder() {
 
       }
@@ -29835,17 +29835,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_PatMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_PatMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PatMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.PatMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PatMsg build() {
-        com.wechat.ferry.entity.po.Wcf.PatMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.PatMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.PatMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -29853,14 +29853,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.PatMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.PatMsg result = new com.wechat.ferry.entity.po.Wcf.PatMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.PatMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.PatMsg result = new com.wechat.ferry.entity.proto.Wcf.PatMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.PatMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.PatMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.roomid_ = roomid_;
@@ -29872,16 +29872,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.PatMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.PatMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.PatMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.PatMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.PatMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.PatMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.PatMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.PatMsg.getDefaultInstance()) return this;
         if (!other.getRoomid().isEmpty()) {
           roomid_ = other.roomid_;
           bitField0_ |= 0x00000001;
@@ -30145,12 +30145,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.PatMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.PatMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.PatMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.PatMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.PatMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.PatMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.PatMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -30186,7 +30186,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.PatMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.PatMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -30251,15 +30251,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_OcrMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_OcrMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_OcrMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_OcrMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.OcrMsg.class, com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.OcrMsg.class, com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder.class);
     }
 
     public static final int STATUS_FIELD_NUMBER = 1;
@@ -30370,10 +30370,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.OcrMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.OcrMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.OcrMsg other = (com.wechat.ferry.entity.po.Wcf.OcrMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.OcrMsg other = (com.wechat.ferry.entity.proto.Wcf.OcrMsg) obj;
 
       if (getStatus()
           != other.getStatus()) return false;
@@ -30399,69 +30399,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -30474,7 +30474,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.OcrMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.OcrMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -30495,21 +30495,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.OcrMsg)
-        com.wechat.ferry.entity.po.Wcf.OcrMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.OcrMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_OcrMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_OcrMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_OcrMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_OcrMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.OcrMsg.class, com.wechat.ferry.entity.po.Wcf.OcrMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.OcrMsg.class, com.wechat.ferry.entity.proto.Wcf.OcrMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.OcrMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.OcrMsg.newBuilder()
       private Builder() {
 
       }
@@ -30531,17 +30531,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_OcrMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_OcrMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.OcrMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.OcrMsg build() {
-        com.wechat.ferry.entity.po.Wcf.OcrMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.OcrMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -30549,14 +30549,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.OcrMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.OcrMsg result = new com.wechat.ferry.entity.po.Wcf.OcrMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.OcrMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.OcrMsg result = new com.wechat.ferry.entity.proto.Wcf.OcrMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.OcrMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.OcrMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.status_ = status_;
@@ -30568,16 +30568,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.OcrMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.OcrMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.OcrMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.OcrMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.OcrMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.OcrMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.OcrMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.OcrMsg.getDefaultInstance()) return this;
         if (other.getStatus() != 0) {
           setStatus(other.getStatus());
         }
@@ -30791,12 +30791,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.OcrMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.OcrMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.OcrMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.OcrMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.OcrMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.OcrMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.OcrMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -30832,7 +30832,7 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.OcrMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.OcrMsg getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -30897,15 +30897,15 @@ java.lang.String defaultValue) {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_ForwardMsg_descriptor;
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_ForwardMsg_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_ForwardMsg_fieldAccessorTable
+      return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_ForwardMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.wechat.ferry.entity.po.Wcf.ForwardMsg.class, com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder.class);
+              com.wechat.ferry.entity.proto.Wcf.ForwardMsg.class, com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder.class);
     }
 
     public static final int ID_FIELD_NUMBER = 1;
@@ -31016,10 +31016,10 @@ java.lang.String defaultValue) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof com.wechat.ferry.entity.po.Wcf.ForwardMsg)) {
+      if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.ForwardMsg)) {
         return super.equals(obj);
       }
-      com.wechat.ferry.entity.po.Wcf.ForwardMsg other = (com.wechat.ferry.entity.po.Wcf.ForwardMsg) obj;
+      com.wechat.ferry.entity.proto.Wcf.ForwardMsg other = (com.wechat.ferry.entity.proto.Wcf.ForwardMsg) obj;
 
       if (getId()
           != other.getId()) return false;
@@ -31046,69 +31046,69 @@ java.lang.String defaultValue) {
       return hash;
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(byte[] data)
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseDelimitedFrom(java.io.InputStream input)
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseDelimitedFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg parseFrom(
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -31121,7 +31121,7 @@ java.lang.String defaultValue) {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(com.wechat.ferry.entity.po.Wcf.ForwardMsg prototype) {
+    public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.ForwardMsg prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -31142,21 +31142,21 @@ java.lang.String defaultValue) {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:wcf.ForwardMsg)
-        com.wechat.ferry.entity.po.Wcf.ForwardMsgOrBuilder {
+        com.wechat.ferry.entity.proto.Wcf.ForwardMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_ForwardMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_ForwardMsg_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_ForwardMsg_fieldAccessorTable
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_ForwardMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.wechat.ferry.entity.po.Wcf.ForwardMsg.class, com.wechat.ferry.entity.po.Wcf.ForwardMsg.Builder.class);
+                com.wechat.ferry.entity.proto.Wcf.ForwardMsg.class, com.wechat.ferry.entity.proto.Wcf.ForwardMsg.Builder.class);
       }
 
-      // Construct using com.wechat.ferry.entity.po.Wcf.ForwardMsg.newBuilder()
+      // Construct using com.wechat.ferry.entity.proto.Wcf.ForwardMsg.newBuilder()
       private Builder() {
 
       }
@@ -31178,17 +31178,17 @@ java.lang.String defaultValue) {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.wechat.ferry.entity.po.Wcf.internal_static_wcf_ForwardMsg_descriptor;
+        return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_ForwardMsg_descriptor;
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsg getDefaultInstanceForType() {
-        return com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance();
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsg getDefaultInstanceForType() {
+        return com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance();
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsg build() {
-        com.wechat.ferry.entity.po.Wcf.ForwardMsg result = buildPartial();
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsg build() {
+        com.wechat.ferry.entity.proto.Wcf.ForwardMsg result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -31196,14 +31196,14 @@ java.lang.String defaultValue) {
       }
 
       @java.lang.Override
-      public com.wechat.ferry.entity.po.Wcf.ForwardMsg buildPartial() {
-        com.wechat.ferry.entity.po.Wcf.ForwardMsg result = new com.wechat.ferry.entity.po.Wcf.ForwardMsg(this);
+      public com.wechat.ferry.entity.proto.Wcf.ForwardMsg buildPartial() {
+        com.wechat.ferry.entity.proto.Wcf.ForwardMsg result = new com.wechat.ferry.entity.proto.Wcf.ForwardMsg(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(com.wechat.ferry.entity.po.Wcf.ForwardMsg result) {
+      private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.ForwardMsg result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
           result.id_ = id_;
@@ -31215,16 +31215,16 @@ java.lang.String defaultValue) {
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.wechat.ferry.entity.po.Wcf.ForwardMsg) {
-          return mergeFrom((com.wechat.ferry.entity.po.Wcf.ForwardMsg)other);
+        if (other instanceof com.wechat.ferry.entity.proto.Wcf.ForwardMsg) {
+          return mergeFrom((com.wechat.ferry.entity.proto.Wcf.ForwardMsg)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.wechat.ferry.entity.po.Wcf.ForwardMsg other) {
-        if (other == com.wechat.ferry.entity.po.Wcf.ForwardMsg.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.ForwardMsg other) {
+        if (other == com.wechat.ferry.entity.proto.Wcf.ForwardMsg.getDefaultInstance()) return this;
         if (other.getId() != 0L) {
           setId(other.getId());
         }
@@ -31438,12 +31438,12 @@ java.lang.String defaultValue) {
     }
 
     // @@protoc_insertion_point(class_scope:wcf.ForwardMsg)
-    private static final com.wechat.ferry.entity.po.Wcf.ForwardMsg DEFAULT_INSTANCE;
+    private static final com.wechat.ferry.entity.proto.Wcf.ForwardMsg DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new com.wechat.ferry.entity.po.Wcf.ForwardMsg();
+      DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.ForwardMsg();
     }
 
-    public static com.wechat.ferry.entity.po.Wcf.ForwardMsg getDefaultInstance() {
+    public static com.wechat.ferry.entity.proto.Wcf.ForwardMsg getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -31479,7 +31479,2007 @@ java.lang.String defaultValue) {
     }
 
     @java.lang.Override
-    public com.wechat.ferry.entity.po.Wcf.ForwardMsg getDefaultInstanceForType() {
+    public com.wechat.ferry.entity.proto.Wcf.ForwardMsg getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface RoomDataOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wcf.RoomData)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * repeated .wcf.RoomData.RoomMember members = 1;
+     */
+    java.util.List 
+        getMembersList();
+    /**
+     * repeated .wcf.RoomData.RoomMember members = 1;
+     */
+    com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getMembers(int index);
+    /**
+     * repeated .wcf.RoomData.RoomMember members = 1;
+     */
+    int getMembersCount();
+    /**
+     * repeated .wcf.RoomData.RoomMember members = 1;
+     */
+    java.util.List 
+        getMembersOrBuilderList();
+    /**
+     * repeated .wcf.RoomData.RoomMember members = 1;
+     */
+    com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder getMembersOrBuilder(
+        int index);
+
+    /**
+     * int32 field_2 = 2;
+     * @return The field2.
+     */
+    int getField2();
+
+    /**
+     * int32 field_3 = 3;
+     * @return The field3.
+     */
+    int getField3();
+
+    /**
+     * int32 field_4 = 4;
+     * @return The field4.
+     */
+    int getField4();
+
+    /**
+     * int32 room_capacity = 5;
+     * @return The roomCapacity.
+     */
+    int getRoomCapacity();
+
+    /**
+     * int32 field_6 = 6;
+     * @return The field6.
+     */
+    int getField6();
+
+    /**
+     * int64 field_7 = 7;
+     * @return The field7.
+     */
+    long getField7();
+
+    /**
+     * int64 field_8 = 8;
+     * @return The field8.
+     */
+    long getField8();
+  }
+  /**
+   * 
+   * RoomData内部转换
+   * 
+ * + * Protobuf type {@code wcf.RoomData} + */ + public static final class RoomData extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:wcf.RoomData) + RoomDataOrBuilder { + private static final long serialVersionUID = 0L; + // Use RoomData.newBuilder() to construct. + private RoomData(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RoomData() { + members_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new RoomData(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.wechat.ferry.entity.proto.Wcf.RoomData.class, com.wechat.ferry.entity.proto.Wcf.RoomData.Builder.class); + } + + public interface RoomMemberOrBuilder extends + // @@protoc_insertion_point(interface_extends:wcf.RoomData.RoomMember) + com.google.protobuf.MessageOrBuilder { + + /** + * string wxid = 1; + * @return The wxid. + */ + java.lang.String getWxid(); + /** + * string wxid = 1; + * @return The bytes for wxid. + */ + com.google.protobuf.ByteString + getWxidBytes(); + + /** + * string name = 2; + * @return The name. + */ + java.lang.String getName(); + /** + * string name = 2; + * @return The bytes for name. + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + * int32 state = 3; + * @return The state. + */ + int getState(); + } + /** + * Protobuf type {@code wcf.RoomData.RoomMember} + */ + public static final class RoomMember extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:wcf.RoomData.RoomMember) + RoomMemberOrBuilder { + private static final long serialVersionUID = 0L; + // Use RoomMember.newBuilder() to construct. + private RoomMember(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private RoomMember() { + wxid_ = ""; + name_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new RoomMember(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_RoomMember_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_RoomMember_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.class, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder.class); + } + + public static final int WXID_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object wxid_ = ""; + /** + * string wxid = 1; + * @return The wxid. + */ + @java.lang.Override + public java.lang.String getWxid() { + java.lang.Object ref = wxid_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + wxid_ = s; + return s; + } + } + /** + * string wxid = 1; + * @return The bytes for wxid. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getWxidBytes() { + java.lang.Object ref = wxid_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + wxid_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int NAME_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + @java.lang.Override + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATE_FIELD_NUMBER = 3; + private int state_ = 0; + /** + * int32 state = 3; + * @return The state. + */ + @java.lang.Override + public int getState() { + return state_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(wxid_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, wxid_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); + } + if (state_ != 0) { + output.writeInt32(3, state_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(wxid_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, wxid_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); + } + if (state_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, state_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember)) { + return super.equals(obj); + } + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember other = (com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember) obj; + + if (!getWxid() + .equals(other.getWxid())) return false; + if (!getName() + .equals(other.getName())) return false; + if (getState() + != other.getState()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + WXID_FIELD_NUMBER; + hash = (53 * hash) + getWxid().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (37 * hash) + STATE_FIELD_NUMBER; + hash = (53 * hash) + getState(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code wcf.RoomData.RoomMember} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:wcf.RoomData.RoomMember) + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_RoomMember_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_RoomMember_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.class, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder.class); + } + + // Construct using com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + wxid_ = ""; + name_ = ""; + state_ = 0; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_RoomMember_descriptor; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getDefaultInstanceForType() { + return com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.getDefaultInstance(); + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember build() { + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember buildPartial() { + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember result = new com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.wxid_ = wxid_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.state_ = state_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember) { + return mergeFrom((com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember other) { + if (other == com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.getDefaultInstance()) return this; + if (!other.getWxid().isEmpty()) { + wxid_ = other.wxid_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (!other.getName().isEmpty()) { + name_ = other.name_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.getState() != 0) { + setState(other.getState()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + wxid_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + state_ = input.readInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object wxid_ = ""; + /** + * string wxid = 1; + * @return The wxid. + */ + public java.lang.String getWxid() { + java.lang.Object ref = wxid_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + wxid_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string wxid = 1; + * @return The bytes for wxid. + */ + public com.google.protobuf.ByteString + getWxidBytes() { + java.lang.Object ref = wxid_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + wxid_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string wxid = 1; + * @param value The wxid to set. + * @return This builder for chaining. + */ + public Builder setWxid( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + wxid_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * string wxid = 1; + * @return This builder for chaining. + */ + public Builder clearWxid() { + wxid_ = getDefaultInstance().getWxid(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * string wxid = 1; + * @param value The bytes for wxid to set. + * @return This builder for chaining. + */ + public Builder setWxidBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + wxid_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string name = 2; + * @param value The name to set. + * @return This builder for chaining. + */ + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string name = 2; + * @return This builder for chaining. + */ + public Builder clearName() { + name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string name = 2; + * @param value The bytes for name to set. + * @return This builder for chaining. + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private int state_ ; + /** + * int32 state = 3; + * @return The state. + */ + @java.lang.Override + public int getState() { + return state_; + } + /** + * int32 state = 3; + * @param value The state to set. + * @return This builder for chaining. + */ + public Builder setState(int value) { + + state_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int32 state = 3; + * @return This builder for chaining. + */ + public Builder clearState() { + bitField0_ = (bitField0_ & ~0x00000004); + state_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:wcf.RoomData.RoomMember) + } + + // @@protoc_insertion_point(class_scope:wcf.RoomData.RoomMember) + private static final com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember(); + } + + public static com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public RoomMember parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public static final int MEMBERS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private java.util.List members_; + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + @java.lang.Override + public java.util.List getMembersList() { + return members_; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + @java.lang.Override + public java.util.List + getMembersOrBuilderList() { + return members_; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + @java.lang.Override + public int getMembersCount() { + return members_.size(); + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getMembers(int index) { + return members_.get(index); + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder getMembersOrBuilder( + int index) { + return members_.get(index); + } + + public static final int FIELD_2_FIELD_NUMBER = 2; + private int field2_ = 0; + /** + * int32 field_2 = 2; + * @return The field2. + */ + @java.lang.Override + public int getField2() { + return field2_; + } + + public static final int FIELD_3_FIELD_NUMBER = 3; + private int field3_ = 0; + /** + * int32 field_3 = 3; + * @return The field3. + */ + @java.lang.Override + public int getField3() { + return field3_; + } + + public static final int FIELD_4_FIELD_NUMBER = 4; + private int field4_ = 0; + /** + * int32 field_4 = 4; + * @return The field4. + */ + @java.lang.Override + public int getField4() { + return field4_; + } + + public static final int ROOM_CAPACITY_FIELD_NUMBER = 5; + private int roomCapacity_ = 0; + /** + * int32 room_capacity = 5; + * @return The roomCapacity. + */ + @java.lang.Override + public int getRoomCapacity() { + return roomCapacity_; + } + + public static final int FIELD_6_FIELD_NUMBER = 6; + private int field6_ = 0; + /** + * int32 field_6 = 6; + * @return The field6. + */ + @java.lang.Override + public int getField6() { + return field6_; + } + + public static final int FIELD_7_FIELD_NUMBER = 7; + private long field7_ = 0L; + /** + * int64 field_7 = 7; + * @return The field7. + */ + @java.lang.Override + public long getField7() { + return field7_; + } + + public static final int FIELD_8_FIELD_NUMBER = 8; + private long field8_ = 0L; + /** + * int64 field_8 = 8; + * @return The field8. + */ + @java.lang.Override + public long getField8() { + return field8_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < members_.size(); i++) { + output.writeMessage(1, members_.get(i)); + } + if (field2_ != 0) { + output.writeInt32(2, field2_); + } + if (field3_ != 0) { + output.writeInt32(3, field3_); + } + if (field4_ != 0) { + output.writeInt32(4, field4_); + } + if (roomCapacity_ != 0) { + output.writeInt32(5, roomCapacity_); + } + if (field6_ != 0) { + output.writeInt32(6, field6_); + } + if (field7_ != 0L) { + output.writeInt64(7, field7_); + } + if (field8_ != 0L) { + output.writeInt64(8, field8_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < members_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, members_.get(i)); + } + if (field2_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, field2_); + } + if (field3_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, field3_); + } + if (field4_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, field4_); + } + if (roomCapacity_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, roomCapacity_); + } + if (field6_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, field6_); + } + if (field7_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(7, field7_); + } + if (field8_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(8, field8_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.wechat.ferry.entity.proto.Wcf.RoomData)) { + return super.equals(obj); + } + com.wechat.ferry.entity.proto.Wcf.RoomData other = (com.wechat.ferry.entity.proto.Wcf.RoomData) obj; + + if (!getMembersList() + .equals(other.getMembersList())) return false; + if (getField2() + != other.getField2()) return false; + if (getField3() + != other.getField3()) return false; + if (getField4() + != other.getField4()) return false; + if (getRoomCapacity() + != other.getRoomCapacity()) return false; + if (getField6() + != other.getField6()) return false; + if (getField7() + != other.getField7()) return false; + if (getField8() + != other.getField8()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getMembersCount() > 0) { + hash = (37 * hash) + MEMBERS_FIELD_NUMBER; + hash = (53 * hash) + getMembersList().hashCode(); + } + hash = (37 * hash) + FIELD_2_FIELD_NUMBER; + hash = (53 * hash) + getField2(); + hash = (37 * hash) + FIELD_3_FIELD_NUMBER; + hash = (53 * hash) + getField3(); + hash = (37 * hash) + FIELD_4_FIELD_NUMBER; + hash = (53 * hash) + getField4(); + hash = (37 * hash) + ROOM_CAPACITY_FIELD_NUMBER; + hash = (53 * hash) + getRoomCapacity(); + hash = (37 * hash) + FIELD_6_FIELD_NUMBER; + hash = (53 * hash) + getField6(); + hash = (37 * hash) + FIELD_7_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getField7()); + hash = (37 * hash) + FIELD_8_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getField8()); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.wechat.ferry.entity.proto.Wcf.RoomData parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.wechat.ferry.entity.proto.Wcf.RoomData prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * RoomData内部转换
+     * 
+ * + * Protobuf type {@code wcf.RoomData} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:wcf.RoomData) + com.wechat.ferry.entity.proto.Wcf.RoomDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.wechat.ferry.entity.proto.Wcf.RoomData.class, com.wechat.ferry.entity.proto.Wcf.RoomData.Builder.class); + } + + // Construct using com.wechat.ferry.entity.proto.Wcf.RoomData.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + if (membersBuilder_ == null) { + members_ = java.util.Collections.emptyList(); + } else { + members_ = null; + membersBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + field2_ = 0; + field3_ = 0; + field4_ = 0; + roomCapacity_ = 0; + field6_ = 0; + field7_ = 0L; + field8_ = 0L; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.wechat.ferry.entity.proto.Wcf.internal_static_wcf_RoomData_descriptor; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData getDefaultInstanceForType() { + return com.wechat.ferry.entity.proto.Wcf.RoomData.getDefaultInstance(); + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData build() { + com.wechat.ferry.entity.proto.Wcf.RoomData result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData buildPartial() { + com.wechat.ferry.entity.proto.Wcf.RoomData result = new com.wechat.ferry.entity.proto.Wcf.RoomData(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.wechat.ferry.entity.proto.Wcf.RoomData result) { + if (membersBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + members_ = java.util.Collections.unmodifiableList(members_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.members_ = members_; + } else { + result.members_ = membersBuilder_.build(); + } + } + + private void buildPartial0(com.wechat.ferry.entity.proto.Wcf.RoomData result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.field2_ = field2_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.field3_ = field3_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.field4_ = field4_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.roomCapacity_ = roomCapacity_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.field6_ = field6_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.field7_ = field7_; + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.field8_ = field8_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.wechat.ferry.entity.proto.Wcf.RoomData) { + return mergeFrom((com.wechat.ferry.entity.proto.Wcf.RoomData)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.wechat.ferry.entity.proto.Wcf.RoomData other) { + if (other == com.wechat.ferry.entity.proto.Wcf.RoomData.getDefaultInstance()) return this; + if (membersBuilder_ == null) { + if (!other.members_.isEmpty()) { + if (members_.isEmpty()) { + members_ = other.members_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureMembersIsMutable(); + members_.addAll(other.members_); + } + onChanged(); + } + } else { + if (!other.members_.isEmpty()) { + if (membersBuilder_.isEmpty()) { + membersBuilder_.dispose(); + membersBuilder_ = null; + members_ = other.members_; + bitField0_ = (bitField0_ & ~0x00000001); + membersBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getMembersFieldBuilder() : null; + } else { + membersBuilder_.addAllMessages(other.members_); + } + } + } + if (other.getField2() != 0) { + setField2(other.getField2()); + } + if (other.getField3() != 0) { + setField3(other.getField3()); + } + if (other.getField4() != 0) { + setField4(other.getField4()); + } + if (other.getRoomCapacity() != 0) { + setRoomCapacity(other.getRoomCapacity()); + } + if (other.getField6() != 0) { + setField6(other.getField6()); + } + if (other.getField7() != 0L) { + setField7(other.getField7()); + } + if (other.getField8() != 0L) { + setField8(other.getField8()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember m = + input.readMessage( + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.parser(), + extensionRegistry); + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + members_.add(m); + } else { + membersBuilder_.addMessage(m); + } + break; + } // case 10 + case 16: { + field2_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + field3_ = input.readInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + field4_ = input.readInt32(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 40: { + roomCapacity_ = input.readInt32(); + bitField0_ |= 0x00000010; + break; + } // case 40 + case 48: { + field6_ = input.readInt32(); + bitField0_ |= 0x00000020; + break; + } // case 48 + case 56: { + field7_ = input.readInt64(); + bitField0_ |= 0x00000040; + break; + } // case 56 + case 64: { + field8_ = input.readInt64(); + bitField0_ |= 0x00000080; + break; + } // case 64 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.util.List members_ = + java.util.Collections.emptyList(); + private void ensureMembersIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + members_ = new java.util.ArrayList(members_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder> membersBuilder_; + + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public java.util.List getMembersList() { + if (membersBuilder_ == null) { + return java.util.Collections.unmodifiableList(members_); + } else { + return membersBuilder_.getMessageList(); + } + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public int getMembersCount() { + if (membersBuilder_ == null) { + return members_.size(); + } else { + return membersBuilder_.getCount(); + } + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember getMembers(int index) { + if (membersBuilder_ == null) { + return members_.get(index); + } else { + return membersBuilder_.getMessage(index); + } + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder setMembers( + int index, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember value) { + if (membersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMembersIsMutable(); + members_.set(index, value); + onChanged(); + } else { + membersBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder setMembers( + int index, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder builderForValue) { + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + members_.set(index, builderForValue.build()); + onChanged(); + } else { + membersBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder addMembers(com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember value) { + if (membersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMembersIsMutable(); + members_.add(value); + onChanged(); + } else { + membersBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder addMembers( + int index, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember value) { + if (membersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMembersIsMutable(); + members_.add(index, value); + onChanged(); + } else { + membersBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder addMembers( + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder builderForValue) { + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + members_.add(builderForValue.build()); + onChanged(); + } else { + membersBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder addMembers( + int index, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder builderForValue) { + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + members_.add(index, builderForValue.build()); + onChanged(); + } else { + membersBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder addAllMembers( + java.lang.Iterable values) { + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, members_); + onChanged(); + } else { + membersBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder clearMembers() { + if (membersBuilder_ == null) { + members_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + membersBuilder_.clear(); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public Builder removeMembers(int index) { + if (membersBuilder_ == null) { + ensureMembersIsMutable(); + members_.remove(index); + onChanged(); + } else { + membersBuilder_.remove(index); + } + return this; + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder getMembersBuilder( + int index) { + return getMembersFieldBuilder().getBuilder(index); + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder getMembersOrBuilder( + int index) { + if (membersBuilder_ == null) { + return members_.get(index); } else { + return membersBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public java.util.List + getMembersOrBuilderList() { + if (membersBuilder_ != null) { + return membersBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(members_); + } + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder addMembersBuilder() { + return getMembersFieldBuilder().addBuilder( + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.getDefaultInstance()); + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder addMembersBuilder( + int index) { + return getMembersFieldBuilder().addBuilder( + index, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.getDefaultInstance()); + } + /** + * repeated .wcf.RoomData.RoomMember members = 1; + */ + public java.util.List + getMembersBuilderList() { + return getMembersFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder> + getMembersFieldBuilder() { + if (membersBuilder_ == null) { + membersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMember.Builder, com.wechat.ferry.entity.proto.Wcf.RoomData.RoomMemberOrBuilder>( + members_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + members_ = null; + } + return membersBuilder_; + } + + private int field2_ ; + /** + * int32 field_2 = 2; + * @return The field2. + */ + @java.lang.Override + public int getField2() { + return field2_; + } + /** + * int32 field_2 = 2; + * @param value The field2 to set. + * @return This builder for chaining. + */ + public Builder setField2(int value) { + + field2_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * int32 field_2 = 2; + * @return This builder for chaining. + */ + public Builder clearField2() { + bitField0_ = (bitField0_ & ~0x00000002); + field2_ = 0; + onChanged(); + return this; + } + + private int field3_ ; + /** + * int32 field_3 = 3; + * @return The field3. + */ + @java.lang.Override + public int getField3() { + return field3_; + } + /** + * int32 field_3 = 3; + * @param value The field3 to set. + * @return This builder for chaining. + */ + public Builder setField3(int value) { + + field3_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int32 field_3 = 3; + * @return This builder for chaining. + */ + public Builder clearField3() { + bitField0_ = (bitField0_ & ~0x00000004); + field3_ = 0; + onChanged(); + return this; + } + + private int field4_ ; + /** + * int32 field_4 = 4; + * @return The field4. + */ + @java.lang.Override + public int getField4() { + return field4_; + } + /** + * int32 field_4 = 4; + * @param value The field4 to set. + * @return This builder for chaining. + */ + public Builder setField4(int value) { + + field4_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * int32 field_4 = 4; + * @return This builder for chaining. + */ + public Builder clearField4() { + bitField0_ = (bitField0_ & ~0x00000008); + field4_ = 0; + onChanged(); + return this; + } + + private int roomCapacity_ ; + /** + * int32 room_capacity = 5; + * @return The roomCapacity. + */ + @java.lang.Override + public int getRoomCapacity() { + return roomCapacity_; + } + /** + * int32 room_capacity = 5; + * @param value The roomCapacity to set. + * @return This builder for chaining. + */ + public Builder setRoomCapacity(int value) { + + roomCapacity_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * int32 room_capacity = 5; + * @return This builder for chaining. + */ + public Builder clearRoomCapacity() { + bitField0_ = (bitField0_ & ~0x00000010); + roomCapacity_ = 0; + onChanged(); + return this; + } + + private int field6_ ; + /** + * int32 field_6 = 6; + * @return The field6. + */ + @java.lang.Override + public int getField6() { + return field6_; + } + /** + * int32 field_6 = 6; + * @param value The field6 to set. + * @return This builder for chaining. + */ + public Builder setField6(int value) { + + field6_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * int32 field_6 = 6; + * @return This builder for chaining. + */ + public Builder clearField6() { + bitField0_ = (bitField0_ & ~0x00000020); + field6_ = 0; + onChanged(); + return this; + } + + private long field7_ ; + /** + * int64 field_7 = 7; + * @return The field7. + */ + @java.lang.Override + public long getField7() { + return field7_; + } + /** + * int64 field_7 = 7; + * @param value The field7 to set. + * @return This builder for chaining. + */ + public Builder setField7(long value) { + + field7_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * int64 field_7 = 7; + * @return This builder for chaining. + */ + public Builder clearField7() { + bitField0_ = (bitField0_ & ~0x00000040); + field7_ = 0L; + onChanged(); + return this; + } + + private long field8_ ; + /** + * int64 field_8 = 8; + * @return The field8. + */ + @java.lang.Override + public long getField8() { + return field8_; + } + /** + * int64 field_8 = 8; + * @param value The field8 to set. + * @return This builder for chaining. + */ + public Builder setField8(long value) { + + field8_ = value; + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * int64 field_8 = 8; + * @return This builder for chaining. + */ + public Builder clearField8() { + bitField0_ = (bitField0_ & ~0x00000080); + field8_ = 0L; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:wcf.RoomData) + } + + // @@protoc_insertion_point(class_scope:wcf.RoomData) + private static final com.wechat.ferry.entity.proto.Wcf.RoomData DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.wechat.ferry.entity.proto.Wcf.RoomData(); + } + + public static com.wechat.ferry.entity.proto.Wcf.RoomData getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public RoomData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.wechat.ferry.entity.proto.Wcf.RoomData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -31630,6 +33630,16 @@ java.lang.String defaultValue) { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_wcf_ForwardMsg_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_wcf_RoomData_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_wcf_RoomData_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_wcf_RoomData_RoomMember_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_wcf_RoomData_RoomMember_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -31699,27 +33709,33 @@ java.lang.String defaultValue) { "\t\"&\n\006PatMsg\022\016\n\006roomid\030\001 \001(\t\022\014\n\004wxid\030\002 \001(" + "\t\"(\n\006OcrMsg\022\016\n\006status\030\001 \001(\005\022\016\n\006result\030\002 " + "\001(\t\".\n\nForwardMsg\022\016\n\002id\030\001 \001(\004B\0020\001\022\020\n\010rec" + - "eiver\030\002 \001(\t*\362\005\n\tFunctions\022\021\n\rFUNC_RESERV" + - "ED\020\000\022\021\n\rFUNC_IS_LOGIN\020\001\022\026\n\022FUNC_GET_SELF" + - "_WXID\020\020\022\026\n\022FUNC_GET_MSG_TYPES\020\021\022\025\n\021FUNC_" + - "GET_CONTACTS\020\022\022\025\n\021FUNC_GET_DB_NAMES\020\023\022\026\n" + - "\022FUNC_GET_DB_TABLES\020\024\022\026\n\022FUNC_GET_USER_I" + - "NFO\020\025\022\026\n\022FUNC_GET_AUDIO_MSG\020\026\022\021\n\rFUNC_SE" + - "ND_TXT\020 \022\021\n\rFUNC_SEND_IMG\020!\022\022\n\016FUNC_SEND" + - "_FILE\020\"\022\021\n\rFUNC_SEND_XML\020#\022\025\n\021FUNC_SEND_" + - "EMOTION\020$\022\026\n\022FUNC_SEND_RICH_TXT\020%\022\025\n\021FUN" + - "C_SEND_PAT_MSG\020&\022\024\n\020FUNC_FORWARD_MSG\020\'\022\030" + - "\n\024FUNC_ENABLE_RECV_TXT\0200\022\031\n\025FUNC_DISABLE" + - "_RECV_TXT\020@\022\026\n\022FUNC_EXEC_DB_QUERY\020P\022\026\n\022F" + - "UNC_ACCEPT_FRIEND\020Q\022\026\n\022FUNC_RECV_TRANSFE" + - "R\020R\022\024\n\020FUNC_REFRESH_PYQ\020S\022\030\n\024FUNC_DOWNLO" + - "AD_ATTACH\020T\022\031\n\025FUNC_GET_CONTACT_INFO\020U\022\023" + - "\n\017FUNC_REVOKE_MSG\020V\022\027\n\023FUNC_REFRESH_QRCO" + - "DE\020W\022\026\n\022FUNC_DECRYPT_IMAGE\020`\022\021\n\rFUNC_EXE" + - "C_OCR\020a\022\031\n\025FUNC_ADD_ROOM_MEMBERS\020p\022\031\n\025FU" + - "NC_DEL_ROOM_MEMBERS\020q\022\031\n\025FUNC_INV_ROOM_M" + - "EMBERS\020rB\034\n\032com.wechat.ferry.entity.pob\006" + - "proto3" + "eiver\030\002 \001(\t\"\353\001\n\010RoomData\022)\n\007members\030\001 \003(" + + "\0132\030.wcf.RoomData.RoomMember\022\017\n\007field_2\030\002" + + " \001(\005\022\017\n\007field_3\030\003 \001(\005\022\017\n\007field_4\030\004 \001(\005\022\025" + + "\n\rroom_capacity\030\005 \001(\005\022\017\n\007field_6\030\006 \001(\005\022\017" + + "\n\007field_7\030\007 \001(\003\022\017\n\007field_8\030\010 \001(\003\0327\n\nRoom" + + "Member\022\014\n\004wxid\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\r\n\005st" + + "ate\030\003 \001(\005*\362\005\n\tFunctions\022\021\n\rFUNC_RESERVED" + + "\020\000\022\021\n\rFUNC_IS_LOGIN\020\001\022\026\n\022FUNC_GET_SELF_W" + + "XID\020\020\022\026\n\022FUNC_GET_MSG_TYPES\020\021\022\025\n\021FUNC_GE" + + "T_CONTACTS\020\022\022\025\n\021FUNC_GET_DB_NAMES\020\023\022\026\n\022F" + + "UNC_GET_DB_TABLES\020\024\022\026\n\022FUNC_GET_USER_INF" + + "O\020\025\022\026\n\022FUNC_GET_AUDIO_MSG\020\026\022\021\n\rFUNC_SEND" + + "_TXT\020 \022\021\n\rFUNC_SEND_IMG\020!\022\022\n\016FUNC_SEND_F" + + "ILE\020\"\022\021\n\rFUNC_SEND_XML\020#\022\025\n\021FUNC_SEND_EM" + + "OTION\020$\022\026\n\022FUNC_SEND_RICH_TXT\020%\022\025\n\021FUNC_" + + "SEND_PAT_MSG\020&\022\024\n\020FUNC_FORWARD_MSG\020\'\022\030\n\024" + + "FUNC_ENABLE_RECV_TXT\0200\022\031\n\025FUNC_DISABLE_R" + + "ECV_TXT\020@\022\026\n\022FUNC_EXEC_DB_QUERY\020P\022\026\n\022FUN" + + "C_ACCEPT_FRIEND\020Q\022\026\n\022FUNC_RECV_TRANSFER\020" + + "R\022\024\n\020FUNC_REFRESH_PYQ\020S\022\030\n\024FUNC_DOWNLOAD" + + "_ATTACH\020T\022\031\n\025FUNC_GET_CONTACT_INFO\020U\022\023\n\017" + + "FUNC_REVOKE_MSG\020V\022\027\n\023FUNC_REFRESH_QRCODE" + + "\020W\022\026\n\022FUNC_DECRYPT_IMAGE\020`\022\021\n\rFUNC_EXEC_" + + "OCR\020a\022\031\n\025FUNC_ADD_ROOM_MEMBERS\020p\022\031\n\025FUNC" + + "_DEL_ROOM_MEMBERS\020q\022\031\n\025FUNC_INV_ROOM_MEM" + + "BERS\020rB\037\n\035com.wechat.ferry.entity.protob" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -31899,6 +33915,18 @@ java.lang.String defaultValue) { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_wcf_ForwardMsg_descriptor, new java.lang.String[] { "Id", "Receiver", }); + internal_static_wcf_RoomData_descriptor = + getDescriptor().getMessageTypes().get(28); + internal_static_wcf_RoomData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_wcf_RoomData_descriptor, + new java.lang.String[] { "Members", "Field2", "Field3", "Field4", "RoomCapacity", "Field6", "Field7", "Field8", }); + internal_static_wcf_RoomData_RoomMember_descriptor = + internal_static_wcf_RoomData_descriptor.getNestedTypes().get(0); + internal_static_wcf_RoomData_RoomMember_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_wcf_RoomData_RoomMember_descriptor, + new java.lang.String[] { "Wxid", "Name", "State", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java new file mode 100644 index 0000000..01dfb09 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-查询-个微数据库SQL查询 + * + * @author chandler + * @date 2024-10-02 17:10 + */ +@Data +@ApiModel(value = "wxPpDatabaseSqlReq", description = "个微数据库SQL查询请求入参") +public class WxPpDatabaseSqlReq { + + /** + * 数据库名称 + */ + @ApiModelProperty(value = "数据库名称") + private String databaseName; + + /** + * SQL语句 + */ + @ApiModelProperty(value = "SQL语句") + private String sqlText; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java new file mode 100644 index 0000000..f20711a --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java @@ -0,0 +1,23 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-查询-个微数据库表查询 + * + * @author chandler + * @date 2024-10-02 17:55 + */ +@Data +@ApiModel(value = "wxPpDatabaseTableReq", description = "个微数据库表查询请求入参") +public class WxPpDatabaseTableReq { + + /** + * 数据库名称 + */ + @ApiModelProperty(value = "数据库名称") + private String databaseName; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java new file mode 100644 index 0000000..6711e99 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java @@ -0,0 +1,23 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微查询群成员 + * + * @author chandler + * @date 2024-10-02 20:55 + */ +@Data +@ApiModel(value = "wxPpGroupMemberReq", description = "个微查询群成员请求入参") +public class WxPpGroupMemberReq { + + /** + * 群编号 + */ + @ApiModelProperty(value = "群编号") + private String groupNo; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java new file mode 100644 index 0000000..a48446b --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java @@ -0,0 +1,43 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送卡片消息 + * + * @author chandler + * @date 2024-10-04 23:11 + */ +@Data +@ApiModel(value = "wxPpSendCardMsgReq", description = "个微发送卡片消息请求入参") +public class WxPpSendCardMsgReq { + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + + /** + * XML报文 + */ + @ApiModelProperty(value = "XML报文") + private String xml; + + /** + * 路径 + */ + @ApiModelProperty(value = "路径") + private String path; + + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private Integer type; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java new file mode 100644 index 0000000..1e05dd7 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java @@ -0,0 +1,31 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送表情消息 + * + * @author chandler + * @date 2024-10-04 23:14 + */ +@Data +@ApiModel(value = "wxPpSendEmojiMsgReq", description = "个微发送表情消息请求入参") +public class WxPpSendEmojiMsgReq { + + /** + * 路径 + */ + @ApiModelProperty(value = "路径") + private String path; + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java new file mode 100644 index 0000000..ffd622c --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java @@ -0,0 +1,31 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送文件消息 + * + * @author chandler + * @date 2024-10-04 23:08 + */ +@Data +@ApiModel(value = "wxPpSendFileMsgReq", description = "个微发送文件消息请求入参") +public class WxPpSendFileMsgReq { + + /** + * 图片地址 + */ + @ApiModelProperty(value = "图片地址") + private String path; + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java new file mode 100644 index 0000000..2d2ad45 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java @@ -0,0 +1,31 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送图片消息 + * + * @author chandler + * @date 2024-10-04 15:55 + */ +@Data +@ApiModel(value = "wxPpSendImageMsgReq", description = "个微发送图片消息请求入参") +public class WxPpSendImageMsgReq { + + /** + * 图片地址 + */ + @ApiModelProperty(value = "图片地址") + private String path; + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java new file mode 100644 index 0000000..7444045 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java @@ -0,0 +1,49 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 请求入参-个微发送文本消息 + * + * @author chandler + * @date 2024-10-02 20:33 + */ +@Data +@ApiModel(value = "wxPpSendTextMsgReq", description = "个微发送文本消息请求入参") +public class WxPpSendTextMsgReq { + + /** + * 消息文本 + * 消息内容(如果是 @ 消息则需要有跟 @ 的人数量相同的 @) + */ + @ApiModelProperty(value = "消息文本") + private String msgText; + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + + /** + * 要艾特的用户 + * 群聊时要 @ 的人(私聊时为空字符串),多个用逗号分隔。 + * 艾特所有人用 notify@all(必须是群主或者管理员才有权限) + */ + @ApiModelProperty(value = "要艾特的用户") + private List atUsers; + + /** + * 是否艾特全体 + * 默认为false + */ + @ApiModelProperty(value = "是否艾特全体") + private Boolean isAtAll = false; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java new file mode 100644 index 0000000..57fcdde --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java @@ -0,0 +1,101 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微联系人 + * + * @author chandler + * @date 2024/10/02 17:01 + */ +@Data +@ApiModel(value = "wxPpContactsResp", description = "个微联系人查询请求出参") +public class WxPpContactsResp { + + /** + * 微信编号 + */ + @ApiModelProperty(value = "微信编号") + private String weChatNo; + + /** + * 微信代码 + */ + @ApiModelProperty(value = "微信代码") + private String weChatCode; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 微信昵称 + */ + @ApiModelProperty(value = "微信昵称") + private String nickName; + + /** + * 国家 + */ + @ApiModelProperty(value = "国家") + private String country; + + /** + * 国家拼音 + */ + @ApiModelProperty(value = "国家拼音") + private String countryPinyin; + + /** + * 省/州 + */ + @ApiModelProperty(value = "省/州") + private String province; + + /** + * 省/州拼音 + */ + @ApiModelProperty(value = "省/州拼音") + private String provincePinyin; + + /** + * 城市 + */ + @ApiModelProperty(value = "城市") + private String city; + + /** + * 城市拼音 + */ + @ApiModelProperty(value = "城市拼音") + private String cityPinyin; + + /** + * 性别 + */ + @ApiModelProperty(value = "性别") + private String sex; + + /** + * 性别-翻译 + */ + @ApiModelProperty(value = "性别-翻译") + private String sexLabel; + + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String type; + + /** + * 类型-翻译 + */ + @ApiModelProperty(value = "类型-翻译") + private String typeLabel; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java new file mode 100644 index 0000000..eafae8d --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java @@ -0,0 +1,35 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微数据库字段 + * + * @author chandler + * @date 2024/10/02 17:15 + */ +@Data +@ApiModel(value = "wxPpDatabaseFieldResp", description = "个微数据库字段查询请求出参") +public class WxPpDatabaseFieldResp { + + /** + * 字段类型 + */ + @ApiModelProperty(value = "字段类型") + private String type; + + /** + * 字段 + */ + @ApiModelProperty(value = "字段") + private String column; + + /** + * 字段值 + */ + @ApiModelProperty(value = "字段值") + private String value; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java new file mode 100644 index 0000000..f774644 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java @@ -0,0 +1,25 @@ +package com.wechat.ferry.entity.vo.response; + +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微数据库记录 + * + * @author chandler + * @date 2024/10/02 17:14 + */ +@Data +@ApiModel(value = "wxPpDatabaseRowResp", description = "个微数据库记录查询请求出参") +public class WxPpDatabaseRowResp { + + /** + * 字段列表 + */ + @ApiModelProperty(value = "字段列表") + private List fieldList; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java new file mode 100644 index 0000000..1da4324 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java @@ -0,0 +1,35 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微查询群成员 + * + * @author chandler + * @date 2024/10/01 21:26 + */ +@Data +@ApiModel(value = "wxPpGroupMemberResp", description = "个微群成员查询请求出参") +public class WxPpGroupMemberResp { + + /** + * 微信编号 + */ + @ApiModelProperty(value = "微信编号") + private String weChatNo; + + /** + * 微信昵称 + */ + @ApiModelProperty(value = "微信昵称") + private String nickName; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private String state; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java new file mode 100644 index 0000000..2aa59f0 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微消息类型 + * + * @author chandler + * @date 2024/10/01 21:26 + */ +@Data +@ApiModel(value = "wxPpMsgTypeResp", description = "个微消息类型查询请求出参") +public class WxPpMsgTypeResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java new file mode 100644 index 0000000..8662801 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送卡片消息 + * + * @author chandler + * @date 2024/10/04 23:11 + */ +@Data +@ApiModel(value = "wxPpSendCardMsgResp", description = "个微发送卡片消息请求出参") +public class WxPpSendCardMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java new file mode 100644 index 0000000..ed65a44 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送GIF消息 + * + * @author chandler + * @date 2024/10/04 23:13 + */ +@Data +@ApiModel(value = "wxPpSendEmojiMsgResp", description = "个微发送GIF消息请求出参") +public class WxPpSendEmojiMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java new file mode 100644 index 0000000..9ca51ea --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送文件消息 + * + * @author chandler + * @date 2024/10/04 23:07 + */ +@Data +@ApiModel(value = "wxPpSendFileMsgResp", description = "个微发送文件消息请求出参") +public class WxPpSendFileMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java new file mode 100644 index 0000000..522b19c --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送图像消息 + * + * @author chandler + * @date 2024/10/03 10:17 + */ +@Data +@ApiModel(value = "wxPpSendImageMsgResp", description = "个微发送图像消息请求出参") +public class WxPpSendImageMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java new file mode 100644 index 0000000..c4080c4 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送文本消息 + * + * @author chandler + * @date 2024/10/03 10:17 + */ +@Data +@ApiModel(value = "wxPpSendTextMsgResp", description = "个微发送文本消息请求出参") +public class WxPpSendTextMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/SexEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/SexEnum.java index 6d08b6b..a8ebf44 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/SexEnum.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/SexEnum.java @@ -1,5 +1,9 @@ package com.wechat.ferry.enums; +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + import lombok.AllArgsConstructor; import lombok.Getter; @@ -39,4 +43,16 @@ public enum SexEnum { private final String code; private final String name; + /** + * map集合 key:code val:枚举 + */ + public static final Map codeMap = Arrays.stream(values()).collect(Collectors.toMap(SexEnum::getCode, v -> v)); + + /** + * 根据code获取枚举 + */ + public static SexEnum getCodeMap(String code) { + return codeMap.getOrDefault(code, UN_MATCH); + } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WcfMsgTypeEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WcfMsgTypeEnum.java new file mode 100644 index 0000000..1a90fd7 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WcfMsgTypeEnum.java @@ -0,0 +1,192 @@ +package com.wechat.ferry.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 枚举-WCF消息类型 + * + * @author chandler + * @date 2024/10/01 15:55 + */ +@Getter +@AllArgsConstructor +public enum WcfMsgTypeEnum { + + /** + * 0-朋友圈消息 + */ + FRIEND_CIRCLE_MSG("0", "朋友圈消息"), + + /** + * 1-文字 + */ + TEXT("1", "文字"), + + /** + * 3-图片 + */ + PICTURE("3", "图片"), + + /** + * 34-语音 + */ + VOICE("34", "语音"), + + /** + * 37-好友确认 + */ + FRIEND_CONFIRM("37", "好友确认"), + + /** + * 40-可能认识的朋友消息-POSSIBLEFRIEND_MSG + */ + POSSIBLE_FRIEND_MSG("40", "可能认识的朋友"), + + /** + * 42-名片 + */ + VISITING_CARD("42", "名片"), + + /** + * 43-视频 + */ + VIDEO("43", "视频"), + + /** + * 47-石头剪刀布 | 表情图片 + */ + EMOJI_IMAGE("47", "石头剪刀布 | 表情图片"), + + /** + * 48-位置 + */ + POSITION("48", "位置"), + + /** + * 49-共享实时位置、文件、转账、链接 + */ + SHARE("49", "共享实时位置、文件、转账、链接"), + + /** + * 50-语音电话消息-VOIPMSG + */ + VOIP_MSG("50", "语音电话消息"), + + /** + * 51-微信初始化 + */ + WECHAT_INIT("51", "微信初始化"), + + /** + * 52-语音电话通知-VOIPNOTIFY + */ + VOIP_NOTIFY("52", "语音电话通知"), + + /** + * 53-语音电话邀请-VOIPINVITE + */ + VOIP_INVITE("53", "语音电话邀请"), + + /** + * 62-小视频 + */ + SMALL_VIDEO("62", "小视频"), + + /** + * 66-微信红包 + */ + WECHAT_RED_ENVELOPE("66", "微信红包"), + + /** + * 9999-系统通知-SYSNOTICE + */ + SYS_NOTICE("9999", "系统通知"), + + /** + * 10000-红包、系统消息 + */ + RED_ENVELOPE_SYS_NOTICE("10000", "红包、系统消息"), + + /** + * 10002-撤回消息 + */ + WITHDRAW_MSG("10002", "撤回消息"), + + /** + * 1048625-搜狗表情 + */ + SO_GOU_EMOJI("1048625", "搜狗表情"), + + /** + * 16777265-链接 + */ + LINK("16777265", "链接"), + + /** + * 436207665-微信红包 + */ + RED_ENVELOPE("436207665", "微信红包"), + + /** + * 536936497-红包封面 + */ + RED_ENVELOPE_COVER("536936497", "红包封面"), + + /** + * 754974769-视频号视频 + */ + VIDEO_NUMBER_VIDEO("754974769", "视频号视频"), + + /** + * 771751985-视频号名片 + */ + VIDEO_NUMBER_CARD("771751985", "视频号名片"), + + /** + * 822083633-引用消息 + */ + QUOTE_MSG("822083633", "引用消息"), + + /** + * 922746929-拍一拍 + */ + PAT_ONE_PAT("922746929", "拍一拍"), + + /** + * 973078577-视频号直播 + */ + VIDEO_NUMBER_LIVE("973078577", "视频号直播"), + + /** + * 974127153-商品链接 + */ + PRODUCT_LINK("974127153", "商品链接"), + + /** + * 975175729-视频号直播-TODO + */ + UNKNOWN("975175729", "视频号直播"), + + /** + * 1040187441-音乐链接 + */ + MUSIC_LINK("1040187441", "音乐链接"), + + /** + * 1090519089-文件 + */ + FILE("1090519089", "文件"), + + /** + * 未匹配上 + */ + UN_MATCH("", null), + + // 结束 + ; + + private final String code; + private final String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WhetherEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WhetherEnum.java new file mode 100644 index 0000000..569d005 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WhetherEnum.java @@ -0,0 +1,39 @@ +package com.wechat.ferry.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 枚举-是否 + * + * @author chandler + * @date 2023/3/14 10:21 + */ +@Getter +@AllArgsConstructor +public enum WhetherEnum { + + /** + * 1-Y-是 + */ + YES("1", "是", "Y", true), + + /** + * 2-N-否 + */ + NO("2", "否", "N", false), + + /** + * 未匹配上 + */ + UN_MATCH("", null, null, null), + + // 结束 + ; + + private final String code; + private final String name; + private final String key; + private final Boolean bool; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java new file mode 100644 index 0000000..2c967ec --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java @@ -0,0 +1,65 @@ +package com.wechat.ferry.enums; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 枚举-微信联系人类型 + * + * @author chandler + * @date 2024/10/02 18:35 + */ +@Getter +@AllArgsConstructor +public enum WxContactsTypeEnum { + + /** + * 1-个微 + */ + PERSON("1", "个微", ""), + + /** + * 2-企微 + */ + WORK("2", "企微", "@openim"), + + /** + * 3-群组 + */ + GROUP("3", "群组", "@chatroom"), + + /** + * 4-公众号 + */ + OFFICIAL_ACCOUNT("4", "公众号", "gh_"), + + /** + * 未匹配上 + */ + UN_MATCH("", null, null), + + // 结束 + ; + + private final String code; + private final String name; + private final String affix; + + /** + * map集合 key:code val:枚举 + */ + public static final Map codeMap = + Arrays.stream(values()).collect(Collectors.toMap(WxContactsTypeEnum::getCode, v -> v)); + + /** + * 根据code获取枚举 + */ + public static WxContactsTypeEnum getCodeMap(String code) { + return codeMap.getOrDefault(code, UN_MATCH); + } + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java index 8511d27..562faef 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java @@ -10,20 +10,20 @@ import java.util.concurrent.BlockingQueue; import com.alibaba.fastjson2.JSONObject; import com.sun.jna.Native; -import com.wechat.ferry.entity.dto.WxMsgDTO; -import com.wechat.ferry.entity.po.Wcf; -import com.wechat.ferry.entity.po.Wcf.DbQuery; -import com.wechat.ferry.entity.po.Wcf.DbRow; -import com.wechat.ferry.entity.po.Wcf.DbTable; -import com.wechat.ferry.entity.po.Wcf.DecPath; -import com.wechat.ferry.entity.po.Wcf.Functions; -import com.wechat.ferry.entity.po.Wcf.MemberMgmt; -import com.wechat.ferry.entity.po.Wcf.Request; -import com.wechat.ferry.entity.po.Wcf.Response; -import com.wechat.ferry.entity.po.Wcf.RpcContact; -import com.wechat.ferry.entity.po.Wcf.UserInfo; -import com.wechat.ferry.entity.po.Wcf.Verification; -import com.wechat.ferry.entity.po.Wcf.WxMsg; +import com.wechat.ferry.entity.dto.WxPpMsgDTO; +import com.wechat.ferry.entity.proto.Wcf; +import com.wechat.ferry.entity.proto.Wcf.DbQuery; +import com.wechat.ferry.entity.proto.Wcf.DbRow; +import com.wechat.ferry.entity.proto.Wcf.DbTable; +import com.wechat.ferry.entity.proto.Wcf.DecPath; +import com.wechat.ferry.entity.proto.Wcf.Functions; +import com.wechat.ferry.entity.proto.Wcf.MemberMgmt; +import com.wechat.ferry.entity.proto.Wcf.Request; +import com.wechat.ferry.entity.proto.Wcf.Response; +import com.wechat.ferry.entity.proto.Wcf.RpcContact; +import com.wechat.ferry.entity.proto.Wcf.UserInfo; +import com.wechat.ferry.entity.proto.Wcf.Verification; +import com.wechat.ferry.entity.proto.Wcf.WxMsg; import com.wechat.ferry.enums.SexEnum; import com.wechat.ferry.service.SDK; import com.wechat.ferry.utils.HttpClientUtil; @@ -118,7 +118,7 @@ public class WeChatSocketClient { })); } - private Response sendCmd(Request req) { + public Response sendCmd(Request req) { try { ByteBuffer bb = ByteBuffer.wrap(req.toByteArray()); cmdSocket.send(bb); @@ -528,7 +528,7 @@ public class WeChatSocketClient { } public void printWxMsg(WxMsg msg) { - WxMsgDTO dto = new WxMsgDTO(); + WxPpMsgDTO dto = new WxPpMsgDTO(); dto.setIsSelf(msg.getIsSelf()); dto.setIsGroup(msg.getIsGroup()); dto.setId(msg.getId()); @@ -561,19 +561,24 @@ public class WeChatSocketClient { } public void forwardMsg(WxMsg msg, String url) { - WxMsgDTO dto = new WxMsgDTO(); + String xml = msg.getXml(); + xml = xml.replaceAll(">[\\s\\p{Zs}]*<", "><"); + String content = msg.getContent(); + content = content.replaceAll(">[\\s\\p{Zs}]*<", "><"); + + WxPpMsgDTO dto = new WxPpMsgDTO(); dto.setIsSelf(msg.getIsSelf()); dto.setIsGroup(msg.getIsGroup()); dto.setId(msg.getId()); dto.setType(msg.getType()); dto.setTs(msg.getTs()); dto.setRoomId(msg.getRoomid()); - dto.setContent(msg.getContent()); + dto.setContent(content); dto.setSender(msg.getSender()); dto.setSign(msg.getSign()); dto.setThumb(msg.getThumb()); dto.setExtra(msg.getExtra()); - dto.setXml(msg.getXml().replace("\n", "").replace("\t", "")); + dto.setXml(xml); String jsonString = JSONObject.toJSONString(dto); try { diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java index 3d78c7d..1e2fa50 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java @@ -1,5 +1,25 @@ package com.wechat.ferry.service; +import java.util.List; + +import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; + /** * 业务接口-对接原本DLL的接口 * @@ -8,4 +28,144 @@ package com.wechat.ferry.service; */ public interface WeChatDllService { + /** + * 当前微信客户端是否登录微信号 + * + * @return true-已登录 false-未登录 + * + * @author chandler + * @date 2024-10-01 21:20 + */ + Boolean loginStatus(); + + /** + * 获得微信客户端登录的微信ID + * + * @return 微信ID + * + * @author chandler + * @date 2024-10-01 21:22 + */ + String queryLoginWeChatId(); + + /** + * 获取所有消息类型 + * + * @return 消息类型列表 + * + * @author chandler + * @date 2024-10-01 21:22 + */ + List queryMsgTypeList(); + + /** + * 获取所有联系人 + * + * @return 联系人列表 + * + * @author chandler + * @date 2024-10-02 16:59 + */ + List queryContactsList(); + + /** + * 获取可查询数据库 + * + * @param request 请求入参 + * @return 数据库记录 + * + * @author chandler + * @date 2024-10-02 17:52 + */ + List queryDatabaseSql(WxPpDatabaseSqlReq request); + + /** + * 获取数据库所有表名称 + * + * @return 数据库名称列表 + * + * @author chandler + * @date 2024-10-02 17:53 + */ + List queryDatabaseAllTableName(); + + /** + * 获取数据库表 + * + * @param request 请求入参 + * @return 数据库记录 + * + * @author chandler + * @date 2024-10-02 17:52 + */ + List queryDatabaseTable(WxPpDatabaseTableReq request); + + /** + * 查询群成员 + * + * @param request 请求入参 + * @return 数据库记录 + * + * @author chandler + * @date 2024-10-02 20:59 + */ + List queryGroupMember(WxPpGroupMemberReq request); + + /** + * 发送文本消息(可 @) + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @example sendText(" Hello @ 某人1 @ 某人2 ", " xxxxxxxx @ chatroom ", "wxid_xxxxxxxxxxxxx1,wxid_xxxxxxxxxxxxx2"); + * + * @author chandler + * @date 2024-10-02 20:40 + */ + WxPpSendTextMsgResp sendTextMsg(WxPpSendTextMsgReq request); + + /** + * 发送图片消息 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-04 23:06 + */ + WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request); + + /** + * 发送文件消息 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-04 23:15 + */ + WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request); + + /** + * 发送卡片消息 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-04 23:15 + */ + WxPpSendCardMsgResp sendCardMsg(WxPpSendCardMsgReq request); + + /** + * 发送表情消息 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-04 23:29 + */ + WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request); + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index f0f1305..53d34ce 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -1,7 +1,43 @@ package com.wechat.ferry.service.impl; -import org.springframework.stereotype.Service; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; + +import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; +import com.wechat.ferry.entity.proto.Wcf; +import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpDatabaseFieldResp; +import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; +import com.wechat.ferry.enums.SexEnum; +import com.wechat.ferry.enums.WxContactsTypeEnum; +import com.wechat.ferry.handle.WeChatSocketClient; import com.wechat.ferry.service.WeChatDllService; import lombok.extern.slf4j.Slf4j; @@ -16,4 +52,302 @@ import lombok.extern.slf4j.Slf4j; @Service public class WeChatDllServiceImpl implements WeChatDllService { + private WeChatSocketClient wechatSocketClient; + + @Autowired + public void setWechatSocketClient(WeChatSocketClient wechatSocketClient) { + this.wechatSocketClient = wechatSocketClient; + } + + @Override + public Boolean loginStatus() { + Boolean status = wechatSocketClient.isLogin(); + log.info("[查询]-[登录状态]-status:{}", status); + return status; + } + + @Override + public String queryLoginWeChatId() { + String weChatNo = wechatSocketClient.getSelfWxId(); + log.info("[查询]-[登录微信编号]-weChatNo:{}", weChatNo); + return weChatNo; + } + + @Override + public List queryMsgTypeList() { + List list = new ArrayList<>(); + Map msgTypeMap = wechatSocketClient.getMsgTypes(); + if (!CollectionUtils.isEmpty(msgTypeMap)) { + WxPpMsgTypeResp resp; + for (Map.Entry entry : msgTypeMap.entrySet()) { + resp = new WxPpMsgTypeResp(); + resp.setId(entry.getKey()); + resp.setName(entry.getValue()); + list.add(resp); + } + } + log.info("[查询]-[所消息类型]-共查到:{}条", list.size()); + return list; + } + + @Override + public List queryContactsList() { + List list = new ArrayList<>(); + List rpcContactList = wechatSocketClient.getContacts(); + if (!CollectionUtils.isEmpty(rpcContactList)) { + for (Wcf.RpcContact rpcContact : rpcContactList) { + WxPpContactsResp vo = new WxPpContactsResp(); + vo.setWeChatNo(rpcContact.getWxid()); + vo.setWeChatCode(rpcContact.getCode()); + vo.setRemark(rpcContact.getRemark()); + vo.setNickName(rpcContact.getName()); + if (!ObjectUtils.isEmpty(rpcContact.getCountry())) { + vo.setCountryPinyin(rpcContact.getCountry()); + if ("CN".equals(rpcContact.getCountry())) { + vo.setCountry("中国"); + } + } + if (!ObjectUtils.isEmpty(rpcContact.getProvince())) { + vo.setProvincePinyin(rpcContact.getProvince()); + vo.setProvince(null); + } + if (!ObjectUtils.isEmpty(rpcContact.getCity())) { + vo.setCityPinyin(rpcContact.getCity()); + vo.setCity(null); + } + // 性别处理 + if (!ObjectUtils.isEmpty(rpcContact.getGender())) { + vo.setSex(SexEnum.getCodeMap(String.valueOf(rpcContact.getGender())).getCode()); + vo.setSexLabel(SexEnum.getCodeMap(String.valueOf(rpcContact.getGender())).getName()); + } + // 是否为企业微信 + if (!ObjectUtils.isEmpty(rpcContact.getWxid())) { + if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.WORK.getAffix())) { + vo.setType(WxContactsTypeEnum.WORK.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.WORK.getName()); + } else if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.GROUP.getAffix())) { + vo.setType(WxContactsTypeEnum.GROUP.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.GROUP.getName()); + } else if (rpcContact.getWxid().startsWith(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getAffix())) { + vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); + } else { + vo.setType(WxContactsTypeEnum.PERSON.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.PERSON.getName()); + } + } + list.add(vo); + } + } + log.info("[查询]-[联系人]-共查到:{}条", list.size()); + return list; + } + + @Override + public List queryDatabaseSql(WxPpDatabaseSqlReq request) { + List list = new ArrayList<>(); + List wcfList = wechatSocketClient.querySql(request.getDatabaseName(), request.getSqlText()); + if (!CollectionUtils.isEmpty(wcfList)) { + // List> result = new ArrayList<>(); + // // 获取指定的行 + // for (Wcf.DbRow row : wcfList) { + // Map rowMap = new HashMap<>(); + // // 遍历每一列 + // for (Wcf.DbField field : row.getFieldsList()) { + // ByteString content = field.getContent(); + // String column = field.getColumn(); + // int type = field.getType(); + // rowMap.put(column, converterSqlVal(type, content)); + // } + // result.add(rowMap); + // } + + for (Wcf.DbRow dbRow : wcfList) { + WxPpDatabaseRowResp rowVo = new WxPpDatabaseRowResp(); + List fieldVoList = new ArrayList<>(); + for (Wcf.DbField dbField : dbRow.getFieldsList()) { + WxPpDatabaseFieldResp fieldVo = new WxPpDatabaseFieldResp(); + fieldVo.setType(String.valueOf(dbField.getType())); + fieldVo.setColumn(dbField.getColumn()); + String value = (String)converterSqlVal(dbField.getType(), dbField.getContent()); + fieldVo.setValue(value); + fieldVoList.add(fieldVo); + } + rowVo.setFieldList(fieldVoList); + list.add(rowVo); + } + } + log.info("[查询]-[联系人]-wcfList:{}", wcfList); + return list; + } + + @Override + public List queryDatabaseAllTableName() { + List list = wechatSocketClient.getDbNames(); + log.info("[查询]-[数据库名称列表]-共查到:{}条", list.size()); + return list; + } + + @Override + public List queryDatabaseTable(WxPpDatabaseTableReq request) { + log.info("[查询]-[查询表]-request:{}", request); + Map wcfMap = wechatSocketClient.getDbTables(request.getDatabaseName()); + + log.info("[查询]-[查询表]-查到:{}", wcfMap); + return Collections.emptyList(); + } + + @Override + public List queryGroupMember(WxPpGroupMemberReq request) { + List list = new ArrayList<>(); + // 查询群成员 + List wcfList = new ArrayList<>(); + if (!ObjectUtils.isEmpty(request.getGroupNo())) { + wcfList = + wechatSocketClient.querySql("MicroMsg.db", "SELECT RoomData FROM ChatRoom WHERE ChatRoomName = '" + request.getGroupNo() + "';"); + } + // 查询联系人 + List dbList = wechatSocketClient.querySql("MicroMsg.db", "SELECT UserName, NickName, Type FROM Contact;"); + Map dbMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(dbList)) { + for (Wcf.DbRow dbRow : dbList) { + List dbFieldList = dbRow.getFieldsList(); + if (!ObjectUtils.isEmpty(dbFieldList)) { + WxPpGroupMemberResp vo = new WxPpGroupMemberResp(); + for (Wcf.DbField dbField : dbFieldList) { + if ("UserName".equals(dbField.getColumn())) { + vo = new WxPpGroupMemberResp(); + String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); + vo.setWeChatNo(content); + } + if ("NickName".equals(dbField.getColumn())) { + String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); + vo.setNickName(content); + dbMap.put(vo.getWeChatNo(), vo.getNickName()); + } + } + } + } + } + + // 查询群名称 + if (!CollectionUtils.isEmpty(wcfList)) { + for (Wcf.DbRow dbRow : wcfList) { + List dbFieldList = dbRow.getFieldsList(); + if (!ObjectUtils.isEmpty(dbFieldList)) { + WxPpGroupMemberResp vo = new WxPpGroupMemberResp(); + for (Wcf.DbField dbField : dbFieldList) { + if ("RoomData".equals(dbField.getColumn())) { + try { + byte[] roomDataBytes = dbField.getContent().toByteArray(); + Wcf.RoomData roomData = Wcf.RoomData.parseFrom(roomDataBytes); + for (Wcf.RoomData.RoomMember member : roomData.getMembersList()) { + vo = new WxPpGroupMemberResp(); + vo.setWeChatNo(member.getWxid()); + String nickName = member.getName(); + if (ObjectUtils.isEmpty(nickName)) { + // 如果没有设置群昵称则默认为微信名称 + nickName = dbMap.get(member.getWxid()); + } + vo.setNickName(nickName); + vo.setState(String.valueOf(member.getState())); + list.add(vo); + } + } catch (InvalidProtocolBufferException e) { + log.error("异常:", e); + } + } + } + } + } + } + log.info("[查询]-[查询群成员]-共查到:{}条", list.size()); + return list; + } + + @Override + public WxPpSendTextMsgResp sendTextMsg(WxPpSendTextMsgReq request) { + log.info("[发送消息]-[文本消息]-入参打印:{}", request); + String atUser = ""; + if (request.getIsAtAll()) { + // 艾特全体,仅管理员有效 + atUser = "@all"; + } else { + // 处理艾特的人员 + if (!CollectionUtils.isEmpty(request.getAtUsers())) { + atUser = String.join(",", request.getAtUsers()); + } + } + int state = wechatSocketClient.sendText(request.getMsgText(), request.getRecipient(), atUser); + log.info("[发送消息]-[文本消息]-处理结束"); + return null; + } + + @Override + public WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request) { + int state = wechatSocketClient.sendImage(request.getPath(), request.getRecipient()); + return null; + } + + @Override + public WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request) { + int state = wechatSocketClient.sendFile(request.getPath(), request.getRecipient()); + return null; + } + + @Override + public WxPpSendCardMsgResp sendCardMsg(WxPpSendCardMsgReq request) { + int state = wechatSocketClient.sendXml(request.getRecipient(), request.getXml(), request.getPath(), request.getType()); + return null; + } + + @Override + public WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request) { + int state = wechatSocketClient.sendEmotion(request.getPath(), request.getRecipient()); + return null; + } + + public Function getSqlType(int type) { + Map> sqlTypeMap = new HashMap<>(); + // 初始化SQL_TYPES 根据类型执行不同的Func + sqlTypeMap.put(1, bytes -> ByteBuffer.wrap(bytes).getInt()); + sqlTypeMap.put(2, bytes -> ByteBuffer.wrap(bytes).getFloat()); + sqlTypeMap.put(3, bytes -> new String(bytes, StandardCharsets.UTF_8)); + sqlTypeMap.put(4, bytes -> bytes); + sqlTypeMap.put(5, bytes -> null); + return sqlTypeMap.get(type); + } + + public Object converterSqlVal(int type, ByteString content) { + // 根据每一列的类型转换 + Function converter = getSqlType(type); + if (converter != null) { + return converter.apply(content.toByteArray()); + } else { + log.warn("未知的SQL类型: {}", type); + return content.toByteArray(); + } + } + + /** + * 转换艾特用户 + * + * @param groupNo 群组编号 + * @param atUsers 艾特的用户(名称/微信编号) + * @return 组装后的艾特用户 + * + * @author chandler + * @date 2024-10-03 11:35 + */ + public String dealAtUser(String groupNo, List atUsers) { + String atUserStr = ""; + if (!CollectionUtils.isEmpty(atUsers)) { + // 取出要艾特的用户 + for (String atUser : atUsers) { + + } + } + return atUserStr; + } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index 8adb139..1788b60 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -1,10 +1,19 @@ package com.wechat.ferry.service.impl; +import javax.annotation.Resource; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import com.alibaba.fastjson2.JSON; -import com.wechat.ferry.entity.dto.WxMsgDTO; +import com.alibaba.fastjson2.JSONObject; +import com.wechat.ferry.config.WeChatFerryProperties; +import com.wechat.ferry.entity.dto.WxPpMsgDTO; +import com.wechat.ferry.service.WeChatDllService; import com.wechat.ferry.service.WeChatMsgService; +import com.wechat.ferry.utils.HttpClientUtil; import lombok.extern.slf4j.Slf4j; @@ -18,12 +27,66 @@ import lombok.extern.slf4j.Slf4j; @Service public class WeChatMsgServiceImpl implements WeChatMsgService { + private WeChatDllService weChatDllService; + + @Autowired + public void setWeChatDllService(WeChatDllService weChatDllService) { + this.weChatDllService = weChatDllService; + } + + @Resource + private WeChatFerryProperties weChatFerryProperties; + @Override public void receiveMsg(String jsonString) { + // 转发接口处理 + receiveMsgForward(jsonString); // 转为JSON对象 - WxMsgDTO dto = JSON.parseObject(jsonString, WxMsgDTO.class); - // TODO 这里可以拓展自己需要的功能 + WxPpMsgDTO dto = JSON.parseObject(jsonString, WxPpMsgDTO.class); + // 有开启的群聊配置 + if (!CollectionUtils.isEmpty(weChatFerryProperties.getOpenMsgGroups())) { + // 指定处理的群聊 + if (weChatFerryProperties.getOpenMsgGroups().contains(dto.getRoomId())) { + // TODO 这里可以拓展自己需要的功能 + } + } log.debug("[收到消息]-[消息内容]-打印:{}", dto); } + private void receiveMsgForward(String jsonString) { + // 开启转发,且转发地址不为空 + if (weChatFerryProperties.getReceiveMsgFwdSwitch() && !CollectionUtils.isEmpty(weChatFerryProperties.getReceiveMsgFwdUrls())) { + for (String receiveMsgFwdUrl : weChatFerryProperties.getReceiveMsgFwdUrls()) { + if (!receiveMsgFwdUrl.startsWith("http")) { + continue; + } + try { + String responseStr = HttpClientUtil.doPostJson(receiveMsgFwdUrl, jsonString); + if (ObjectUtils.isEmpty(responseStr) || !JSONObject.parseObject(responseStr).getString("code").equals("200")) { + log.error("消息转发外部接口,获取响应状态失败!-URL:{}", receiveMsgFwdUrl); + } + log.debug("[接收消息]-[转发接收到的消息]-转发消息至:{}", receiveMsgFwdUrl); + } catch (Exception e) { + log.error("消息转发接口[{}]异常:", receiveMsgFwdUrl, e); + } + } + } + } + + private Boolean judgeSuccess(String responseStr) { + // 默认为通过 + boolean passFlag = false; + if (!ObjectUtils.isEmpty(responseStr)) { + JSONObject jSONObject = JSONObject.parseObject(responseStr); + if (!ObjectUtils.isEmpty(jSONObject)) { + if (!ObjectUtils.isEmpty(jSONObject.get("code"))) { + if (jSONObject.get("code").equals("200")) { + return true; + } + } + } + } + return passFlag; + } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java index b36f390..4883961 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileInputStream; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; +import java.nio.charset.StandardCharsets; import java.util.List; import org.dom4j.Attribute; @@ -16,27 +17,27 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; @Slf4j public class XmlJsonConvertUtil { - public static String readFile(String path) { - String str = ""; - try { - File file = new File(path); - FileInputStream fis = new FileInputStream(file); - FileChannel fc = fis.getChannel(); - ByteBuffer bb = ByteBuffer.allocate(new Long(file.length()).intValue()); - // fc向buffer中读入数据 - fc.read(bb); - bb.flip(); - str = new String(bb.array(), "UTF8"); - fc.close(); - fis.close(); - } catch (Exception e) { - log.error("异常:{} ", e.getMessage()); - } + private static final String DEFAULT_ATTRIBUTE_PREFIX = "_"; + private static final String DEFAULT_VALUE_PREFIX = "_text"; + + public static String readFile(String path) throws Exception { + File file = new File(path); + FileInputStream fis = new FileInputStream(file); + FileChannel fc = fis.getChannel(); + ByteBuffer bb = ByteBuffer.allocate(new Long(file.length()).intValue()); + // fc向buffer中读入数据 + fc.read(bb); + bb.flip(); + String str = new String(bb.array(), StandardCharsets.UTF_8); + fc.close(); + fis.close(); return str; + } /** @@ -44,15 +45,15 @@ public class XmlJsonConvertUtil { * * @param xmlStr * @return + * @throws DocumentException */ public static JSONObject xml2Json(String xmlStr) { JSONObject json = new JSONObject(); try { - xmlStr = xmlStr.replace("\\n", ""); Document doc = DocumentHelper.parseText(xmlStr); dom4j2Json(doc.getRootElement(), json); } catch (DocumentException e) { - log.error("异常:{} ", e.getMessage()); + log.error("转换失败:", e); } return json; } @@ -68,7 +69,7 @@ public class XmlJsonConvertUtil { for (Object o : element.attributes()) { Attribute attr = (Attribute)o; if (!isEmpty(attr.getValue())) { - json.put("@" + attr.getName(), attr.getValue()); + json.put(DEFAULT_ATTRIBUTE_PREFIX + attr.getName(), attr.getValue()); } } List chdEl = element.elements(); @@ -110,12 +111,25 @@ public class XmlJsonConvertUtil { for (Object o : element.attributes()) { Attribute attr = (Attribute)o; if (!isEmpty(attr.getValue())) { - json.put("@" + attr.getName(), attr.getValue()); + json.put(DEFAULT_ATTRIBUTE_PREFIX + attr.getName(), attr.getValue()); } } + // 判断是否包含属性 + // if (!CollectionUtils.isEmpty(e.attributes())) { + // for (Object o : e.attributes()) { + // Attribute attr = (Attribute)o; + // if (!isEmpty(attr.getValue())) { + // json.put(DEFAULT_ATTRIBUTE_PREFIX + attr.getName(), attr.getValue()); + // } + // if (!e.getText().isEmpty()) { + // json.put(DEFAULT_VALUE_PREFIX, e.getText()); + // } + // } + // } else { if (!e.getText().isEmpty()) { json.put(e.getName(), e.getText()); } + // } } } } @@ -127,4 +141,15 @@ public class XmlJsonConvertUtil { return false; } + public static void main(String[] args) { + String xml = ""; + + log.info("xml格式化前:{}", xml); + xml = xml.replaceAll(">[\\s\\p{Zs}]*<","><"); + log.info("xml格式化后:{}", xml); + JSONObject json = xml2Json(xml); + System.out.println("xml2Json:" + json.toJSONString()); + + } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml index 1a71650..7069d10 100644 --- a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml +++ b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml @@ -14,6 +14,15 @@ spring: mvc: pathmatch: matching-strategy: ant_path_matcher + # 打成jar包必须添加如下配置才能找到页面 + thymeleaf: + mode: HTML + cache: false + prefix: classpath:/templates + +# 日志配置 +logging: + config: classpath:logback-spring.xml # 本服务参数 wechat: @@ -22,3 +31,21 @@ wechat: dll-path: E:\WeChatFerry\clients\java\wechat-ferry-mvn\dll\sdk.dll # socket端口 socket-port: 10086 + # 需要开启消息处理的群 + open-msg-groups: + - 53257911728@chatroom + # 接收消息转发开关 + receive-msg-fwd-switch: false + # 接收消息转发URL + receive-msg-fwd-urls: + - http:// + # 发送消息前转发开关 + send-msg-front-fwd-switch: false + # 发送消息前转发URL + send-msg-front-fwd-urls: + - http:// + # 发送消息后转发开关 + send-msg-back-fwd-switch: false + # 发送消息后转发URL + send-msg-back-fwd-urls: + - http:// \ No newline at end of file diff --git a/clients/java/wechat-ferry-mvn/src/main/resources/proto/wcf.proto b/clients/java/wechat-ferry-mvn/src/main/resources/proto/wcf.proto index 84b1767..0e138e7 100644 --- a/clients/java/wechat-ferry-mvn/src/main/resources/proto/wcf.proto +++ b/clients/java/wechat-ferry-mvn/src/main/resources/proto/wcf.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package wcf; -option java_package = "com.wechat.ferry.entity.po"; +option java_package = "com.wechat.ferry.entity.proto"; enum Functions { FUNC_RESERVED = 0x00; @@ -234,3 +234,21 @@ message ForwardMsg uint64 id = 1 [ jstype = JS_STRING ]; // 待转发消息 ID string receiver = 2; // 转发接收目标,群为 roomId,个人为 wxid } + +// RoomData内部转换 +message RoomData { + repeated RoomMember members = 1; + int32 field_2 = 2; + int32 field_3 = 3; + int32 field_4 = 4; + int32 room_capacity = 5; + int32 field_6 = 6; + int64 field_7 = 7; + int64 field_8 = 8; + + message RoomMember { + string wxid = 1; + string name = 2; + int32 state = 3; + } +} \ No newline at end of file From adcc05dc7c7ec0b78ef9e5ca9f0a92f316d26d6a Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Sat, 5 Oct 2024 15:36:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-1.?= =?UTF-8?q?=E5=AF=B9=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=B8=BA49?= =?UTF-8?q?=E7=9A=84XML=E8=BF=9B=E8=A1=8C=E8=A7=A3=E6=9E=90=E8=BD=ACJSON?= =?UTF-8?q?=202.=E8=B0=83=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=86=B3=E5=AE=9A=E6=88=90=E5=8A=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ferry/config/WeChatFerryProperties.java | 6 +++ .../wechat/ferry/entity/dto/WxPpMsgDTO.java | 18 +++++++ .../vo/response/WxPpSendImageMsgResp.java | 26 ++++++--- .../wechat/ferry/enums/WeChatMsgTypeEnum.java | 32 ----------- .../wechat/ferry/enums/WxPpMsgTypeEnum.java | 53 +++++++++++++++++++ .../ferry/handle/WeChatSocketClient.java | 29 +++++++++- .../service/impl/WeChatDllServiceImpl.java | 1 + .../service/impl/WeChatMsgServiceImpl.java | 18 ++++--- .../ferry/utils/XmlJsonConvertUtil.java | 14 +++-- .../src/main/resources/application.yml | 10 ++-- 10 files changed, 155 insertions(+), 52 deletions(-) delete mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WeChatMsgTypeEnum.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxPpMsgTypeEnum.java diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java index 74dc78d..e70cd8e 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java @@ -1,6 +1,7 @@ package com.wechat.ferry.config; import java.util.List; +import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -63,4 +64,9 @@ public class WeChatFerryProperties { */ private List sendMsgBackFwdUrls; + /** + * 调用第三方服务客户端成功状态码 + */ + private Map thirdPartyOkCodes; + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java index 457327f..b30515a 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/dto/WxPpMsgDTO.java @@ -1,5 +1,8 @@ package com.wechat.ferry.entity.dto; +import com.alibaba.fastjson2.JSONObject; +import com.fasterxml.jackson.annotation.JsonIgnore; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -54,6 +57,21 @@ public class WxPpMsgDTO { @ApiModelProperty(value = "消息内容") private String content; + /** + * 转为JSON的内容 + * 对应DLL中的content原始内容 + */ + @ApiModelProperty(value = "转为JSON的内容") + private JSONObject jsonContent; + + /** + * 引用内容 + * 对应DLL中的content原始内容 + */ + @JsonIgnore + @ApiModelProperty(value = "消息内容XML") + private String quoteContent; + /** * 消息发送者 */ diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java index 522b19c..a0e62e6 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java @@ -15,15 +15,29 @@ import lombok.Data; public class WxPpSendImageMsgResp { /** - * 类型编号 + * 状态码 */ - @ApiModelProperty(value = "类型编号") - private Integer id; + @ApiModelProperty(value = "状态码") + private String code; /** - * 类型名称 + * 返回信息 */ - @ApiModelProperty(value = "类型名称") - private String name; + @ApiModelProperty(value = "返回信息") + private String msg; + + /** + * 图片地址 + */ + @ApiModelProperty(value = "图片地址") + private String path; + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WeChatMsgTypeEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WeChatMsgTypeEnum.java deleted file mode 100644 index ee3b9a8..0000000 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WeChatMsgTypeEnum.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.wechat.ferry.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 枚举-消息类型 - * - * @author chandler - * @date 2024/10/01 15:55 - */ -@Getter -@AllArgsConstructor -public enum WeChatMsgTypeEnum { - - /** - * 0-未知 - */ - UNKNOWN("0", "未知"), - - /** - * 未匹配上 - */ - UN_MATCH("", null), - - // 结束 - ; - - private final String code; - private final String name; - -} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxPpMsgTypeEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxPpMsgTypeEnum.java new file mode 100644 index 0000000..32cbbf4 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxPpMsgTypeEnum.java @@ -0,0 +1,53 @@ +package com.wechat.ferry.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 枚举-本服务定义消息类型 + * + * @author chandler + * @date 2024/10/01 15:55 + */ +@Getter +@AllArgsConstructor +public enum WxPpMsgTypeEnum { + + /** + * 0-未知 + */ + UNKNOWN("0", "未知", "文本"), + + /** + * 1-文本 + */ + TEXT("1", "文本", "文本"), + + /** + * 2-表情符号 + */ + EMOJI("2", "表情符号", "1"), + + /** + * 3-表情包(表情图片) + */ + EMOJI_IMAGE("3", "表情包(表情图片)", "47"), + + /** + * 4-引用消息 + */ + QUOTE("4", "引用消息", "49"), + + /** + * 未匹配上 + */ + UN_MATCH("", null, "文本"), + + // 结束 + ; + + private final String code; + private final String name; + private final String dllCode; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java index 562faef..4878c3c 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/handle/WeChatSocketClient.java @@ -8,6 +8,8 @@ import java.util.Map; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; +import org.springframework.util.ObjectUtils; + import com.alibaba.fastjson2.JSONObject; import com.sun.jna.Native; import com.wechat.ferry.entity.dto.WxPpMsgDTO; @@ -27,6 +29,7 @@ import com.wechat.ferry.entity.proto.Wcf.WxMsg; import com.wechat.ferry.enums.SexEnum; import com.wechat.ferry.service.SDK; import com.wechat.ferry.utils.HttpClientUtil; +import com.wechat.ferry.utils.XmlJsonConvertUtil; import io.sisu.nng.Socket; import io.sisu.nng.pair.Pair1Socket; @@ -573,12 +576,36 @@ public class WeChatSocketClient { dto.setType(msg.getType()); dto.setTs(msg.getTs()); dto.setRoomId(msg.getRoomid()); - dto.setContent(content); dto.setSender(msg.getSender()); dto.setSign(msg.getSign()); dto.setThumb(msg.getThumb()); dto.setExtra(msg.getExtra()); dto.setXml(xml); + // 根据消息类型判断 引用-49 + if (!ObjectUtils.isEmpty(msg.getContent()) && "49".equals("" + msg.getType())) { + try { + dto.setQuoteContent(content); + JSONObject json = XmlJsonConvertUtil.xml2Json(content); + // 获取第一层级的JSONObject + JSONObject level1 = json.getJSONObject("msg"); + if (!ObjectUtils.isEmpty(level1)) { + // 获取第二层级的JSONObject + JSONObject level2 = level1.getJSONObject("appmsg"); + if (!ObjectUtils.isEmpty(level2)) { + // 获取field字段的值 + String fieldValue = level2.getString("title"); + dto.setContent(fieldValue); + } + } + dto.setJsonContent(json); + } catch (Exception e) { + log.error("XML提取报错:", e); + // 报错就使用原值 + dto.setContent(content); + } + } else { + dto.setContent(content); + } String jsonString = JSONObject.toJSONString(dto); try { diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 53d34ce..a8f49f8 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -285,6 +285,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { @Override public WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request) { + WxPpSendImageMsgResp resp = new WxPpSendImageMsgResp(); int state = wechatSocketClient.sendImage(request.getPath(), request.getRecipient()); return null; } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index 1788b60..a615eb1 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -1,5 +1,7 @@ package com.wechat.ferry.service.impl; +import java.util.Map; + import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -62,12 +64,12 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { } try { String responseStr = HttpClientUtil.doPostJson(receiveMsgFwdUrl, jsonString); - if (ObjectUtils.isEmpty(responseStr) || !JSONObject.parseObject(responseStr).getString("code").equals("200")) { - log.error("消息转发外部接口,获取响应状态失败!-URL:{}", receiveMsgFwdUrl); + if (judgeSuccess(responseStr)) { + log.error("[接收消息]-消息转发外部接口,获取响应状态失败!-URL:{}", receiveMsgFwdUrl); } log.debug("[接收消息]-[转发接收到的消息]-转发消息至:{}", receiveMsgFwdUrl); } catch (Exception e) { - log.error("消息转发接口[{}]异常:", receiveMsgFwdUrl, e); + log.error("[接收消息]-消息转发接口[{}]服务异常:", receiveMsgFwdUrl, e); } } } @@ -78,10 +80,12 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { boolean passFlag = false; if (!ObjectUtils.isEmpty(responseStr)) { JSONObject jSONObject = JSONObject.parseObject(responseStr); - if (!ObjectUtils.isEmpty(jSONObject)) { - if (!ObjectUtils.isEmpty(jSONObject.get("code"))) { - if (jSONObject.get("code").equals("200")) { - return true; + if (!ObjectUtils.isEmpty(jSONObject) && !CollectionUtils.isEmpty(weChatFerryProperties.getThirdPartyOkCodes())) { + Map codeMap = weChatFerryProperties.getThirdPartyOkCodes(); + for (Map.Entry entry : codeMap.entrySet()) { + if (!ObjectUtils.isEmpty(jSONObject.get(entry.getKey())) && jSONObject.get(entry.getKey()).equals(entry.getValue())) { + passFlag = true; + break; } } } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java index 4883961..2b40924 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/utils/XmlJsonConvertUtil.java @@ -12,12 +12,12 @@ import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.springframework.util.ObjectUtils; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.springframework.util.CollectionUtils; @Slf4j public class XmlJsonConvertUtil { @@ -52,6 +52,14 @@ public class XmlJsonConvertUtil { try { Document doc = DocumentHelper.parseText(xmlStr); dom4j2Json(doc.getRootElement(), json); + + // 存放根节点 + if (!ObjectUtils.isEmpty(json)) { + Element rootElement = doc.getRootElement(); + JSONObject wrapperJson = new JSONObject(); + wrapperJson.put(rootElement.getName(), json); + json = wrapperJson; + } } catch (DocumentException e) { log.error("转换失败:", e); } @@ -142,10 +150,10 @@ public class XmlJsonConvertUtil { } public static void main(String[] args) { - String xml = ""; + String xml = "就是个网页哇"; log.info("xml格式化前:{}", xml); - xml = xml.replaceAll(">[\\s\\p{Zs}]*<","><"); + xml = xml.replaceAll(">[\\s\\p{Zs}]*<", "><"); log.info("xml格式化后:{}", xml); JSONObject json = xml2Json(xml); System.out.println("xml2Json:" + json.toJSONString()); diff --git a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml index 7069d10..c809c49 100644 --- a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml +++ b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml @@ -38,14 +38,18 @@ wechat: receive-msg-fwd-switch: false # 接收消息转发URL receive-msg-fwd-urls: - - http:// + - http://localhost:9001/msg # 发送消息前转发开关 send-msg-front-fwd-switch: false # 发送消息前转发URL send-msg-front-fwd-urls: - - http:// + - http://localhost:9001/msg # 发送消息后转发开关 send-msg-back-fwd-switch: false # 发送消息后转发URL send-msg-back-fwd-urls: - - http:// \ No newline at end of file + - http://localhost:9001/msg + # 调用第三方服务客户端成功状态码 + third-party-ok-codes: + # key:状态码字段 val:状态码值 + code: '200' From 96e8fbea198e39ee0c87a5d87292d22c76115699 Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Sun, 6 Oct 2024 15:15:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wechat/ferry/WeChatFerryApplication.java | 2 + .../ferry/controller/WeChatDllController.java | 21 +++++----- .../entity/vo/response/WxPpContactsResp.java | 13 +++--- .../vo/response/WxPpGroupMemberResp.java | 7 ++-- .../entity/vo/response/WxPpLoginInfoResp.java | 42 +++++++++++++++++++ .../ferry/service/WeChatDllService.java | 17 ++++++-- .../service/impl/WeChatDllServiceImpl.java | 35 +++++++++++----- .../service/impl/WeChatMsgServiceImpl.java | 9 ++++ 8 files changed, 114 insertions(+), 32 deletions(-) create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/WeChatFerryApplication.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/WeChatFerryApplication.java index 671dfb2..ace8c66 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/WeChatFerryApplication.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/WeChatFerryApplication.java @@ -2,6 +2,7 @@ package com.wechat.ferry; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动类 @@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author chandler * @date 2024-09-21 12:19 */ +@EnableScheduling @SpringBootApplication public class WeChatFerryApplication { diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java index cef42d6..17ea687 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java @@ -14,17 +14,18 @@ import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; import com.wechat.ferry.enums.ResponseCodeEnum; @@ -60,18 +61,18 @@ public class WeChatDllController { return TResponse.ok(ResponseCodeEnum.SUCCESS, status); } - @ApiOperation(value = "获取登录微信号", notes = "queryLoginWeChatNo") - @PostMapping(value = "/loginWeChatNo") - public TResponse queryLoginWeChatNo() { - String weChatNo = weChatDllService.queryLoginWeChatId(); - return TResponse.ok(ResponseCodeEnum.SUCCESS, weChatNo); + @ApiOperation(value = "获取登录微信内部识别号UID", notes = "queryLoginWeChatUid") + @PostMapping(value = "/loginWeChatUid") + public TResponse queryLoginWeChatUid() { + String weChatUid = weChatDllService.queryLoginWeChatUid(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, weChatUid); } @ApiOperation(value = "获取登录微信信息", notes = "queryLoginWeChatInfo") @PostMapping(value = "/loginWeChatInfo") - public TResponse queryLoginWeChatInfo() { - - return TResponse.ok(ResponseCodeEnum.SUCCESS); + public TResponse queryLoginWeChatInfo() { + WxPpLoginInfoResp resp = weChatDllService.queryLoginWeChatInfo(); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "获取消息类型", notes = "queryMsgTypeList") diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java index 57fcdde..3f5e94f 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java @@ -15,16 +15,17 @@ import lombok.Data; public class WxPpContactsResp { /** - * 微信编号 + * 微信内部识别号UID + * 原始微信账号ID,以"wxid_"开头,初始默认的微信ID=微信号。 */ - @ApiModelProperty(value = "微信编号") - private String weChatNo; + @ApiModelProperty(value = "微信内部识别号UID") + private String weChatUid; /** - * 微信代码 + * 微信号 */ - @ApiModelProperty(value = "微信代码") - private String weChatCode; + @ApiModelProperty(value = "微信号") + private String weChatNo; /** * 备注 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java index 1da4324..e9768d4 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java @@ -15,10 +15,11 @@ import lombok.Data; public class WxPpGroupMemberResp { /** - * 微信编号 + * 微信内部识别号UID + * 原始微信账号ID,以"wxid_"开头,初始默认的微信ID=微信号。 */ - @ApiModelProperty(value = "微信编号") - private String weChatNo; + @ApiModelProperty(value = "微信内部识别号UID") + private String weChatUid; /** * 微信昵称 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java new file mode 100644 index 0000000..5a5e259 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java @@ -0,0 +1,42 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-登录个微信息 + * + * @author chandler + * @date 2024/10/05 22:53 + */ +@Data +@ApiModel(value = "wxPpLoginInfoResp", description = "登录个微信息查询请求出参") +public class WxPpLoginInfoResp { + + /** + * 微信内部识别号UID + * 原始微信账号ID,以"wxid_"开头,初始默认的微信ID=微信号。 + */ + @ApiModelProperty(value = "微信内部识别号UID") + private String weChatUid; + + /** + * name + */ + @ApiModelProperty(value = "name") + private String name; + + /** + * 手机号 + */ + @ApiModelProperty(value = "手机号") + private String phone; + + /** + * 文件/图片等父路径 + */ + @ApiModelProperty(value = "文件/图片等父路径") + private String homePath; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java index 1e2fa50..cd99993 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java @@ -13,6 +13,7 @@ import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; @@ -39,14 +40,24 @@ public interface WeChatDllService { Boolean loginStatus(); /** - * 获得微信客户端登录的微信ID + * 获取登录微信内部识别号UID * - * @return 微信ID + * @return 微信内部识别号UID * * @author chandler * @date 2024-10-01 21:22 */ - String queryLoginWeChatId(); + String queryLoginWeChatUid(); + + /** + * 获取登录微信信息 + * + * @return 当前登录微信信息 + * + * @author chandler + * @date 2024-10-05 22:54 + */ + WxPpLoginInfoResp queryLoginWeChatInfo(); /** * 获取所有消息类型 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index a8f49f8..2ec78e5 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -29,6 +29,7 @@ import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseFieldResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; @@ -67,10 +68,24 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public String queryLoginWeChatId() { - String weChatNo = wechatSocketClient.getSelfWxId(); - log.info("[查询]-[登录微信编号]-weChatNo:{}", weChatNo); - return weChatNo; + public String queryLoginWeChatUid() { + String weChatUid = wechatSocketClient.getSelfWxId(); + log.info("[查询]-[登录微信UID]-weChatUid:{}", weChatUid); + return weChatUid; + } + + @Override + public WxPpLoginInfoResp queryLoginWeChatInfo() { + WxPpLoginInfoResp resp = new WxPpLoginInfoResp(); + Wcf.UserInfo userInfo = wechatSocketClient.getUserInfo(); + if (!ObjectUtils.isEmpty(userInfo)) { + resp.setWeChatUid(userInfo.getWxid()); + resp.setName(userInfo.getName()); + resp.setPhone(userInfo.getMobile()); + resp.setHomePath(userInfo.getHome()); + } + log.info("[查询]-[获取登录微信信息]-resp:{}", resp); + return resp; } @Override @@ -86,7 +101,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { list.add(resp); } } - log.info("[查询]-[所消息类型]-共查到:{}条", list.size()); + log.info("[查询]-[所有消息类型]-共查到:{}条", list.size()); return list; } @@ -97,8 +112,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { if (!CollectionUtils.isEmpty(rpcContactList)) { for (Wcf.RpcContact rpcContact : rpcContactList) { WxPpContactsResp vo = new WxPpContactsResp(); - vo.setWeChatNo(rpcContact.getWxid()); - vo.setWeChatCode(rpcContact.getCode()); + vo.setWeChatUid(rpcContact.getWxid()); + vo.setWeChatNo(rpcContact.getCode()); vo.setRemark(rpcContact.getRemark()); vo.setNickName(rpcContact.getName()); if (!ObjectUtils.isEmpty(rpcContact.getCountry())) { @@ -218,12 +233,12 @@ public class WeChatDllServiceImpl implements WeChatDllService { if ("UserName".equals(dbField.getColumn())) { vo = new WxPpGroupMemberResp(); String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); - vo.setWeChatNo(content); + vo.setWeChatUid(content); } if ("NickName".equals(dbField.getColumn())) { String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); vo.setNickName(content); - dbMap.put(vo.getWeChatNo(), vo.getNickName()); + dbMap.put(vo.getWeChatUid(), vo.getNickName()); } } } @@ -243,7 +258,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { Wcf.RoomData roomData = Wcf.RoomData.parseFrom(roomDataBytes); for (Wcf.RoomData.RoomMember member : roomData.getMembersList()) { vo = new WxPpGroupMemberResp(); - vo.setWeChatNo(member.getWxid()); + vo.setWeChatUid(member.getWxid()); String nickName = member.getName(); if (ObjectUtils.isEmpty(nickName)) { // 如果没有设置群昵称则默认为微信名称 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index a615eb1..2211455 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -14,6 +14,7 @@ import com.alibaba.fastjson2.JSONObject; import com.wechat.ferry.config.WeChatFerryProperties; import com.wechat.ferry.entity.dto.WxPpMsgDTO; import com.wechat.ferry.service.WeChatDllService; +import com.wechat.ferry.service.WeChatExtService; import com.wechat.ferry.service.WeChatMsgService; import com.wechat.ferry.utils.HttpClientUtil; @@ -36,6 +37,13 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { this.weChatDllService = weChatDllService; } + private WeChatExtService weChatExtService; + + @Autowired + public void setWeChatExtService(WeChatExtService weChatExtService) { + this.weChatExtService = weChatExtService; + } + @Resource private WeChatFerryProperties weChatFerryProperties; @@ -50,6 +58,7 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { // 指定处理的群聊 if (weChatFerryProperties.getOpenMsgGroups().contains(dto.getRoomId())) { // TODO 这里可以拓展自己需要的功能 + weChatExtService.instructSign(dto); } } log.debug("[收到消息]-[消息内容]-打印:{}", dto); From 217b7fe63279148672a93958304963eb9bf3e370 Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Sun, 6 Oct 2024 17:57:34 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-1.?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=202.=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=85=A5=E5=8F=82=E5=AD=97=E6=AE=B5=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ferry/controller/WeChatDllController.java | 42 +++++++--- .../vo/request/WxPpPatOnePatMsgReq.java | 31 +++++++ .../entity/vo/request/WxPpSendCardMsgReq.java | 43 ---------- .../vo/request/WxPpSendEmojiMsgReq.java | 6 +- .../entity/vo/request/WxPpSendFileMsgReq.java | 6 +- .../vo/request/WxPpSendImageMsgReq.java | 8 +- .../vo/request/WxPpSendRichTextMsgReq.java | 61 ++++++++++++++ .../entity/vo/request/WxPpSendTextMsgReq.java | 1 + .../entity/vo/request/WxPpSendXmlMsgReq.java | 43 ++++++++++ .../vo/response/WxPpSendPatOnePatMsgResp.java | 29 +++++++ .../vo/response/WxPpSendRichTextMsgResp.java | 29 +++++++ ...rdMsgResp.java => WxPpSendXmlMsgResp.java} | 6 +- .../ferry/enums/WxContactsTypeEnum.java | 9 ++- .../ferry/service/WeChatDllService.java | 34 +++++++- .../service/impl/WeChatDllServiceImpl.java | 80 +++++++++++++++++-- .../service/impl/WeChatMsgServiceImpl.java | 18 ----- 16 files changed, 348 insertions(+), 98 deletions(-) create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java delete mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java create mode 100644 clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendCardMsgResp.java => WxPpSendXmlMsgResp.java} (82%) diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java index 17ea687..291807b 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java @@ -13,21 +13,25 @@ import com.wechat.ferry.entity.TResponse; import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; import com.wechat.ferry.enums.ResponseCodeEnum; import com.wechat.ferry.service.WeChatDllService; @@ -151,10 +155,10 @@ public class WeChatDllController { return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } - @ApiOperation(value = "发送卡片消息", notes = "sendCardMsg") - @PostMapping(value = "/send/cardMsg") - public TResponse sendCardMsg(@Validated @RequestBody WxPpSendCardMsgReq request) { - WxPpSendCardMsgResp resp = weChatDllService.sendCardMsg(request); + @ApiOperation(value = "发送XML消息", notes = "sendXmlMsg") + @PostMapping(value = "/send/xmlMsg") + public TResponse sendXmlMsg(@Validated @RequestBody WxPpSendXmlMsgReq request) { + WxPpSendXmlMsgResp resp = weChatDllService.sendXmlMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @@ -165,7 +169,21 @@ public class WeChatDllController { return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } - // @ApiOperation(value = "拍一拍群友", notes = "queryMsgTypeList") + @ApiOperation(value = "发送富文本消息", notes = "sendRichTextMsg") + @PostMapping(value = "/send/richTextMsg") + public TResponse sendRichTextMsg(@Validated @RequestBody WxPpSendRichTextMsgReq request) { + WxPpSendRichTextMsgResp resp = weChatDllService.sendRichTextMsg(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + @ApiOperation(value = "拍一拍群友", notes = "patOnePat") + @PostMapping(value = "/patOnePat") + public TResponse patOnePat(@Validated @RequestBody WxPpPatOnePatMsgReq request) { + WxPpSendPatOnePatMsgResp resp = weChatDllService.patOnePat(request); + return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); + } + + // @ApiOperation(value = "撤回消息", notes = "queryMsgTypeList") // @PostMapping(value = "/list/msgType") // public TResponse queryMsgTypeList() { // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); @@ -189,12 +207,14 @@ public class WeChatDllController { // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); // } // - // @ApiOperation(value = "查询数据库", notes = "queryMsgTypeList") + + // @ApiOperation(value = "通过好友申请", notes = "queryMsgTypeList") // @PostMapping(value = "/list/msgType") - // public TResponse queryMsgTypeList() { - // return TResponse.ok(ResponseCodeEnum.SUCCESS, list); + // public TResponse friendApply(@Validated @RequestBody WxPpPatOnePatMsgReq request) { + // // WxPpSendPatOnePatMsgResp resp = weChatDllService.patOnePat(request); + // return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); // } - // + // @ApiOperation(value = "获取朋友圈消息", notes = "queryMsgTypeList") // @PostMapping(value = "/list/msgType") // public TResponse queryMsgTypeList() { diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java new file mode 100644 index 0000000..83cd6a8 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java @@ -0,0 +1,31 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送拍一拍消息 + * + * @author chandler + * @date 2024-10-06 15:50 + */ +@Data +@ApiModel(value = "wxPpPatOnePatMsgReq", description = "个微发送拍一拍消息请求入参") +public class WxPpPatOnePatMsgReq { + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + + /** + * 要拍的wxid + */ + @ApiModelProperty(value = "要拍的wxid") + private String patUser; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java deleted file mode 100644 index a48446b..0000000 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendCardMsgReq.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.wechat.ferry.entity.vo.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 请求入参-个微发送卡片消息 - * - * @author chandler - * @date 2024-10-04 23:11 - */ -@Data -@ApiModel(value = "wxPpSendCardMsgReq", description = "个微发送卡片消息请求入参") -public class WxPpSendCardMsgReq { - - /** - * 消息接收人 - * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) - * 群聊为 roomid(xxxxxxxxxx@chatroom) - */ - @ApiModelProperty(value = "消息接收人") - private String recipient; - - /** - * XML报文 - */ - @ApiModelProperty(value = "XML报文") - private String xml; - - /** - * 路径 - */ - @ApiModelProperty(value = "路径") - private String path; - - /** - * 类型 - */ - @ApiModelProperty(value = "类型") - private Integer type; - -} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java index 1e05dd7..e3e6121 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java @@ -15,10 +15,10 @@ import lombok.Data; public class WxPpSendEmojiMsgReq { /** - * 路径 + * 资源路径-本地表情路径 */ - @ApiModelProperty(value = "路径") - private String path; + @ApiModelProperty(value = "资源路径-本地表情路径") + private String resourcePath; /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java index ffd622c..cb624a2 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java @@ -15,10 +15,10 @@ import lombok.Data; public class WxPpSendFileMsgReq { /** - * 图片地址 + * 资源路径-本地文件路径 */ - @ApiModelProperty(value = "图片地址") - private String path; + @ApiModelProperty(value = "资源路径-本地文件路径") + private String resourcePath; /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java index 2d2ad45..07d8b0b 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java @@ -15,10 +15,12 @@ import lombok.Data; public class WxPpSendImageMsgReq { /** - * 图片地址 + * 资源路径-本地图片地址 + * 如:`C:/Projs/WeChatRobot/TEQuant.jpeg` + * 或 `https://raw.githubusercontent.com/lich0821/WeChatFerry/master/assets/TEQuant.jpg` */ - @ApiModelProperty(value = "图片地址") - private String path; + @ApiModelProperty(value = "资源路径-本地图片地址") + private String resourcePath; /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java new file mode 100644 index 0000000..9c55f4f --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java @@ -0,0 +1,61 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送富文本消息 + * + * @author chandler + * @date 2024-10-06 15:40 + */ +@Data +@ApiModel(value = "wxPpSendRichTextMsgReq", description = "个微发送富文本消息请求入参") +public class WxPpSendRichTextMsgReq { + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + + /** + * 左下显示的名字 + */ + @ApiModelProperty(value = "左下显示的名字") + private String name; + + /** + * 填公众号id 可以显示对应的头像(gh_ 开头的) + */ + @ApiModelProperty(value = "资源路径-封面图片路径") + private String account; + + /** + * 标题,最多两行 + */ + @ApiModelProperty(value = "标题,最多两行") + private String title; + + /** + * 摘要,三行 + */ + @ApiModelProperty(value = "摘要,三行") + private String digest; + + /** + * 点击后跳转的链接 + */ + @ApiModelProperty(value = "点击后跳转的链接") + private String jumpUrl; + + /** + * 缩略图的链接 + */ + @ApiModelProperty(value = "缩略图的链接") + private String thumbnailUrl; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java index 7444045..d415150 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java @@ -19,6 +19,7 @@ public class WxPpSendTextMsgReq { /** * 消息文本 * 消息内容(如果是 @ 消息则需要有跟 @ 的人数量相同的 @) + * 换行使用 `\\\\n` (单杠) */ @ApiModelProperty(value = "消息文本") private String msgText; diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java new file mode 100644 index 0000000..ba1a24e --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java @@ -0,0 +1,43 @@ +package com.wechat.ferry.entity.vo.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求入参-个微发送XML消息 + * + * @author chandler + * @date 2024-10-04 23:11 + */ +@Data +@ApiModel(value = "wxPpSendXmlMsgReq", description = "个微发送XML消息请求入参") +public class WxPpSendXmlMsgReq { + + /** + * 消息接收人 + * 消息接收人,私聊为 wxid(wxid_xxxxxxxxxxxxxx) + * 群聊为 roomid(xxxxxxxxxx@chatroom) + */ + @ApiModelProperty(value = "消息接收人") + private String recipient; + + /** + * XML报文内容 + */ + @ApiModelProperty(value = "XML报文内容") + private String xmlContent; + + /** + * 资源路径-封面图片路径 + */ + @ApiModelProperty(value = "资源路径-封面图片路径") + private String resourcePath; + + /** + * xml类型,如:0x21 为小程序 + */ + @ApiModelProperty(value = "xml类型") + private Integer xmlType; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java new file mode 100644 index 0000000..2763186 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送拍一拍消息 + * + * @author chandler + * @date 2024/10/06 15:52 + */ +@Data +@ApiModel(value = "wxPpSendPatOnePatMsgResp", description = "个微发送拍一拍消息请求出参") +public class WxPpSendPatOnePatMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java new file mode 100644 index 0000000..4483954 --- /dev/null +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java @@ -0,0 +1,29 @@ +package com.wechat.ferry.entity.vo.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 请求出参-个微发送富文本消息 + * + * @author chandler + * @date 2024/10/06 15:46 + */ +@Data +@ApiModel(value = "wxPpSendRichTextMsgResp", description = "个微发送富文本消息请求出参") +public class WxPpSendRichTextMsgResp { + + /** + * 类型编号 + */ + @ApiModelProperty(value = "类型编号") + private Integer id; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String name; + +} diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java similarity index 82% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java index 8662801..1d76ef8 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendCardMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送卡片消息 + * 请求出参-个微发送XML消息 * * @author chandler * @date 2024/10/04 23:11 */ @Data -@ApiModel(value = "wxPpSendCardMsgResp", description = "个微发送卡片消息请求出参") -public class WxPpSendCardMsgResp { +@ApiModel(value = "wxPpSendCardMsgResp", description = "个微发送XML消息请求出参") +public class WxPpSendXmlMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java index 2c967ec..0a274f1 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/enums/WxContactsTypeEnum.java @@ -33,9 +33,14 @@ public enum WxContactsTypeEnum { GROUP("3", "群组", "@chatroom"), /** - * 4-公众号 + * 4-官方杂号 */ - OFFICIAL_ACCOUNT("4", "公众号", "gh_"), + OFFICIAL_MIXED_NO("4", "官方杂号", null), + + /** + * 5-公众号 + */ + OFFICIAL_ACCOUNT("5", "公众号", "gh_"), /** * 未匹配上 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java index cd99993..986b274 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java @@ -5,21 +5,25 @@ import java.util.List; import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; /** * 业务接口-对接原本DLL的接口 @@ -158,7 +162,7 @@ public interface WeChatDllService { WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request); /** - * 发送卡片消息 + * 发送XML消息 * * @param request 请求入参 * @return 消息发送返回 @@ -166,7 +170,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-04 23:15 */ - WxPpSendCardMsgResp sendCardMsg(WxPpSendCardMsgReq request); + WxPpSendXmlMsgResp sendXmlMsg(WxPpSendXmlMsgReq request); /** * 发送表情消息 @@ -179,4 +183,26 @@ public interface WeChatDllService { */ WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request); + /** + * 发送富文本消息 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-06 15:48 + */ + WxPpSendRichTextMsgResp sendRichTextMsg(WxPpSendRichTextMsgReq request); + + /** + * 拍一拍 + * + * @param request 请求入参 + * @return 消息发送返回 + * + * @author chandler + * @date 2024-10-06 15:54 + */ + WxPpSendPatOnePatMsgResp patOnePat(WxPpPatOnePatMsgReq request); + } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 2ec78e5..6030203 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -20,22 +20,26 @@ import com.wechat.ferry.entity.proto.Wcf; import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpSendCardMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; import com.wechat.ferry.entity.vo.response.WxPpContactsResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseFieldResp; import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendCardMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; import com.wechat.ferry.enums.SexEnum; import com.wechat.ferry.enums.WxContactsTypeEnum; import com.wechat.ferry.handle.WeChatSocketClient; @@ -135,18 +139,59 @@ public class WeChatDllServiceImpl implements WeChatDllService { vo.setSex(SexEnum.getCodeMap(String.valueOf(rpcContact.getGender())).getCode()); vo.setSexLabel(SexEnum.getCodeMap(String.valueOf(rpcContact.getGender())).getName()); } - // 是否为企业微信 + // 微信类型 if (!ObjectUtils.isEmpty(rpcContact.getWxid())) { + List mixedNoList = new ArrayList<>(); + // 朋友推荐消息 + mixedNoList.add("fmessage"); + // 语音记事本 + mixedNoList.add("medianote"); + // 漂流瓶 + mixedNoList.add("floatbottle"); + // 文件传输助手 + mixedNoList.add("filehelper"); + // 新闻 + mixedNoList.add("newsapp"); + // 微信公众平台 weixingongzhong + mixedNoList.add("weixinguanhaozhushou"); + // 微信团队 + mixedNoList.add("weixin"); + // 微信支付 wxzhifu + mixedNoList.add("gh_3dfda90e39d6"); + // 微信公开课 wx-gongkaike + mixedNoList.add("gh_c46cbbfa1de9"); + // 微信公开课 wx-gongkaike + mixedNoList.add("gh_c46cbbfa1de9"); + // 微信运动 WeRun-WeChat + mixedNoList.add("gh_43f2581f6fd6"); + // 微信游戏 game + mixedNoList.add("gh_25d9ac85a4bc"); + // 微信游戏 game + mixedNoList.add("gh_25d9ac85a4bc"); + // 微信开发者 + mixedNoList.add("gh_56fc3b00cc4f"); + // 微信搜一搜 wechat_search + mixedNoList.add("gh_f08f54ae25a4"); + // 微信搜一搜 wechat_search + mixedNoList.add("gh_f08f54ae25a4"); if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.WORK.getAffix())) { + // 企微 vo.setType(WxContactsTypeEnum.WORK.getCode()); vo.setTypeLabel(WxContactsTypeEnum.WORK.getName()); } else if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.GROUP.getAffix())) { + // 群聊 vo.setType(WxContactsTypeEnum.GROUP.getCode()); vo.setTypeLabel(WxContactsTypeEnum.GROUP.getName()); + } else if (mixedNoList.contains(rpcContact.getWxid())) { + // 官方杂号 + vo.setType(WxContactsTypeEnum.OFFICIAL_MIXED_NO.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_MIXED_NO.getName()); } else if (rpcContact.getWxid().startsWith(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getAffix())) { + // 微信公众号 vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); } else { + // 个微 vo.setType(WxContactsTypeEnum.PERSON.getCode()); vo.setTypeLabel(WxContactsTypeEnum.PERSON.getName()); } @@ -293,6 +338,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { atUser = String.join(",", request.getAtUsers()); } } + // 0 为成功,其他失败 int state = wechatSocketClient.sendText(request.getMsgText(), request.getRecipient(), atUser); log.info("[发送消息]-[文本消息]-处理结束"); return null; @@ -301,25 +347,43 @@ public class WeChatDllServiceImpl implements WeChatDllService { @Override public WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request) { WxPpSendImageMsgResp resp = new WxPpSendImageMsgResp(); - int state = wechatSocketClient.sendImage(request.getPath(), request.getRecipient()); + int state = wechatSocketClient.sendImage(request.getResourcePath(), request.getRecipient()); return null; } @Override public WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request) { - int state = wechatSocketClient.sendFile(request.getPath(), request.getRecipient()); + int state = wechatSocketClient.sendFile(request.getResourcePath(), request.getRecipient()); return null; } @Override - public WxPpSendCardMsgResp sendCardMsg(WxPpSendCardMsgReq request) { - int state = wechatSocketClient.sendXml(request.getRecipient(), request.getXml(), request.getPath(), request.getType()); + public WxPpSendXmlMsgResp sendXmlMsg(WxPpSendXmlMsgReq request) { + int state = wechatSocketClient.sendXml(request.getRecipient(), request.getXmlContent(), request.getResourcePath(), request.getXmlType()); return null; } @Override public WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request) { - int state = wechatSocketClient.sendEmotion(request.getPath(), request.getRecipient()); + int state = wechatSocketClient.sendEmotion(request.getResourcePath(), request.getRecipient()); + return null; + } + + @Override + public WxPpSendRichTextMsgResp sendRichTextMsg(WxPpSendRichTextMsgReq request) { + Wcf.RichText richTextMsg = Wcf.RichText.newBuilder().setName(request.getName()).setAccount(request.getAccount()).setTitle(request.getTitle()) + .setDigest(request.getDigest()).setUrl(request.getJumpUrl()).setThumburl(request.getThumbnailUrl()).setReceiver(request.getRecipient()) + .build(); + Wcf.Request wcfReq = Wcf.Request.newBuilder().setFuncValue(Wcf.Functions.FUNC_SEND_RICH_TXT_VALUE).setRt(richTextMsg).build(); + Wcf.Response rsp = wechatSocketClient.sendCmd(wcfReq); + return null; + } + + @Override + public WxPpSendPatOnePatMsgResp patOnePat(WxPpPatOnePatMsgReq request) { + Wcf.PatMsg patMsg = Wcf.PatMsg.newBuilder().setRoomid(request.getRecipient()).setWxid(request.getPatUser()).build(); + Wcf.Request wcfReq = Wcf.Request.newBuilder().setFuncValue(Wcf.Functions.FUNC_SEND_PAT_MSG_VALUE).setPm(patMsg).build(); + Wcf.Response rsp = wechatSocketClient.sendCmd(wcfReq); return null; } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index 2211455..1d20c21 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -4,7 +4,6 @@ import java.util.Map; import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; @@ -13,8 +12,6 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.wechat.ferry.config.WeChatFerryProperties; import com.wechat.ferry.entity.dto.WxPpMsgDTO; -import com.wechat.ferry.service.WeChatDllService; -import com.wechat.ferry.service.WeChatExtService; import com.wechat.ferry.service.WeChatMsgService; import com.wechat.ferry.utils.HttpClientUtil; @@ -30,20 +27,6 @@ import lombok.extern.slf4j.Slf4j; @Service public class WeChatMsgServiceImpl implements WeChatMsgService { - private WeChatDllService weChatDllService; - - @Autowired - public void setWeChatDllService(WeChatDllService weChatDllService) { - this.weChatDllService = weChatDllService; - } - - private WeChatExtService weChatExtService; - - @Autowired - public void setWeChatExtService(WeChatExtService weChatExtService) { - this.weChatExtService = weChatExtService; - } - @Resource private WeChatFerryProperties weChatFerryProperties; @@ -58,7 +41,6 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { // 指定处理的群聊 if (weChatFerryProperties.getOpenMsgGroups().contains(dto.getRoomId())) { // TODO 这里可以拓展自己需要的功能 - weChatExtService.instructSign(dto); } } log.debug("[收到消息]-[消息内容]-打印:{}", dto); From 741b41e17f50530c9e4534beebdadf01f9afbe74 Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Sun, 6 Oct 2024 21:24:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=87=BA=E5=8F=82=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ferry/entity/vo/response/WxPpContactsResp.java | 14 +++++++------- .../entity/vo/response/WxPpGroupMemberResp.java | 6 +++--- .../entity/vo/response/WxPpLoginInfoResp.java | 6 +++--- .../ferry/service/impl/WeChatDllServiceImpl.java | 12 ++++++------ .../ferry/service/impl/WeChatMsgServiceImpl.java | 10 ++++++++++ 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java index 3f5e94f..28f950b 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java @@ -27,17 +27,17 @@ public class WxPpContactsResp { @ApiModelProperty(value = "微信号") private String weChatNo; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - private String remark; - /** * 微信昵称 */ @ApiModelProperty(value = "微信昵称") - private String nickName; + private String weChatNickname; + + /** + * 好友备注 + */ + @ApiModelProperty(value = "好友备注") + private String friendRemark; /** * 国家 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java index e9768d4..9d6a639 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java @@ -22,10 +22,10 @@ public class WxPpGroupMemberResp { private String weChatUid; /** - * 微信昵称 + * 群内昵称 */ - @ApiModelProperty(value = "微信昵称") - private String nickName; + @ApiModelProperty(value = "群内昵称") + private String groupNickName; /** * 状态 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java index 5a5e259..859ca1f 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java @@ -22,10 +22,10 @@ public class WxPpLoginInfoResp { private String weChatUid; /** - * name + * 微信昵称 */ - @ApiModelProperty(value = "name") - private String name; + @ApiModelProperty(value = "微信昵称") + private String weChatNickname; /** * 手机号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 6030203..8a2659d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -84,7 +84,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { Wcf.UserInfo userInfo = wechatSocketClient.getUserInfo(); if (!ObjectUtils.isEmpty(userInfo)) { resp.setWeChatUid(userInfo.getWxid()); - resp.setName(userInfo.getName()); + resp.setWeChatNickname(userInfo.getName()); resp.setPhone(userInfo.getMobile()); resp.setHomePath(userInfo.getHome()); } @@ -118,8 +118,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { WxPpContactsResp vo = new WxPpContactsResp(); vo.setWeChatUid(rpcContact.getWxid()); vo.setWeChatNo(rpcContact.getCode()); - vo.setRemark(rpcContact.getRemark()); - vo.setNickName(rpcContact.getName()); + vo.setFriendRemark(rpcContact.getRemark()); + vo.setWeChatNickname(rpcContact.getName()); if (!ObjectUtils.isEmpty(rpcContact.getCountry())) { vo.setCountryPinyin(rpcContact.getCountry()); if ("CN".equals(rpcContact.getCountry())) { @@ -282,8 +282,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { } if ("NickName".equals(dbField.getColumn())) { String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); - vo.setNickName(content); - dbMap.put(vo.getWeChatUid(), vo.getNickName()); + vo.setGroupNickName(content); + dbMap.put(vo.getWeChatUid(), vo.getGroupNickName()); } } } @@ -309,7 +309,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { // 如果没有设置群昵称则默认为微信名称 nickName = dbMap.get(member.getWxid()); } - vo.setNickName(nickName); + vo.setGroupNickName(nickName); vo.setState(String.valueOf(member.getState())); list.add(vo); } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index 1d20c21..e081b12 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Map; import javax.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; @@ -12,6 +13,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.wechat.ferry.config.WeChatFerryProperties; import com.wechat.ferry.entity.dto.WxPpMsgDTO; +import com.wechat.ferry.service.WeChatExtService; import com.wechat.ferry.service.WeChatMsgService; import com.wechat.ferry.utils.HttpClientUtil; @@ -27,6 +29,13 @@ import lombok.extern.slf4j.Slf4j; @Service public class WeChatMsgServiceImpl implements WeChatMsgService { + private WeChatExtService weChatExtService; + + @Autowired + public void setWeChatExtService(WeChatExtService weChatExtService) { + this.weChatExtService = weChatExtService; + } + @Resource private WeChatFerryProperties weChatFerryProperties; @@ -40,6 +49,7 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { if (!CollectionUtils.isEmpty(weChatFerryProperties.getOpenMsgGroups())) { // 指定处理的群聊 if (weChatFerryProperties.getOpenMsgGroups().contains(dto.getRoomId())) { + weChatExtService.instructSign(dto); // TODO 这里可以拓展自己需要的功能 } } From 220e002f284a9eb14b429d6e2532bf81de2d0495 Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Mon, 7 Oct 2024 20:55:23 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-VO?= =?UTF-8?q?=E5=B1=82=E5=89=8D=E7=BC=80=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clients/java/wechat-ferry-mvn/README.MD | 47 +++++++- .../ferry/controller/WeChatDllController.java | 96 ++++++++-------- ...SqlReq.java => WxPpWcfDatabaseSqlReq.java} | 6 +- ...eReq.java => WxPpWcfDatabaseTableReq.java} | 6 +- ...berReq.java => WxPpWcfGroupMemberReq.java} | 6 +- ...sgReq.java => WxPpWcfPatOnePatMsgReq.java} | 6 +- ...sgReq.java => WxPpWcfSendEmojiMsgReq.java} | 6 +- ...MsgReq.java => WxPpWcfSendFileMsgReq.java} | 6 +- ...sgReq.java => WxPpWcfSendImageMsgReq.java} | 6 +- ...eq.java => WxPpWcfSendRichTextMsgReq.java} | 6 +- ...MsgReq.java => WxPpWcfSendTextMsgReq.java} | 6 +- ...lMsgReq.java => WxPpWcfSendXmlMsgReq.java} | 6 +- ...actsResp.java => WxPpWcfContactsResp.java} | 6 +- ...esp.java => WxPpWcfDatabaseFieldResp.java} | 6 +- ...wResp.java => WxPpWcfDatabaseRowResp.java} | 8 +- ...rResp.java => WxPpWcfGroupMemberResp.java} | 6 +- ...nfoResp.java => WxPpWcfLoginInfoResp.java} | 6 +- ...gTypeResp.java => WxPpWcfMsgTypeResp.java} | 6 +- ...Resp.java => WxPpWcfSendEmojiMsgResp.java} | 6 +- ...gResp.java => WxPpWcfSendFileMsgResp.java} | 6 +- ...Resp.java => WxPpWcfSendImageMsgResp.java} | 6 +- ....java => WxPpWcfSendPatOnePatMsgResp.java} | 6 +- ...p.java => WxPpWcfSendRichTextMsgResp.java} | 6 +- ...gResp.java => WxPpWcfSendTextMsgResp.java} | 6 +- ...sgResp.java => WxPpWcfSendXmlMsgResp.java} | 6 +- .../ferry/service/WeChatDllService.java | 70 ++++++------ .../service/impl/WeChatDllServiceImpl.java | 104 +++++++++--------- .../service/impl/WeChatMsgServiceImpl.java | 10 -- 28 files changed, 251 insertions(+), 216 deletions(-) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpDatabaseSqlReq.java => WxPpWcfDatabaseSqlReq.java} (70%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpDatabaseTableReq.java => WxPpWcfDatabaseTableReq.java} (64%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpGroupMemberReq.java => WxPpWcfGroupMemberReq.java} (65%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpPatOnePatMsgReq.java => WxPpWcfPatOnePatMsgReq.java} (74%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendEmojiMsgReq.java => WxPpWcfSendEmojiMsgReq.java} (76%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendFileMsgReq.java => WxPpWcfSendFileMsgReq.java} (77%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendImageMsgReq.java => WxPpWcfSendImageMsgReq.java} (80%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendRichTextMsgReq.java => WxPpWcfSendRichTextMsgReq.java} (86%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendTextMsgReq.java => WxPpWcfSendTextMsgReq.java} (86%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/{WxPpSendXmlMsgReq.java => WxPpWcfSendXmlMsgReq.java} (83%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpContactsResp.java => WxPpWcfContactsResp.java} (91%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpDatabaseFieldResp.java => WxPpWcfDatabaseFieldResp.java} (73%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpDatabaseRowResp.java => WxPpWcfDatabaseRowResp.java} (58%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpGroupMemberResp.java => WxPpWcfGroupMemberResp.java} (78%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpLoginInfoResp.java => WxPpWcfLoginInfoResp.java} (82%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpMsgTypeResp.java => WxPpWcfMsgTypeResp.java} (72%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendEmojiMsgResp.java => WxPpWcfSendEmojiMsgResp.java} (70%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendFileMsgResp.java => WxPpWcfSendFileMsgResp.java} (70%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendImageMsgResp.java => WxPpWcfSendImageMsgResp.java} (80%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendPatOnePatMsgResp.java => WxPpWcfSendPatOnePatMsgResp.java} (68%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendRichTextMsgResp.java => WxPpWcfSendRichTextMsgResp.java} (68%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendTextMsgResp.java => WxPpWcfSendTextMsgResp.java} (70%) rename clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/{WxPpSendXmlMsgResp.java => WxPpWcfSendXmlMsgResp.java} (71%) diff --git a/clients/java/wechat-ferry-mvn/README.MD b/clients/java/wechat-ferry-mvn/README.MD index 224f9d1..7c21ca6 100644 --- a/clients/java/wechat-ferry-mvn/README.MD +++ b/clients/java/wechat-ferry-mvn/README.MD @@ -132,13 +132,44 @@ wechat: dll-path: /dll/sdk.dll ``` -#### 生成proto文件 +### 缩写含义 + +首先特别通用的缩写,这里就不在重复了,比如DTO,PO这类 + +请求入参:req + +请求出参:resp + +微信:wx + +个人微信:pp + +企业微信:cp + +微信公众号:mp + +WeChatFerry框架:wcf + +.gitkeep:占位文件,比如我们定义一个文件夹之后,为了避免文件夹下无内容,导致git未提交上,所以会建议此文件,阅读时直接忽略此类文件即可 + +### 生成proto文件 本程序已经集成了生成proto文件的maven插件,直接install即可生成proto文件,且会在打包程序中去除 src/main/resources/proto 下面的内容,只保留实体类中的文件 默认install会重新根据.proto文件重新生成实体,如果不想被替换,请删除 src/main/resources/proto 下对应的.proto文件即可 +#### 本项目自适配类型 + +有一些查询数据的自定义返回字段,定义了本项目自身的返回类型,所以 proto 文件不要从其他项目拷贝,不然缺失类型导致接口返回乱码自行负责 + +如: + +``` +message RoomData + +``` + ### 提交规范 本模块希望大家使用统一提交格式,便于区分 @@ -157,4 +188,18 @@ feat(0): [java]-[wechat-ferry-mvn]-基础类目录划分迁移及代码格式 | fix | 缺陷 | | ... | 其他等git规范中的均可 | +### 说明 +下面主要是针对一些合作开发者的咨询做统一回复,可以直接忽略。 + +#### 目录层级拆分太细 + +其实这个服务是底层服务,目录分细确实会增加开发量,但是针对于后面的拓展和维护上来说,个人感觉利大于弊, +毕竟功能开发完之后,这个服务很少在变动,更多的是阅读,如果能让大家阅读、维护方便,开发时多花点时间能接受。 + +当然,如果觉得目录太多,可以自己删除点,这样可以少写点代码,目前本项目还是建议保必要的层级隔离 + +#### 文件名太长 + +出发点是为了名称进行统一规范化,便于阅读更加方便,只要了解了基础的缩写含义,其实跟自己平时命名一样, +只不过加上了固定的前缀和后缀而已,这样单从文件名就能分析出功能模块及其含义 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java index 291807b..4b88a94 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/controller/WeChatDllController.java @@ -10,28 +10,28 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.wechat.ferry.entity.TResponse; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; -import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; -import com.wechat.ferry.entity.vo.response.WxPpContactsResp; -import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; -import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; -import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; -import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfPatOnePatMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendRichTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendXmlMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpWcfContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfLoginInfoResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendRichTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendXmlMsgResp; import com.wechat.ferry.enums.ResponseCodeEnum; import com.wechat.ferry.service.WeChatDllService; @@ -74,29 +74,29 @@ public class WeChatDllController { @ApiOperation(value = "获取登录微信信息", notes = "queryLoginWeChatInfo") @PostMapping(value = "/loginWeChatInfo") - public TResponse queryLoginWeChatInfo() { - WxPpLoginInfoResp resp = weChatDllService.queryLoginWeChatInfo(); + public TResponse queryLoginWeChatInfo() { + WxPpWcfLoginInfoResp resp = weChatDllService.queryLoginWeChatInfo(); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "获取消息类型", notes = "queryMsgTypeList") @PostMapping(value = "/list/msgType") - public TResponse> queryMsgTypeList() { - List list = weChatDllService.queryMsgTypeList(); + public TResponse> queryMsgTypeList() { + List list = weChatDllService.queryMsgTypeList(); return TResponse.ok(ResponseCodeEnum.SUCCESS, list); } @ApiOperation(value = "获取联系人", notes = "queryContactsList") @PostMapping(value = "/list/contacts") - public TResponse> queryContactsList() { - List list = weChatDllService.queryContactsList(); + public TResponse> queryContactsList() { + List list = weChatDllService.queryContactsList(); return TResponse.ok(ResponseCodeEnum.SUCCESS, list); } @ApiOperation(value = "获取可查询数据库", notes = "queryDatabaseSql") @PostMapping(value = "/list/dbSql") - public TResponse> queryDatabaseSql(@Validated @RequestBody WxPpDatabaseSqlReq request) { - List list = weChatDllService.queryDatabaseSql(request); + public TResponse> queryDatabaseSql(@Validated @RequestBody WxPpWcfDatabaseSqlReq request) { + List list = weChatDllService.queryDatabaseSql(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, list); } @@ -109,7 +109,7 @@ public class WeChatDllController { @ApiOperation(value = "获取指定数据库中的表", notes = "queryDatabaseTable") @PostMapping(value = "/list/dbTable") - public TResponse> queryDatabaseTable(@Validated @RequestBody WxPpDatabaseTableReq request) { + public TResponse> queryDatabaseTable(@Validated @RequestBody WxPpWcfDatabaseTableReq request) { List list = weChatDllService.queryDatabaseTable(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, list); } @@ -122,64 +122,64 @@ public class WeChatDllController { @ApiOperation(value = "查询群成员", notes = "queryGroupMember") @PostMapping(value = "/list/groupMember") - public TResponse> queryGroupMember(@Validated @RequestBody WxPpGroupMemberReq request) { - List list = weChatDllService.queryGroupMember(request); + public TResponse> queryGroupMember(@Validated @RequestBody WxPpWcfGroupMemberReq request) { + List list = weChatDllService.queryGroupMember(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, list); } @ApiOperation(value = "发送消息汇总入口", notes = "sendMsgMaster") @PostMapping(value = "/send/msgMaster") - public TResponse sendMsgMaster(@Validated @RequestBody String jsonString) { + public TResponse sendMsgMaster(@Validated @RequestBody String jsonString) { return TResponse.ok(ResponseCodeEnum.SUCCESS); } @ApiOperation(value = "发送文本消息(可 @)", notes = "sendTextMsg") @PostMapping(value = "/send/textMsg") - public TResponse sendTextMsg(@Validated @RequestBody WxPpSendTextMsgReq request) { - WxPpSendTextMsgResp resp = weChatDllService.sendTextMsg(request); + public TResponse sendTextMsg(@Validated @RequestBody WxPpWcfSendTextMsgReq request) { + WxPpWcfSendTextMsgResp resp = weChatDllService.sendTextMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "发送图片消息", notes = "sendImageMsg") @PostMapping(value = "/send/imageMsg") - public TResponse sendImageMsg(@Validated @RequestBody WxPpSendImageMsgReq request) { - WxPpSendImageMsgResp resp = weChatDllService.sendImageMsg(request); + public TResponse sendImageMsg(@Validated @RequestBody WxPpWcfSendImageMsgReq request) { + WxPpWcfSendImageMsgResp resp = weChatDllService.sendImageMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "发送文件消息", notes = "sendFileMsg") @PostMapping(value = "/send/fileMsg") - public TResponse sendFileMsg(@Validated @RequestBody WxPpSendFileMsgReq request) { - WxPpSendFileMsgResp resp = weChatDllService.sendFileMsg(request); + public TResponse sendFileMsg(@Validated @RequestBody WxPpWcfSendFileMsgReq request) { + WxPpWcfSendFileMsgResp resp = weChatDllService.sendFileMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "发送XML消息", notes = "sendXmlMsg") @PostMapping(value = "/send/xmlMsg") - public TResponse sendXmlMsg(@Validated @RequestBody WxPpSendXmlMsgReq request) { - WxPpSendXmlMsgResp resp = weChatDllService.sendXmlMsg(request); + public TResponse sendXmlMsg(@Validated @RequestBody WxPpWcfSendXmlMsgReq request) { + WxPpWcfSendXmlMsgResp resp = weChatDllService.sendXmlMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "发送表情消息", notes = "sendEmojiMsg") @PostMapping(value = "/send/emojiMsg") - public TResponse sendEmojiMsg(@Validated @RequestBody WxPpSendEmojiMsgReq request) { - WxPpSendEmojiMsgResp resp = weChatDllService.sendEmojiMsg(request); + public TResponse sendEmojiMsg(@Validated @RequestBody WxPpWcfSendEmojiMsgReq request) { + WxPpWcfSendEmojiMsgResp resp = weChatDllService.sendEmojiMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "发送富文本消息", notes = "sendRichTextMsg") @PostMapping(value = "/send/richTextMsg") - public TResponse sendRichTextMsg(@Validated @RequestBody WxPpSendRichTextMsgReq request) { - WxPpSendRichTextMsgResp resp = weChatDllService.sendRichTextMsg(request); + public TResponse sendRichTextMsg(@Validated @RequestBody WxPpWcfSendRichTextMsgReq request) { + WxPpWcfSendRichTextMsgResp resp = weChatDllService.sendRichTextMsg(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } @ApiOperation(value = "拍一拍群友", notes = "patOnePat") @PostMapping(value = "/patOnePat") - public TResponse patOnePat(@Validated @RequestBody WxPpPatOnePatMsgReq request) { - WxPpSendPatOnePatMsgResp resp = weChatDllService.patOnePat(request); + public TResponse patOnePat(@Validated @RequestBody WxPpWcfPatOnePatMsgReq request) { + WxPpWcfSendPatOnePatMsgResp resp = weChatDllService.patOnePat(request); return TResponse.ok(ResponseCodeEnum.SUCCESS, resp); } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseSqlReq.java similarity index 70% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseSqlReq.java index 01dfb09..c306644 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseSqlReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseSqlReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-查询-个微数据库SQL查询 + * 请求入参-查询-个微WCF数据库SQL查询 * * @author chandler * @date 2024-10-02 17:10 */ @Data -@ApiModel(value = "wxPpDatabaseSqlReq", description = "个微数据库SQL查询请求入参") -public class WxPpDatabaseSqlReq { +@ApiModel(value = "wxPpWcfDatabaseSqlReq", description = "个微WCF数据库SQL查询请求入参") +public class WxPpWcfDatabaseSqlReq { /** * 数据库名称 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseTableReq.java similarity index 64% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseTableReq.java index f20711a..e49bbdb 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpDatabaseTableReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfDatabaseTableReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-查询-个微数据库表查询 + * 请求入参-查询-个微WCF数据库表查询 * * @author chandler * @date 2024-10-02 17:55 */ @Data -@ApiModel(value = "wxPpDatabaseTableReq", description = "个微数据库表查询请求入参") -public class WxPpDatabaseTableReq { +@ApiModel(value = "wxPpWcfDatabaseTableReq", description = "个微WCF数据库表查询请求入参") +public class WxPpWcfDatabaseTableReq { /** * 数据库名称 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfGroupMemberReq.java similarity index 65% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfGroupMemberReq.java index 6711e99..fe5b006 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpGroupMemberReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfGroupMemberReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微查询群成员 + * 请求入参-个微WCF查询群成员 * * @author chandler * @date 2024-10-02 20:55 */ @Data -@ApiModel(value = "wxPpGroupMemberReq", description = "个微查询群成员请求入参") -public class WxPpGroupMemberReq { +@ApiModel(value = "wxPpWcfGroupMemberReq", description = "个微WCF查询群成员请求入参") +public class WxPpWcfGroupMemberReq { /** * 群编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfPatOnePatMsgReq.java similarity index 74% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfPatOnePatMsgReq.java index 83cd6a8..387b93e 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpPatOnePatMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfPatOnePatMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送拍一拍消息 + * 请求入参-个微WCF发送拍一拍消息 * * @author chandler * @date 2024-10-06 15:50 */ @Data -@ApiModel(value = "wxPpPatOnePatMsgReq", description = "个微发送拍一拍消息请求入参") -public class WxPpPatOnePatMsgReq { +@ApiModel(value = "wxPpWcfPatOnePatMsgReq", description = "个微WCF发送拍一拍消息请求入参") +public class WxPpWcfPatOnePatMsgReq { /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendEmojiMsgReq.java similarity index 76% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendEmojiMsgReq.java index e3e6121..30ff358 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendEmojiMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendEmojiMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送表情消息 + * 请求入参-个微WCF发送表情消息 * * @author chandler * @date 2024-10-04 23:14 */ @Data -@ApiModel(value = "wxPpSendEmojiMsgReq", description = "个微发送表情消息请求入参") -public class WxPpSendEmojiMsgReq { +@ApiModel(value = "wxPpWcfSendEmojiMsgReq", description = "个微WCF发送表情消息请求入参") +public class WxPpWcfSendEmojiMsgReq { /** * 资源路径-本地表情路径 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendFileMsgReq.java similarity index 77% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendFileMsgReq.java index cb624a2..4ab499a 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendFileMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendFileMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送文件消息 + * 请求入参-个微WCF发送文件消息 * * @author chandler * @date 2024-10-04 23:08 */ @Data -@ApiModel(value = "wxPpSendFileMsgReq", description = "个微发送文件消息请求入参") -public class WxPpSendFileMsgReq { +@ApiModel(value = "wxPpWcfSendFileMsgReq", description = "个微WCF发送文件消息请求入参") +public class WxPpWcfSendFileMsgReq { /** * 资源路径-本地文件路径 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendImageMsgReq.java similarity index 80% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendImageMsgReq.java index 07d8b0b..6490d4b 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendImageMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendImageMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送图片消息 + * 请求入参-个微WCF发送图片消息 * * @author chandler * @date 2024-10-04 15:55 */ @Data -@ApiModel(value = "wxPpSendImageMsgReq", description = "个微发送图片消息请求入参") -public class WxPpSendImageMsgReq { +@ApiModel(value = "wxPpWcfSendImageMsgReq", description = "个微WCF发送图片消息请求入参") +public class WxPpWcfSendImageMsgReq { /** * 资源路径-本地图片地址 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendRichTextMsgReq.java similarity index 86% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendRichTextMsgReq.java index 9c55f4f..0b9dca9 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendRichTextMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendRichTextMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送富文本消息 + * 请求入参-个微WCF发送富文本消息 * * @author chandler * @date 2024-10-06 15:40 */ @Data -@ApiModel(value = "wxPpSendRichTextMsgReq", description = "个微发送富文本消息请求入参") -public class WxPpSendRichTextMsgReq { +@ApiModel(value = "wxPpWcfSendRichTextMsgReq", description = "个微WCF发送富文本消息请求入参") +public class WxPpWcfSendRichTextMsgReq { /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendTextMsgReq.java similarity index 86% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendTextMsgReq.java index d415150..1ea0c32 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendTextMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendTextMsgReq.java @@ -7,14 +7,14 @@ import lombok.Data; import java.util.List; /** - * 请求入参-个微发送文本消息 + * 请求入参-个微WCF发送文本消息 * * @author chandler * @date 2024-10-02 20:33 */ @Data -@ApiModel(value = "wxPpSendTextMsgReq", description = "个微发送文本消息请求入参") -public class WxPpSendTextMsgReq { +@ApiModel(value = "wxPpWcfSendTextMsgReq", description = "个微WCF发送文本消息请求入参") +public class WxPpWcfSendTextMsgReq { /** * 消息文本 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendXmlMsgReq.java similarity index 83% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendXmlMsgReq.java index ba1a24e..12ff1e3 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpSendXmlMsgReq.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/request/WxPpWcfSendXmlMsgReq.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求入参-个微发送XML消息 + * 请求入参-个微WCF发送XML消息 * * @author chandler * @date 2024-10-04 23:11 */ @Data -@ApiModel(value = "wxPpSendXmlMsgReq", description = "个微发送XML消息请求入参") -public class WxPpSendXmlMsgReq { +@ApiModel(value = "wxPpWcfSendXmlMsgReq", description = "个微WCF发送XML消息请求入参") +public class WxPpWcfSendXmlMsgReq { /** * 消息接收人 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java similarity index 91% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java index 28f950b..fff6c89 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpContactsResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微联系人 + * 请求出参-个微WCF联系人 * * @author chandler * @date 2024/10/02 17:01 */ @Data -@ApiModel(value = "wxPpContactsResp", description = "个微联系人查询请求出参") -public class WxPpContactsResp { +@ApiModel(value = "wxPpWcfContactsResp", description = "个微WCF联系人查询请求出参") +public class WxPpWcfContactsResp { /** * 微信内部识别号UID diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseFieldResp.java similarity index 73% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseFieldResp.java index eafae8d..b8d461e 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseFieldResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseFieldResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微数据库字段 + * 请求出参-个微WCF数据库字段 * * @author chandler * @date 2024/10/02 17:15 */ @Data -@ApiModel(value = "wxPpDatabaseFieldResp", description = "个微数据库字段查询请求出参") -public class WxPpDatabaseFieldResp { +@ApiModel(value = "wxPpWcfDatabaseFieldResp", description = "个微WCF数据库字段查询请求出参") +public class WxPpWcfDatabaseFieldResp { /** * 字段类型 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseRowResp.java similarity index 58% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseRowResp.java index f774644..0eeadd4 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpDatabaseRowResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfDatabaseRowResp.java @@ -7,19 +7,19 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微数据库记录 + * 请求出参-个微WCF数据库记录 * * @author chandler * @date 2024/10/02 17:14 */ @Data -@ApiModel(value = "wxPpDatabaseRowResp", description = "个微数据库记录查询请求出参") -public class WxPpDatabaseRowResp { +@ApiModel(value = "wxPpWcfDatabaseRowResp", description = "个微WCF数据库记录查询请求出参") +public class WxPpWcfDatabaseRowResp { /** * 字段列表 */ @ApiModelProperty(value = "字段列表") - private List fieldList; + private List fieldList; } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfGroupMemberResp.java similarity index 78% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfGroupMemberResp.java index 9d6a639..326e46d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpGroupMemberResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfGroupMemberResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微查询群成员 + * 请求出参-个微WCF查询群成员 * * @author chandler * @date 2024/10/01 21:26 */ @Data -@ApiModel(value = "wxPpGroupMemberResp", description = "个微群成员查询请求出参") -public class WxPpGroupMemberResp { +@ApiModel(value = "wxPpWcfGroupMemberResp", description = "个微WCF群成员查询请求出参") +public class WxPpWcfGroupMemberResp { /** * 微信内部识别号UID diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfLoginInfoResp.java similarity index 82% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfLoginInfoResp.java index 859ca1f..7e0e43d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpLoginInfoResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfLoginInfoResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-登录个微信息 + * 请求出参-登录WCF个微信息 * * @author chandler * @date 2024/10/05 22:53 */ @Data -@ApiModel(value = "wxPpLoginInfoResp", description = "登录个微信息查询请求出参") -public class WxPpLoginInfoResp { +@ApiModel(value = "wxPpWcfLoginInfoResp", description = "登录WCF个微信息查询请求出参") +public class WxPpWcfLoginInfoResp { /** * 微信内部识别号UID diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfMsgTypeResp.java similarity index 72% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfMsgTypeResp.java index 2aa59f0..44934b0 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpMsgTypeResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfMsgTypeResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微消息类型 + * 请求出参-个微WCF消息类型 * * @author chandler * @date 2024/10/01 21:26 */ @Data -@ApiModel(value = "wxPpMsgTypeResp", description = "个微消息类型查询请求出参") -public class WxPpMsgTypeResp { +@ApiModel(value = "wxPpWcfMsgTypeResp", description = "个微WCF消息类型查询请求出参") +public class WxPpWcfMsgTypeResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendEmojiMsgResp.java similarity index 70% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendEmojiMsgResp.java index ed65a44..1f2ee72 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendEmojiMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendEmojiMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送GIF消息 + * 请求出参-个微WCF发送GIF消息 * * @author chandler * @date 2024/10/04 23:13 */ @Data -@ApiModel(value = "wxPpSendEmojiMsgResp", description = "个微发送GIF消息请求出参") -public class WxPpSendEmojiMsgResp { +@ApiModel(value = "wxPpWcfSendEmojiMsgResp", description = "个微WCF发送GIF消息请求出参") +public class WxPpWcfSendEmojiMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendFileMsgResp.java similarity index 70% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendFileMsgResp.java index 9ca51ea..67b1f65 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendFileMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendFileMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送文件消息 + * 请求出参-个微WCF发送文件消息 * * @author chandler * @date 2024/10/04 23:07 */ @Data -@ApiModel(value = "wxPpSendFileMsgResp", description = "个微发送文件消息请求出参") -public class WxPpSendFileMsgResp { +@ApiModel(value = "wxPpWcfSendFileMsgResp", description = "个微WCF发送文件消息请求出参") +public class WxPpWcfSendFileMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendImageMsgResp.java similarity index 80% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendImageMsgResp.java index a0e62e6..51ef04b 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendImageMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendImageMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送图像消息 + * 请求出参-个微WCF发送图像消息 * * @author chandler * @date 2024/10/03 10:17 */ @Data -@ApiModel(value = "wxPpSendImageMsgResp", description = "个微发送图像消息请求出参") -public class WxPpSendImageMsgResp { +@ApiModel(value = "wxPpWcfSendImageMsgResp", description = "个微WCF发送图像消息请求出参") +public class WxPpWcfSendImageMsgResp { /** * 状态码 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendPatOnePatMsgResp.java similarity index 68% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendPatOnePatMsgResp.java index 2763186..22d3422 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendPatOnePatMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendPatOnePatMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送拍一拍消息 + * 请求出参-个微WCF发送拍一拍消息 * * @author chandler * @date 2024/10/06 15:52 */ @Data -@ApiModel(value = "wxPpSendPatOnePatMsgResp", description = "个微发送拍一拍消息请求出参") -public class WxPpSendPatOnePatMsgResp { +@ApiModel(value = "wxPpWcfSendPatOnePatMsgResp", description = "个微WCF发送拍一拍消息请求出参") +public class WxPpWcfSendPatOnePatMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendRichTextMsgResp.java similarity index 68% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendRichTextMsgResp.java index 4483954..934035c 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendRichTextMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendRichTextMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送富文本消息 + * 请求出参-个微WCF发送富文本消息 * * @author chandler * @date 2024/10/06 15:46 */ @Data -@ApiModel(value = "wxPpSendRichTextMsgResp", description = "个微发送富文本消息请求出参") -public class WxPpSendRichTextMsgResp { +@ApiModel(value = "wxPpWcfSendRichTextMsgResp", description = "个微WCF发送富文本消息请求出参") +public class WxPpWcfSendRichTextMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendTextMsgResp.java similarity index 70% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendTextMsgResp.java index c4080c4..2a5c50d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendTextMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendTextMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送文本消息 + * 请求出参-个微WCF发送文本消息 * * @author chandler * @date 2024/10/03 10:17 */ @Data -@ApiModel(value = "wxPpSendTextMsgResp", description = "个微发送文本消息请求出参") -public class WxPpSendTextMsgResp { +@ApiModel(value = "wxPpWcfSendTextMsgResp", description = "个微WCF发送文本消息请求出参") +public class WxPpWcfSendTextMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendXmlMsgResp.java similarity index 71% rename from clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java rename to clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendXmlMsgResp.java index 1d76ef8..2f7829a 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpSendXmlMsgResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfSendXmlMsgResp.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 请求出参-个微发送XML消息 + * 请求出参-个微WCF发送XML消息 * * @author chandler * @date 2024/10/04 23:11 */ @Data -@ApiModel(value = "wxPpSendCardMsgResp", description = "个微发送XML消息请求出参") -public class WxPpSendXmlMsgResp { +@ApiModel(value = "wxPpWcfSendXmlMsgResp", description = "个微WCF发送XML消息请求出参") +public class WxPpWcfSendXmlMsgResp { /** * 类型编号 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java index 986b274..932baaa 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/WeChatDllService.java @@ -2,28 +2,28 @@ package com.wechat.ferry.service; import java.util.List; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; -import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; -import com.wechat.ferry.entity.vo.response.WxPpContactsResp; -import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; -import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; -import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; -import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfPatOnePatMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendRichTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendXmlMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpWcfContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfLoginInfoResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendRichTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendXmlMsgResp; /** * 业务接口-对接原本DLL的接口 @@ -61,7 +61,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-05 22:54 */ - WxPpLoginInfoResp queryLoginWeChatInfo(); + WxPpWcfLoginInfoResp queryLoginWeChatInfo(); /** * 获取所有消息类型 @@ -71,7 +71,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-01 21:22 */ - List queryMsgTypeList(); + List queryMsgTypeList(); /** * 获取所有联系人 @@ -81,7 +81,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-02 16:59 */ - List queryContactsList(); + List queryContactsList(); /** * 获取可查询数据库 @@ -92,7 +92,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-02 17:52 */ - List queryDatabaseSql(WxPpDatabaseSqlReq request); + List queryDatabaseSql(WxPpWcfDatabaseSqlReq request); /** * 获取数据库所有表名称 @@ -113,7 +113,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-02 17:52 */ - List queryDatabaseTable(WxPpDatabaseTableReq request); + List queryDatabaseTable(WxPpWcfDatabaseTableReq request); /** * 查询群成员 @@ -124,7 +124,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-02 20:59 */ - List queryGroupMember(WxPpGroupMemberReq request); + List queryGroupMember(WxPpWcfGroupMemberReq request); /** * 发送文本消息(可 @) @@ -137,7 +137,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-02 20:40 */ - WxPpSendTextMsgResp sendTextMsg(WxPpSendTextMsgReq request); + WxPpWcfSendTextMsgResp sendTextMsg(WxPpWcfSendTextMsgReq request); /** * 发送图片消息 @@ -148,7 +148,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-04 23:06 */ - WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request); + WxPpWcfSendImageMsgResp sendImageMsg(WxPpWcfSendImageMsgReq request); /** * 发送文件消息 @@ -159,7 +159,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-04 23:15 */ - WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request); + WxPpWcfSendFileMsgResp sendFileMsg(WxPpWcfSendFileMsgReq request); /** * 发送XML消息 @@ -170,7 +170,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-04 23:15 */ - WxPpSendXmlMsgResp sendXmlMsg(WxPpSendXmlMsgReq request); + WxPpWcfSendXmlMsgResp sendXmlMsg(WxPpWcfSendXmlMsgReq request); /** * 发送表情消息 @@ -181,7 +181,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-04 23:29 */ - WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request); + WxPpWcfSendEmojiMsgResp sendEmojiMsg(WxPpWcfSendEmojiMsgReq request); /** * 发送富文本消息 @@ -192,7 +192,7 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-06 15:48 */ - WxPpSendRichTextMsgResp sendRichTextMsg(WxPpSendRichTextMsgReq request); + WxPpWcfSendRichTextMsgResp sendRichTextMsg(WxPpWcfSendRichTextMsgReq request); /** * 拍一拍 @@ -203,6 +203,6 @@ public interface WeChatDllService { * @author chandler * @date 2024-10-06 15:54 */ - WxPpSendPatOnePatMsgResp patOnePat(WxPpPatOnePatMsgReq request); + WxPpWcfSendPatOnePatMsgResp patOnePat(WxPpWcfPatOnePatMsgReq request); } diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 8a2659d..7c9ac61 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -17,29 +17,29 @@ import org.springframework.util.ObjectUtils; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import com.wechat.ferry.entity.proto.Wcf; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseSqlReq; -import com.wechat.ferry.entity.vo.request.WxPpDatabaseTableReq; -import com.wechat.ferry.entity.vo.request.WxPpGroupMemberReq; -import com.wechat.ferry.entity.vo.request.WxPpPatOnePatMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendEmojiMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendFileMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendImageMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendRichTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendTextMsgReq; -import com.wechat.ferry.entity.vo.request.WxPpSendXmlMsgReq; -import com.wechat.ferry.entity.vo.response.WxPpContactsResp; -import com.wechat.ferry.entity.vo.response.WxPpDatabaseFieldResp; -import com.wechat.ferry.entity.vo.response.WxPpDatabaseRowResp; -import com.wechat.ferry.entity.vo.response.WxPpGroupMemberResp; -import com.wechat.ferry.entity.vo.response.WxPpLoginInfoResp; -import com.wechat.ferry.entity.vo.response.WxPpMsgTypeResp; -import com.wechat.ferry.entity.vo.response.WxPpSendEmojiMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendFileMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendImageMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendPatOnePatMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendRichTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendTextMsgResp; -import com.wechat.ferry.entity.vo.response.WxPpSendXmlMsgResp; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseSqlReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseTableReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfGroupMemberReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfPatOnePatMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendEmojiMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendFileMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendImageMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendRichTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendTextMsgReq; +import com.wechat.ferry.entity.vo.request.WxPpWcfSendXmlMsgReq; +import com.wechat.ferry.entity.vo.response.WxPpWcfContactsResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfDatabaseFieldResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfDatabaseRowResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfGroupMemberResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfLoginInfoResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfMsgTypeResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendEmojiMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendFileMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendImageMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendPatOnePatMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendRichTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendTextMsgResp; +import com.wechat.ferry.entity.vo.response.WxPpWcfSendXmlMsgResp; import com.wechat.ferry.enums.SexEnum; import com.wechat.ferry.enums.WxContactsTypeEnum; import com.wechat.ferry.handle.WeChatSocketClient; @@ -79,8 +79,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public WxPpLoginInfoResp queryLoginWeChatInfo() { - WxPpLoginInfoResp resp = new WxPpLoginInfoResp(); + public WxPpWcfLoginInfoResp queryLoginWeChatInfo() { + WxPpWcfLoginInfoResp resp = new WxPpWcfLoginInfoResp(); Wcf.UserInfo userInfo = wechatSocketClient.getUserInfo(); if (!ObjectUtils.isEmpty(userInfo)) { resp.setWeChatUid(userInfo.getWxid()); @@ -93,13 +93,13 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public List queryMsgTypeList() { - List list = new ArrayList<>(); + public List queryMsgTypeList() { + List list = new ArrayList<>(); Map msgTypeMap = wechatSocketClient.getMsgTypes(); if (!CollectionUtils.isEmpty(msgTypeMap)) { - WxPpMsgTypeResp resp; + WxPpWcfMsgTypeResp resp; for (Map.Entry entry : msgTypeMap.entrySet()) { - resp = new WxPpMsgTypeResp(); + resp = new WxPpWcfMsgTypeResp(); resp.setId(entry.getKey()); resp.setName(entry.getValue()); list.add(resp); @@ -110,12 +110,12 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public List queryContactsList() { - List list = new ArrayList<>(); + public List queryContactsList() { + List list = new ArrayList<>(); List rpcContactList = wechatSocketClient.getContacts(); if (!CollectionUtils.isEmpty(rpcContactList)) { for (Wcf.RpcContact rpcContact : rpcContactList) { - WxPpContactsResp vo = new WxPpContactsResp(); + WxPpWcfContactsResp vo = new WxPpWcfContactsResp(); vo.setWeChatUid(rpcContact.getWxid()); vo.setWeChatNo(rpcContact.getCode()); vo.setFriendRemark(rpcContact.getRemark()); @@ -204,8 +204,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public List queryDatabaseSql(WxPpDatabaseSqlReq request) { - List list = new ArrayList<>(); + public List queryDatabaseSql(WxPpWcfDatabaseSqlReq request) { + List list = new ArrayList<>(); List wcfList = wechatSocketClient.querySql(request.getDatabaseName(), request.getSqlText()); if (!CollectionUtils.isEmpty(wcfList)) { // List> result = new ArrayList<>(); @@ -223,10 +223,10 @@ public class WeChatDllServiceImpl implements WeChatDllService { // } for (Wcf.DbRow dbRow : wcfList) { - WxPpDatabaseRowResp rowVo = new WxPpDatabaseRowResp(); - List fieldVoList = new ArrayList<>(); + WxPpWcfDatabaseRowResp rowVo = new WxPpWcfDatabaseRowResp(); + List fieldVoList = new ArrayList<>(); for (Wcf.DbField dbField : dbRow.getFieldsList()) { - WxPpDatabaseFieldResp fieldVo = new WxPpDatabaseFieldResp(); + WxPpWcfDatabaseFieldResp fieldVo = new WxPpWcfDatabaseFieldResp(); fieldVo.setType(String.valueOf(dbField.getType())); fieldVo.setColumn(dbField.getColumn()); String value = (String)converterSqlVal(dbField.getType(), dbField.getContent()); @@ -249,7 +249,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public List queryDatabaseTable(WxPpDatabaseTableReq request) { + public List queryDatabaseTable(WxPpWcfDatabaseTableReq request) { log.info("[查询]-[查询表]-request:{}", request); Map wcfMap = wechatSocketClient.getDbTables(request.getDatabaseName()); @@ -258,8 +258,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public List queryGroupMember(WxPpGroupMemberReq request) { - List list = new ArrayList<>(); + public List queryGroupMember(WxPpWcfGroupMemberReq request) { + List list = new ArrayList<>(); // 查询群成员 List wcfList = new ArrayList<>(); if (!ObjectUtils.isEmpty(request.getGroupNo())) { @@ -273,10 +273,10 @@ public class WeChatDllServiceImpl implements WeChatDllService { for (Wcf.DbRow dbRow : dbList) { List dbFieldList = dbRow.getFieldsList(); if (!ObjectUtils.isEmpty(dbFieldList)) { - WxPpGroupMemberResp vo = new WxPpGroupMemberResp(); + WxPpWcfGroupMemberResp vo = new WxPpWcfGroupMemberResp(); for (Wcf.DbField dbField : dbFieldList) { if ("UserName".equals(dbField.getColumn())) { - vo = new WxPpGroupMemberResp(); + vo = new WxPpWcfGroupMemberResp(); String content = (String)converterSqlVal(dbField.getType(), dbField.getContent()); vo.setWeChatUid(content); } @@ -295,14 +295,14 @@ public class WeChatDllServiceImpl implements WeChatDllService { for (Wcf.DbRow dbRow : wcfList) { List dbFieldList = dbRow.getFieldsList(); if (!ObjectUtils.isEmpty(dbFieldList)) { - WxPpGroupMemberResp vo = new WxPpGroupMemberResp(); + WxPpWcfGroupMemberResp vo = new WxPpWcfGroupMemberResp(); for (Wcf.DbField dbField : dbFieldList) { if ("RoomData".equals(dbField.getColumn())) { try { byte[] roomDataBytes = dbField.getContent().toByteArray(); Wcf.RoomData roomData = Wcf.RoomData.parseFrom(roomDataBytes); for (Wcf.RoomData.RoomMember member : roomData.getMembersList()) { - vo = new WxPpGroupMemberResp(); + vo = new WxPpWcfGroupMemberResp(); vo.setWeChatUid(member.getWxid()); String nickName = member.getName(); if (ObjectUtils.isEmpty(nickName)) { @@ -326,7 +326,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public WxPpSendTextMsgResp sendTextMsg(WxPpSendTextMsgReq request) { + public WxPpWcfSendTextMsgResp sendTextMsg(WxPpWcfSendTextMsgReq request) { log.info("[发送消息]-[文本消息]-入参打印:{}", request); String atUser = ""; if (request.getIsAtAll()) { @@ -345,32 +345,32 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public WxPpSendImageMsgResp sendImageMsg(WxPpSendImageMsgReq request) { - WxPpSendImageMsgResp resp = new WxPpSendImageMsgResp(); + public WxPpWcfSendImageMsgResp sendImageMsg(WxPpWcfSendImageMsgReq request) { + WxPpWcfSendImageMsgResp resp = new WxPpWcfSendImageMsgResp(); int state = wechatSocketClient.sendImage(request.getResourcePath(), request.getRecipient()); return null; } @Override - public WxPpSendFileMsgResp sendFileMsg(WxPpSendFileMsgReq request) { + public WxPpWcfSendFileMsgResp sendFileMsg(WxPpWcfSendFileMsgReq request) { int state = wechatSocketClient.sendFile(request.getResourcePath(), request.getRecipient()); return null; } @Override - public WxPpSendXmlMsgResp sendXmlMsg(WxPpSendXmlMsgReq request) { + public WxPpWcfSendXmlMsgResp sendXmlMsg(WxPpWcfSendXmlMsgReq request) { int state = wechatSocketClient.sendXml(request.getRecipient(), request.getXmlContent(), request.getResourcePath(), request.getXmlType()); return null; } @Override - public WxPpSendEmojiMsgResp sendEmojiMsg(WxPpSendEmojiMsgReq request) { + public WxPpWcfSendEmojiMsgResp sendEmojiMsg(WxPpWcfSendEmojiMsgReq request) { int state = wechatSocketClient.sendEmotion(request.getResourcePath(), request.getRecipient()); return null; } @Override - public WxPpSendRichTextMsgResp sendRichTextMsg(WxPpSendRichTextMsgReq request) { + public WxPpWcfSendRichTextMsgResp sendRichTextMsg(WxPpWcfSendRichTextMsgReq request) { Wcf.RichText richTextMsg = Wcf.RichText.newBuilder().setName(request.getName()).setAccount(request.getAccount()).setTitle(request.getTitle()) .setDigest(request.getDigest()).setUrl(request.getJumpUrl()).setThumburl(request.getThumbnailUrl()).setReceiver(request.getRecipient()) .build(); @@ -380,7 +380,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { } @Override - public WxPpSendPatOnePatMsgResp patOnePat(WxPpPatOnePatMsgReq request) { + public WxPpWcfSendPatOnePatMsgResp patOnePat(WxPpWcfPatOnePatMsgReq request) { Wcf.PatMsg patMsg = Wcf.PatMsg.newBuilder().setRoomid(request.getRecipient()).setWxid(request.getPatUser()).build(); Wcf.Request wcfReq = Wcf.Request.newBuilder().setFuncValue(Wcf.Functions.FUNC_SEND_PAT_MSG_VALUE).setPm(patMsg).build(); Wcf.Response rsp = wechatSocketClient.sendCmd(wcfReq); diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java index e081b12..1d20c21 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java @@ -4,7 +4,6 @@ import java.util.Map; import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; @@ -13,7 +12,6 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.wechat.ferry.config.WeChatFerryProperties; import com.wechat.ferry.entity.dto.WxPpMsgDTO; -import com.wechat.ferry.service.WeChatExtService; import com.wechat.ferry.service.WeChatMsgService; import com.wechat.ferry.utils.HttpClientUtil; @@ -29,13 +27,6 @@ import lombok.extern.slf4j.Slf4j; @Service public class WeChatMsgServiceImpl implements WeChatMsgService { - private WeChatExtService weChatExtService; - - @Autowired - public void setWeChatExtService(WeChatExtService weChatExtService) { - this.weChatExtService = weChatExtService; - } - @Resource private WeChatFerryProperties weChatFerryProperties; @@ -49,7 +40,6 @@ public class WeChatMsgServiceImpl implements WeChatMsgService { if (!CollectionUtils.isEmpty(weChatFerryProperties.getOpenMsgGroups())) { // 指定处理的群聊 if (weChatFerryProperties.getOpenMsgGroups().contains(dto.getRoomId())) { - weChatExtService.instructSign(dto); // TODO 这里可以拓展自己需要的功能 } } From 37bc7556461c31bf070106da8d63190b15f4ed9e Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Tue, 8 Oct 2024 00:40:56 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=81=94=E7=B3=BB=E4=BA=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/response/WxPpWcfContactsResp.java | 6 +++--- .../ferry/service/impl/WeChatDllServiceImpl.java | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java index fff6c89..907825e 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/entity/vo/response/WxPpWcfContactsResp.java @@ -34,10 +34,10 @@ public class WxPpWcfContactsResp { private String weChatNickname; /** - * 好友备注 + * 联系人备注 */ - @ApiModelProperty(value = "好友备注") - private String friendRemark; + @ApiModelProperty(value = "联系人备注") + private String weChatRemark; /** * 国家 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 7c9ac61..0415d48 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -118,7 +118,7 @@ public class WeChatDllServiceImpl implements WeChatDllService { WxPpWcfContactsResp vo = new WxPpWcfContactsResp(); vo.setWeChatUid(rpcContact.getWxid()); vo.setWeChatNo(rpcContact.getCode()); - vo.setFriendRemark(rpcContact.getRemark()); + vo.setWeChatRemark(rpcContact.getRemark()); vo.setWeChatNickname(rpcContact.getName()); if (!ObjectUtils.isEmpty(rpcContact.getCountry())) { vo.setCountryPinyin(rpcContact.getCountry()); @@ -152,6 +152,8 @@ public class WeChatDllServiceImpl implements WeChatDllService { mixedNoList.add("filehelper"); // 新闻 mixedNoList.add("newsapp"); + // 公众平台安全助手 + mixedNoList.add("mphelper"); // 微信公众平台 weixingongzhong mixedNoList.add("weixinguanhaozhushou"); // 微信团队 @@ -174,12 +176,13 @@ public class WeChatDllServiceImpl implements WeChatDllService { mixedNoList.add("gh_f08f54ae25a4"); // 微信搜一搜 wechat_search mixedNoList.add("gh_f08f54ae25a4"); + if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.WORK.getAffix())) { // 企微 vo.setType(WxContactsTypeEnum.WORK.getCode()); vo.setTypeLabel(WxContactsTypeEnum.WORK.getName()); - } else if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.GROUP.getAffix())) { - // 群聊 + } else if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.GROUP.getAffix()) || rpcContact.getWxid().endsWith("@im.chatroom")) { + // 群聊 @im.chatroom 这种是很早之前的格式,单独例举 vo.setType(WxContactsTypeEnum.GROUP.getCode()); vo.setTypeLabel(WxContactsTypeEnum.GROUP.getName()); } else if (mixedNoList.contains(rpcContact.getWxid())) { @@ -190,6 +193,13 @@ public class WeChatDllServiceImpl implements WeChatDllService { // 微信公众号 vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); + } else if ("wxid_2876568766325".equals(rpcContact.getWxid()) || "wxid_2965349653612".equals(rpcContact.getWxid()) + || "wxid_4302923029011".equals(rpcContact.getWxid())) { + // 应用宝 yingyongbao wxid_2876568766325 + // i黑马 iheima wxid_2965349653612 + // 丁香医生 DingXiangYiSheng wxid_4302923029011 + vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); + vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); } else { // 个微 vo.setType(WxContactsTypeEnum.PERSON.getCode()); From c0e8c4cc0ed6b80d2c297328390acd4aba2f000a Mon Sep 17 00:00:00 2001 From: chandler <1915724901@qq.com> Date: Thu, 10 Oct 2024 00:10:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(0):=20[java]-[wechat-ferry-mvn]-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E8=BD=AC=E5=8F=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=8A=E6=9F=A5=E8=AF=A2=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ferry/config/WeChatFerryProperties.java | 18 +--- .../service/impl/WeChatDllServiceImpl.java | 83 +++++++++++++++---- .../src/main/resources/application.yml | 14 ++-- 3 files changed, 75 insertions(+), 40 deletions(-) diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java index e70cd8e..32e0578 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/config/WeChatFerryProperties.java @@ -45,24 +45,14 @@ public class WeChatFerryProperties { private List receiveMsgFwdUrls; /** - * 发送消息前转发开关 + * 发送消息转发标识 1-关闭 2-全转发 3-发送成功才转发 */ - private Boolean sendMsgFrontFwdSwitch = false; + private String sendMsgFwdFlag = "1"; /** - * 发送消息前转发URL + * 发送消息转发URL */ - private List sendMsgFrontFwdUrls; - - /** - * 发送消息后转发开关 - */ - private Boolean sendMsgBackFwdSwitch = false; - - /** - * 发送消息后转发URL - */ - private List sendMsgBackFwdUrls; + private List sendMsgFwdUrls; /** * 调用第三方服务客户端成功状态码 diff --git a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java index 0415d48..3a2c580 100644 --- a/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java +++ b/clients/java/wechat-ferry-mvn/src/main/java/com/wechat/ferry/service/impl/WeChatDllServiceImpl.java @@ -9,13 +9,18 @@ import java.util.List; import java.util.Map; import java.util.function.Function; +import javax.annotation.Resource; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; +import com.wechat.ferry.config.WeChatFerryProperties; import com.wechat.ferry.entity.proto.Wcf; import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseSqlReq; import com.wechat.ferry.entity.vo.request.WxPpWcfDatabaseTableReq; @@ -44,6 +49,7 @@ import com.wechat.ferry.enums.SexEnum; import com.wechat.ferry.enums.WxContactsTypeEnum; import com.wechat.ferry.handle.WeChatSocketClient; import com.wechat.ferry.service.WeChatDllService; +import com.wechat.ferry.utils.HttpClientUtil; import lombok.extern.slf4j.Slf4j; @@ -64,6 +70,9 @@ public class WeChatDllServiceImpl implements WeChatDllService { this.wechatSocketClient = wechatSocketClient; } + @Resource + private WeChatFerryProperties weChatFerryProperties; + @Override public Boolean loginStatus() { Boolean status = wechatSocketClient.isLogin(); @@ -152,30 +161,20 @@ public class WeChatDllServiceImpl implements WeChatDllService { mixedNoList.add("filehelper"); // 新闻 mixedNoList.add("newsapp"); - // 公众平台安全助手 - mixedNoList.add("mphelper"); - // 微信公众平台 weixingongzhong - mixedNoList.add("weixinguanhaozhushou"); // 微信团队 mixedNoList.add("weixin"); // 微信支付 wxzhifu - mixedNoList.add("gh_3dfda90e39d6"); + // mixedNoList.add("gh_3dfda90e39d6"); // 微信公开课 wx-gongkaike - mixedNoList.add("gh_c46cbbfa1de9"); - // 微信公开课 wx-gongkaike - mixedNoList.add("gh_c46cbbfa1de9"); + // mixedNoList.add("gh_c46cbbfa1de9"); // 微信运动 WeRun-WeChat - mixedNoList.add("gh_43f2581f6fd6"); + // mixedNoList.add("gh_43f2581f6fd6"); // 微信游戏 game - mixedNoList.add("gh_25d9ac85a4bc"); - // 微信游戏 game - mixedNoList.add("gh_25d9ac85a4bc"); + // mixedNoList.add("gh_25d9ac85a4bc"); // 微信开发者 - mixedNoList.add("gh_56fc3b00cc4f"); + // mixedNoList.add("gh_56fc3b00cc4f"); // 微信搜一搜 wechat_search - mixedNoList.add("gh_f08f54ae25a4"); - // 微信搜一搜 wechat_search - mixedNoList.add("gh_f08f54ae25a4"); + // mixedNoList.add("gh_f08f54ae25a4"); if (rpcContact.getWxid().endsWith(WxContactsTypeEnum.WORK.getAffix())) { // 企微 @@ -194,10 +193,13 @@ public class WeChatDllServiceImpl implements WeChatDllService { vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); } else if ("wxid_2876568766325".equals(rpcContact.getWxid()) || "wxid_2965349653612".equals(rpcContact.getWxid()) - || "wxid_4302923029011".equals(rpcContact.getWxid())) { + || "wxid_4302923029011".equals(rpcContact.getWxid()) || "mphelper".equals(rpcContact.getWxid()) + || "weixinguanhaozhushou".equals(rpcContact.getWxid())) { // 应用宝 yingyongbao wxid_2876568766325 // i黑马 iheima wxid_2965349653612 // 丁香医生 DingXiangYiSheng wxid_4302923029011 + // 公众平台安全助手 mphelper + // 微信公众平台 weixingongzhong weixinguanhaozhushou vo.setType(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getCode()); vo.setTypeLabel(WxContactsTypeEnum.OFFICIAL_ACCOUNT.getName()); } else { @@ -351,6 +353,15 @@ public class WeChatDllServiceImpl implements WeChatDllService { // 0 为成功,其他失败 int state = wechatSocketClient.sendText(request.getMsgText(), request.getRecipient(), atUser); log.info("[发送消息]-[文本消息]-处理结束"); + // 转发处理 + String stringJson = JSON.toJSONString(request); + if ("2".equals(weChatFerryProperties.getSendMsgFwdFlag())) { + // 不管消息是否发送成功均转发 + sendMsgForward(stringJson); + } else if ("3".equals(weChatFerryProperties.getSendMsgFwdFlag()) && 0 == state) { + // 发送成功才转发 + sendMsgForward(stringJson); + } return null; } @@ -440,4 +451,42 @@ public class WeChatDllServiceImpl implements WeChatDllService { return atUserStr; } + private void sendMsgForward(String jsonString) { + // 开启转发,且转发地址不为空 + if (!CollectionUtils.isEmpty(weChatFerryProperties.getSendMsgFwdUrls())) { + for (String receiveMsgFwdUrl : weChatFerryProperties.getSendMsgFwdUrls()) { + if (!receiveMsgFwdUrl.startsWith("http")) { + continue; + } + try { + String responseStr = HttpClientUtil.doPostJson(receiveMsgFwdUrl, jsonString); + if (judgeSuccess(responseStr)) { + log.error("[发送消息]-消息转发外部接口,获取响应状态失败!-URL:{}", receiveMsgFwdUrl); + } + log.debug("[发送消息]-[转发接收到的消息]-转发消息至:{}", receiveMsgFwdUrl); + } catch (Exception e) { + log.error("[发送消息]-消息转发接口[{}]服务异常:", receiveMsgFwdUrl, e); + } + } + } + } + + private Boolean judgeSuccess(String responseStr) { + // 默认为通过 + boolean passFlag = false; + if (!ObjectUtils.isEmpty(responseStr)) { + JSONObject jSONObject = JSONObject.parseObject(responseStr); + if (!ObjectUtils.isEmpty(jSONObject) && !CollectionUtils.isEmpty(weChatFerryProperties.getThirdPartyOkCodes())) { + Map codeMap = weChatFerryProperties.getThirdPartyOkCodes(); + for (Map.Entry entry : codeMap.entrySet()) { + if (!ObjectUtils.isEmpty(jSONObject.get(entry.getKey())) && jSONObject.get(entry.getKey()).equals(entry.getValue())) { + passFlag = true; + break; + } + } + } + } + return passFlag; + } + } diff --git a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml index c809c49..eef6f4d 100644 --- a/clients/java/wechat-ferry-mvn/src/main/resources/application.yml +++ b/clients/java/wechat-ferry-mvn/src/main/resources/application.yml @@ -39,17 +39,13 @@ wechat: # 接收消息转发URL receive-msg-fwd-urls: - http://localhost:9001/msg - # 发送消息前转发开关 - send-msg-front-fwd-switch: false - # 发送消息前转发URL - send-msg-front-fwd-urls: - - http://localhost:9001/msg - # 发送消息后转发开关 - send-msg-back-fwd-switch: false - # 发送消息后转发URL - send-msg-back-fwd-urls: + # 发送消息转发标识 1-关闭 2-全转发 3-发送成功才转发 + send-msg-fwd-flag: '1' + # 发送消息转发URL + send-msg-fwd-urls: - http://localhost:9001/msg # 调用第三方服务客户端成功状态码 third-party-ok-codes: # key:状态码字段 val:状态码值 code: '200' +