将 user-service 中的 AccountRegistry 相关接口迁移到 account-service

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AdminAccountController.java

@@ -0,0 +1,47 @@
+package cn.reghao.tnb.account.app.controller;
+
+import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.account.api.dto.AccountRegistry;
+import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
+import cn.reghao.tnb.account.api.iface.AdminAccountService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author reghao
+ * @date 2025-10-22 15:38:20
+ */
+@Tag(name = "account 管理接口")
+@RestController
+@RequestMapping("/api/admin/account")
+public class AdminAccountController {
+    private final AdminAccountService adminAccountService;
+
+    public AdminAccountController(AdminAccountService adminAccountService) {
+        this.adminAccountService = adminAccountService;
+    }
+
+    @Operation(summary = "帐号注册", description = "N")
+    @GetMapping(value = "/account_registry", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String getAccountRegistry() {
+        AccountRegistry accountRegistry = adminAccountService.getAccountRegistry();
+        return WebResult.success(accountRegistry);
+    }
+
+    @Operation(summary = "帐号注册", description = "N")
+    @PostMapping(value = "/registry", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String setAccountRegistry(@RequestBody @Validated AccountRegistryStatus accountRegistryStatus) {
+        adminAccountService.setAccountRegistry(accountRegistryStatus);
+        return WebResult.success();
+    }
+
+    @Operation(summary = "帐号注册", description = "N")
+    @PostMapping(value = "/code", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String setAccountCode(@RequestBody @Validated AccountRegistryStatus accountRegistryStatus) {
+        adminAccountService.setAccountCode(accountRegistryStatus);
+        return WebResult.success();
+    }
+}

gateway/src/main/resources/application.yml

@@ -54,6 +54,12 @@ spring:
             - Path=/oauth/**
           filters:
             - StripPrefix=0
+        - id: account-admin-router
+          uri: lb://account-service
+          predicates:
+            - Path=/api/admin/account/**
+          filters:
+            - StripPrefix=0
         ###############################################################################
         - id: user-router
           uri: lb://user-service

user/user-service/src/main/java/cn/reghao/tnb/user/app/controller/AdminUserController.java

@@ -2,18 +2,13 @@ package cn.reghao.tnb.user.app.controller;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
-import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
-import cn.reghao.tnb.account.api.iface.AdminAccountService;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import cn.reghao.tnb.user.api.dto.VipPlanInfo;
 import cn.reghao.tnb.user.api.dto.WalletChargeDto;
 import cn.reghao.tnb.user.app.service.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -26,35 +21,12 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/admin/user")
 public class AdminUserController {
-    @DubboReference(check = false, timeout = 60_000)
-    private AdminAccountService adminAccountService;
     private final AdminUserService adminUserService;
     
     public AdminUserController(AdminUserService adminUserService) {
         this.adminUserService = adminUserService;
     }
 
-    @Operation(summary = "帐号注册", description = "N")
-    @GetMapping(value = "/account_registry", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getAccountRegistry() {
-        AccountRegistry accountRegistry = adminUserService.getAccountRegistry();
-        return WebResult.success(accountRegistry);
-    }
-
-    @Operation(summary = "帐号注册", description = "N")
-    @PostMapping(value = "/registry", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String setAccountRegistry(@RequestBody @Validated AccountRegistryStatus accountRegistryStatus) {
-        adminAccountService.setAccountRegistry(accountRegistryStatus);
-        return WebResult.success();
-    }
-
-    @Operation(summary = "帐号注册", description = "N")
-    @PostMapping(value = "/code", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String setAccountCode(@RequestBody @Validated AccountRegistryStatus accountRegistryStatus) {
-        adminAccountService.setAccountCode(accountRegistryStatus);
-        return WebResult.success();
-    }
-
     @Operation(summary = "用户帐号列表页面", description = "N")
     @GetMapping(value = "/list", produces = MediaType.APPLICATION_JSON_VALUE)
     public String indexPage(@RequestParam(value = "nextId", required = false) Integer nextId) {

user/user-service/src/main/java/cn/reghao/tnb/user/app/service/AdminUserService.java

@@ -3,7 +3,6 @@ package cn.reghao.tnb.user.app.service;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.account.api.iface.AdminAccountService;
 import cn.reghao.tnb.user.api.dto.UserInfo;
@@ -48,10 +47,6 @@ public class AdminUserService {
         this.userProfileMapper = userProfileMapper;
     }
 
-    public AccountRegistry getAccountRegistry() {
-        return adminAccountService.getAccountRegistry();
-    }
-
     public Page<AccountInfo> getUserAccounts(String searchKey, PageRequest pageRequest) {
         int pageNumber = pageRequest.getPageNumber()+1;
         int pageSize = pageRequest.getPageSize();