diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 5b943229db..57d6203598 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -155,6 +155,14 @@
lb://resi-partymember-server
+
+
+
+ lb://gov-access-server
+
+
+
+ lb://gov-mine-server
@@ -211,6 +219,12 @@
lb://resi-group-server
lb://resi-partymember-server
+
+
+ lb://gov-access-server
+
+
+ lb://gov-mine-server
@@ -267,6 +281,11 @@
lb://resi-group-server
lb://resi-partymember-server
+
+ lb://gov-access-server
+
+
+ lb://gov-mine-server
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index dec03ba191..d7f1d28a50 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/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:
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java
new file mode 100644
index 0000000000..438f105eab
--- /dev/null
+++ b/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);
+ }
+
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
index a4718c4482..83b649e63a 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
+++ b/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> getMyGrids(@LoginUser TokenDto tokenDTO) {
+ public Result> getMyGrids(TokenDto tokenDTO) {
return staffAgencyService.getMyGrids(tokenDTO);
}