1.gov-access和gov-mine微服务调整，修复错误

2.将新服务增加到gateway中

epmet-gateway/pom.xml

@@ -155,6 +155,14 @@
                 <!--   17、党员认证、热心居民申请             -->
 <!--                <gateway.routes.resi-partymember-server.uri>http://127.0.0.1:8096</gateway.routes.resi-partymember-server.uri>-->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
+
+                <!--18.政府端-权限-服务-->
+            <!--<gateway.routes.gov-access-server.uri>http://127.0.0.1:8099</gateway.routes.gov-access-server.uri>-->
+                <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
+
+                <!--19.政府端-我的-服务-->
+            <!--<gateway.routes.gov-mine-server.uri>http://127.0.0.1:8098</gateway.routes.gov-mine-server.uri>-->
+                <gateway.routes.gov-mine-server.uri>lb://gov-mine-server</gateway.routes.gov-mine-server.uri>
             </properties>
         </profile>
         <profile>
@@ -211,6 +219,12 @@
                 <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
+
+                <!--18.政府端-权限-服务-->
+                <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
+
+                <!--19.政府端-我的-服务-->
+                <gateway.routes.gov-mine-server.uri>lb://gov-mine-server</gateway.routes.gov-mine-server.uri>
             </properties>
         </profile>
         <profile>
@@ -267,6 +281,11 @@
                 <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
+                <!--18.政府端-权限-服务-->
+                <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
+
+                <!--19.政府端-我的-服务-->
+                <gateway.routes.gov-mine-server.uri>lb://gov-mine-server</gateway.routes.gov-mine-server.uri>
             </properties>
         </profile>
     </profiles>

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

@@ -167,6 +167,27 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+
+
+        #政府端权限服务
+        - id: gov-access-server
+          uri: @gateway.routes.gov-access-server.uri@
+          order: 18
+          predicates:
+            - Path=${server.servlet.context-path}/gov/access/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
+
+        #政府端-我的-服务
+        - id: gov-mine-server
+          uri: @gateway.routes.gov-mine-server.uri@
+          order: 19
+          predicates:
+            - Path=${server.servlet.context-path}/gov/mine/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -272,6 +293,8 @@ epmet:
     - /resi/mine/**
     - /resi/group/**
     - /resi/partymember/**
+#    - /gov/mine/**
+#    - /gov/access/**
   swaggerUrls:
 
 jwt:

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java

@@ -0,0 +1,17 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("test")
+public class TestController {
+
+    @GetMapping("test")
+    public void test() {
+        System.out.println(666);
+    }
+
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java

@@ -49,7 +49,7 @@ public class StaffAgencyController {
 	 * @Author sun
 	 */
 	@PostMapping("getmygrids")
-	public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(@LoginUser TokenDto tokenDTO) {
+	public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(TokenDto tokenDTO) {
 		return staffAgencyService.getMyGrids(tokenDTO);
 	}