From b6cff2739e37a6e0be58d1f01cc01ff56b324746 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 19 Aug 2020 16:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E9=89=B4=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/StaffSinAgencyFormDTO.java | 6 ------
 .../main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java   | 6 ------
 .../main/java/com/epmet/dto/form/StaffSinGridFormDTO.java   | 6 ------
 .../main/java/com/epmet/controller/OpenUpController.java    | 4 ++++
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinAgencyFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinAgencyFormDTO.java
index 5e166ac342..0403bf52b1 100644
--- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinAgencyFormDTO.java
+++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinAgencyFormDTO.java
@@ -17,12 +17,6 @@ public class StaffSinAgencyFormDTO implements Serializable {
     //后端自己看
     public interface StaffSinAgency{}
 
-    /**
-     * appId+customerId+时间戳加密secret
-     */
-//    @NotBlank(message = "secret不能为空",groups = {StaffSinDept.class})
-    private String accessToken;
-
     /**
      * 机关Id
      */
diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java
index b66de79686..3e69297c27 100644
--- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java
+++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java
@@ -17,12 +17,6 @@ public class StaffSinDeptFormDTO implements Serializable {
     //后端自己看
     public interface StaffSinDept{}
 
-    /**
-     * appId+customerId+时间戳加密secret
-     */
-//    @NotBlank(message = "secret不能为空",groups = {StaffSinDept.class})
-    private String accessToken;
-
     /**
      * 部门Id
      */
diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
index a694dfddb1..8b93d60979 100644
--- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
+++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
@@ -18,12 +18,6 @@ public class StaffSinGridFormDTO implements Serializable {
     //后端自己看
     public interface StaffSinGrid{}
 
-    /**
-     * appId+customerId+时间戳加密secret
-     */
-//    @NotBlank(message = "secret不能为空",groups = {StaffSinGrid.class})
-    private String accessToken;
-
     /**
      * 网格Id
      */
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
index 1f29c98390..b5849f78dc 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
@@ -33,6 +34,7 @@ public class OpenUpController {
      * @author zxc
      * @date 2020/8/13 9:42 上午
      */
+    @ExternalAppRequestAuth
     @PostMapping("staffsingrid")
     public Result<List<StaffSinGridResultDTO>> staffSinGrid(@RequestBody StaffSinGridFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StaffSinGridFormDTO.StaffSinGrid.class);
@@ -45,6 +47,7 @@ public class OpenUpController {
      * @author zxc
      * @date 2020/8/13 9:51 上午
      */
+    @ExternalAppRequestAuth
     @PostMapping("staffsindept")
     public Result<List<StaffSinDeptResultDTO>> staffSinDept(@RequestBody StaffSinDeptFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StaffSinDeptFormDTO.StaffSinDept.class);
@@ -57,6 +60,7 @@ public class OpenUpController {
      * @author zxc
      * @date 2020/8/17 9:59 上午
      */
+    @ExternalAppRequestAuth
     @PostMapping("staffsinagency")
     public Result<List<StaffSinAgencyResultDTO>> staffSinAgency(@RequestBody StaffSinAgencyFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StaffSinAgencyFormDTO.StaffSinAgency.class);