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

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

@@ -0,0 +1,15 @@
+package com.epmet.controller.pa;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 公众号用户的注册、客户创建、跟组织创建 ，查询我的详情等等...api写在这
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/8 17:18
+ */
+@RestController
+@RequestMapping("pacustomer")
+public class PaCustomerController {
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/officialaccount/OfficialAccountCallBackController.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/pa/PublicAccountCallBackController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller.officialaccount;
+package com.epmet.controller.pa;
 
 import com.epmet.commons.tools.utils.Result;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -20,8 +20,8 @@ import java.util.Collections;
  * @date 2020/7/8 12:43
  */
 @RestController
-@RequestMapping("customerservice")
-public class OfficialAccountCallBackController {
+@RequestMapping("pa")
+public class PublicAccountCallBackController {
     private Logger logger = LogManager.getLogger();
     /**
      * @param signature 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。