diff --git a/AGENTS.md b/AGENTS.md index 14ceeb4a2..8456171e4 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -130,6 +130,7 @@ cd frontend && npm run check-i18n - Java 中能用 Lombok 解决 getter / setter 模板代码的地方,优先使用 Lombok。 - 重复胶水代码要适度收敛,但收敛方式不能比原逻辑更难懂。 - 注释只解释不明显的业务约束、协议边界或复杂流程,不写重复代码字面含义的注释。 +- 前端调用后端时,使用的接口名称要求格式为驼峰命名法。 ## Java 后端规则 diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/approval/ApprovalController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/approval/ApprovalController.java index 62648fd2a..7e9c46efc 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/approval/ApprovalController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/approval/ApprovalController.java @@ -197,7 +197,7 @@ public ResWebData endAutoExecJob(@Valid @RequestBody DmTicketFO fo, HttpServl // @RequestAuth(level = HIGH, value = RDP_WORKER_ORDER_READ) - @RequestMapping(value = "/listbasic", method = RequestMethod.POST) + @RequestMapping(value = "/listBasic", method = RequestMethod.POST) public ResWebData listTicketsBasic(@Valid @RequestBody RdpListTicketFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/ClusterController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/ClusterController.java index fbd4b387f..cf31bf276 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/ClusterController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/ClusterController.java @@ -79,7 +79,7 @@ public ResWebData deleteCluster(@RequestBody @Valid DeleteClusterFO fo, HttpS } @RequestAuth(DM_WORKER_MANAGE) - @RequestMapping(value = "/updatedesc", method = RequestMethod.POST) + @RequestMapping(value = "/updateDesc", method = RequestMethod.POST) public ResWebData updateClusterDesc(@RequestBody @Valid UpdateClusterDescFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownCluster(puid, fo.getClusterId()); @@ -89,7 +89,7 @@ public ResWebData updateClusterDesc(@RequestBody @Valid UpdateClusterDescFO f } @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/listbycondition", method = RequestMethod.POST) + @RequestMapping(value = "/listByCondition", method = RequestMethod.POST) public ResWebData listByCondition(@RequestBody @Valid ListClustersFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -98,7 +98,7 @@ public ResWebData listByCondition(@RequestBody @Valid ListClustersFO fo, Http } @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/listwithworkernets", method = RequestMethod.POST) + @RequestMapping(value = "/listWithWorkerNets", method = RequestMethod.POST) public ResWebData listWithWorkerNets(HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -113,7 +113,7 @@ public ResWebData listWithWorkerNets(HttpServletRequest request) { } @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/querybyid", method = RequestMethod.POST) + @RequestMapping(value = "/queryById", method = RequestMethod.POST) public ResWebData queryById(@RequestBody @Valid QueryClusterFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownCluster(puid, fo.getClusterId()); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/WorkerController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/WorkerController.java index fa11fdd09..f994f68af 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/WorkerController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/cluster/WorkerController.java @@ -63,7 +63,7 @@ public class WorkerController { private WorkerDetector workerDetector; @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/listworkers", method = RequestMethod.POST) + @RequestMapping(value = "/listWorkers", method = RequestMethod.POST) public ResWebData listWorkers(@Valid @RequestBody ListWorkersFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownCluster(puid, fo.getClusterId()); @@ -74,7 +74,7 @@ public ResWebData listWorkers(@Valid @RequestBody ListWorkersFO fo, HttpServl } @RequestAuth(DM_WORKER_MANAGE) - @RequestMapping(value = "/updateworkerdesc", method = RequestMethod.POST) + @RequestMapping(value = "/updateWorkerDesc", method = RequestMethod.POST) public ResWebData updateWorkerDesc(@Valid @RequestBody UpdateWorkerDescFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -84,7 +84,7 @@ public ResWebData updateWorkerDesc(@Valid @RequestBody UpdateWorkerDescFO fo, } @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/queryworkerbyid", method = RequestMethod.POST) + @RequestMapping(value = "/queryWorkerById", method = RequestMethod.POST) public ResWebData queryWorkerById(@Valid @RequestBody QueryWorkerFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -95,7 +95,7 @@ public ResWebData queryWorkerById(@Valid @RequestBody QueryWorkerFO fo, HttpS } @RequestAuth(level = HIGH, value = DM_WORKER_MANAGE) - @RequestMapping(value = "/createinitialworker", method = RequestMethod.POST) + @RequestMapping(value = "/createInitialWorker", method = RequestMethod.POST) public ResWebData createInitialWorker(@Valid @RequestBody CreateInitialWorkerFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownCluster(puid, fo.getClusterId()); @@ -105,7 +105,7 @@ public ResWebData createInitialWorker(@Valid @RequestBody CreateInitialWorker } @RequestAuth(level = HIGH, value = DM_WORKER_MANAGE) - @RequestMapping(value = "/deleteworker", method = RequestMethod.POST) + @RequestMapping(value = "/deleteWorker", method = RequestMethod.POST) public ResWebData deleteWorker(@Valid @RequestBody DeleteWorkerFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -115,7 +115,7 @@ public ResWebData deleteWorker(@Valid @RequestBody DeleteWorkerFO fo, HttpSer } @RequestAuth(level = HIGH, value = DM_WORKER_MANAGE) - @RequestMapping(value = "/waittooffline", method = RequestMethod.POST) + @RequestMapping(value = "/waitToOffline", method = RequestMethod.POST) public ResWebData waitToOffline(@Valid @RequestBody WaitToOfflineFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -125,7 +125,7 @@ public ResWebData waitToOffline(@Valid @RequestBody WaitToOfflineFO fo, HttpS } @RequestAuth(level = HIGH, value = DM_WORKER_MANAGE) - @RequestMapping(value = "/waittoonline", method = RequestMethod.POST) + @RequestMapping(value = "/waitToOnline", method = RequestMethod.POST) public ResWebData waitToOnline(@Valid @RequestBody WaitToOnlineFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -135,8 +135,8 @@ public ResWebData waitToOnline(@Valid @RequestBody WaitToOnlineFO fo, HttpSer } @RequestAuth(DM_WORKER_READ) - @RequestMapping(value = "/downloadclienturl", method = RequestMethod.POST) - public ResWebData downLoadClientUrl(@Valid @RequestBody ClientUrlFO fo, HttpServletRequest request) { + @RequestMapping(value = "/downloadClientUrl", method = RequestMethod.POST) + public ResWebData downloadClientUrl(@Valid @RequestBody ClientUrlFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); this.objectCacheDao.ownWorker(puid, fo.getWorkerId()); @@ -145,7 +145,7 @@ public ResWebData downLoadClientUrl(@Valid @RequestBody ClientUrlFO fo, HttpS } @RequestAuth(level = HIGH, value = DM_WORKER_READ) - @RequestMapping(value = "/clientcoreconfig", method = RequestMethod.POST) + @RequestMapping(value = "/clientCoreConfig", method = RequestMethod.POST) public ResWebData clientCoreConfig(@Valid @RequestBody ClientCoreConfFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/datasource/DmDsController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/datasource/DmDsController.java index 258c5cc2f..e4b79c44d 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/datasource/DmDsController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/datasource/DmDsController.java @@ -100,7 +100,7 @@ public class DmDsController { private DmDsConfigService dmDsConfigService; @RequestAuth(DM_DS_READ) - @RequestMapping(value = "/listbycondition", method = RequestMethod.POST) + @RequestMapping(value = "/listByCondition", method = RequestMethod.POST) public ResWebData listByCondition(@RequestBody @Valid ListDsFO listDsFO, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -240,7 +240,7 @@ public ResWebData disableDsDevOps(@Valid @RequestBody DisableDsDevOpsFO fo, H } @RequestAuth(DM_DS_READ) - @RequestMapping(value = "/querydsconfig", method = RequestMethod.POST) + @RequestMapping(value = "/queryDsConfig", method = RequestMethod.POST) public ResWebData queryDsConfig(@RequestBody QueryDsConfigFO fo, HttpServletRequest request) { String uid = (String) request.getAttribute(RdpUserService.UID); String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -256,7 +256,7 @@ public ResWebData queryDsConfig(@RequestBody QueryDsConfigFO fo, HttpServletR } @RequestAuth(DM_DS_MANAGE) - @RequestMapping(value = "/connectds", method = RequestMethod.POST) + @RequestMapping(value = "/connectDs", method = RequestMethod.POST) public ResWebData connectDs(@Valid @RequestBody ConnectDsFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -279,7 +279,7 @@ public ResWebData connectDs(@Valid @RequestBody ConnectDsFO fo, HttpServletRe } @RequestAuth(value = DM_DS_MANAGE, level = HIGH) - @RequestMapping(value = "/upsertdsconfig", method = RequestMethod.POST) + @RequestMapping(value = "/upsertDsConfig", method = RequestMethod.POST) public ResWebData upsertDsConfig(@RequestBody UpsertDsConfigFO fo, HttpServletRequest request) { String uid = (String) request.getAttribute(RdpUserService.UID); String puid = (String) request.getAttribute(RdpUserService.PUID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/QueryEditorController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/QueryEditorController.java index 92ff288c0..0b29afb50 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/QueryEditorController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/QueryEditorController.java @@ -102,7 +102,7 @@ public class QueryEditorController { private DmSupportSpiWrapper dmSupportSpiWrapper; @RequestAuth(checkOpPassword = true, value = DM_QUERY_CONSOLE) - @RequestMapping(value = "/createsession", method = RequestMethod.POST) + @RequestMapping(value = "/createSession", method = RequestMethod.POST) public ResWebData createSession(@Valid @RequestBody CreateSessionFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -116,7 +116,7 @@ public ResWebData createSession(@Valid @RequestBody CreateSessionFO fo, HttpS } @RequestAuth(DM_QUERY_CONSOLE) - @RequestMapping(value = "/closesession", method = RequestMethod.POST) + @RequestMapping(value = "/closeSession", method = RequestMethod.POST) public ResWebData closeSession(@Valid @RequestBody CloseSessionFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -125,16 +125,6 @@ public ResWebData closeSession(@Valid @RequestBody CloseSessionFO fo, HttpSer return ResWebDataUtils.buildSuccess(fo.getSessionId()); } - @RequestAuth(checkOpPassword = true, value = DM_QUERY_CONSOLE) - @RequestMapping(value = "/listsession", method = RequestMethod.POST) - public ResWebData> sessionList(HttpServletRequest request) { - String puid = (String) request.getAttribute(RdpUserService.PUID); - String uid = (String) request.getAttribute(RdpUserService.UID); - - List vos = this.queryService.getSessionList(puid, uid); - return ResWebDataUtils.buildSuccess(vos); - } - @RequestAuth(checkOpPassword = true, value = DM_QUERY_CONSOLE) @RequestMapping(value = "/fetchDsStatusConf", method = RequestMethod.POST) public ResWebData fetchDsStatusConf(@Valid @RequestBody AvailableDsFO fo, HttpServletRequest request) { @@ -205,31 +195,6 @@ private static DsStatusSupportConfVO convertToSupportedInfoMap(String i18nKey, R return vo; } - @RequestAuth(DM_QUERY_CONSOLE) - @RequestMapping(value = "/rdbColumns", method = RequestMethod.POST) - public ResWebData rdbColumns(@Valid @RequestBody BatchColumnsFO fo, HttpServletRequest request) { - String puid = (String) request.getAttribute(RdpUserService.PUID); - String uid = (String) request.getAttribute(RdpUserService.UID); - - DsLevels levels = this.dmDsConfigService.parseLevels(fo.getLevels()); - this.objectCacheDao.ownDataSource(puid, levels.dsDO().getId()); - - UmiTypes leafType = UmiTypes.valueOfCode(fo.getTargetType()); - List leafName = fo.getTargetNames(); - - leafName = leafName.stream().filter(tabName -> { - DsResPath dsResource = RdpAuthUtils.genResPathByList(levels.dbLevels(), tabName); - return this.dmAuthServiceForBiz.checkResPathWithoutError(puid, uid, levels.dsDO().getId(), AuthKind.DataSource, dsResource, SecDataAuthLabel.DM_DAUTH_QUERY); - }).collect(Collectors.toList()); - - if (leafName.isEmpty()) { - return ResWebDataUtils.buildSuccess(Collections.emptyMap()); - } - - Map> result = this.queryService.rdbBatchColumns(puid, uid, levels, leafType, leafName); - return ResWebDataUtils.buildSuccess(result); - } - @RequestAuth(DM_QUERY_CONSOLE) @RequestMapping(value = "/closeResultWindow", method = RequestMethod.POST) public ResWebData closeResultWindow(@Valid @RequestBody CloseResultWindowFO fo, HttpServletRequest request) { diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/TestController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/TestController.java index c69b46544..0f4ac696c 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/TestController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/editor/query/TestController.java @@ -111,63 +111,6 @@ public void stop() { } - @RequestMapping(value = "/doQuery", method = RequestMethod.POST) - public ResWebData doQuery(@RequestBody WsQueryFO wsQueryFO, HttpServletRequest request) { - if (!openTest) { - throw new UnsupportedOperationException(); - } - String puid = (String) request.getAttribute(RdpUserService.PUID); - String uid = (String) request.getAttribute(RdpUserService.UID); - - wsQueryFO.setCurrentUserId(uid); - wsQueryFO.setPrimaryUserId(puid); - wsQueryFO.setChannelKey(UUID.randomUUID().toString()); - - checkMap.put(wsQueryFO.getSessionId(), false); - - this.queryServiceApi.offerQueryRequest(wsQueryFO, DmGlobalEventBus::triggerQueryResultEvent); - return ResWebDataUtils.buildSuccess(); - } - - @RequestMapping(value = "/queryResults", method = RequestMethod.POST) - public ResWebData queryResults(@RequestBody QueryResultFO fo, HttpServletRequest request) { - if (!openTest) { - throw new UnsupportedOperationException(); - } - QueryResultVO queryResultVO = new QueryResultVO(); - String sessionId = fo.getSessionId(); - if (checkMap.get(sessionId) == null || !checkMap.get(sessionId)) { - throw new ErrorMessageException("query is running"); - } - checkMap.remove(sessionId); - List wsResMsgs = map.remove(sessionId); - - for (WsQueryResult wsResMsg : wsResMsgs) { - if (wsResMsg instanceof WsInfoResMsg wsInfoResMsg) { - for (WsInfoEntity entity : wsInfoResMsg.getEntities()) { - if (entity.getMode() == MessageMode.Console) { - queryResultVO.getWsInfoResMsgList().add(wsInfoResMsg); - } - } - } else if (wsResMsg instanceof WsResultSetMsg wsResultSetResMsg) { - queryResultVO.getResultSetResMsgList().add(wsResultSetResMsg); - } else if (wsResMsg instanceof WsStatusResMsg wsStatusResMsg) { - queryResultVO.getStatusResMsgList().add(wsStatusResMsg); - } else if (wsResMsg instanceof WsRuleResMsg wsRuleResMsg) { - queryResultVO.getWsRuleResMsgList().add(wsRuleResMsg); - } - } - return ResWebDataUtils.buildSuccess(queryResultVO); - } - - @RequestMapping(value = "/checkQuery", method = RequestMethod.POST) - public ResWebData checkQuery(@RequestBody QueryResultFO fo, HttpServletRequest request) { - if (!openTest) { - throw new UnsupportedOperationException(); - } - return ResWebDataUtils.buildSuccess(checkMap.get(fo.getSessionId())); - } - @RequestAuth(strategy = RequestAuth.AuthStrategy.Ignore) @RequestMapping(value = "/encrypt", method = RequestMethod.POST) public ResWebData encrypt(String password) { diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/system/DmHomeController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/system/DmHomeController.java index 2e9a9855b..07806abba 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/system/DmHomeController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/controller/system/DmHomeController.java @@ -209,7 +209,7 @@ private Object redirectOrDone(HttpServletRequest request, HttpServletResponse re } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/check_supplement", method = { RequestMethod.POST }) + @RequestMapping(value = "/checkSupplement", method = { RequestMethod.POST }) public ResWebData checkSupplement(@Valid @RequestBody CheckSubAccountBindInfoFO checkFO, HttpServletResponse response) { String puid = checkFO.getPrimaryUid(); CheckSubAccountMO re = userService.checkSubAccount(puid, checkFO); @@ -318,7 +318,7 @@ protected void fillResponseJwtToken(String token, HttpServletResponse response) } @RequestAuth(strategy = RequestAuth.AuthStrategy.Ignore) - @RequestMapping(value = DmControllerUrlPrefix.CONSOLE_PREFIX + "/dm_global_settings", method = { RequestMethod.POST }) + @RequestMapping(value = DmControllerUrlPrefix.CONSOLE_PREFIX + "/dmGlobalSettings", method = { RequestMethod.POST }) public ResWebData dmGlobalSettings() { GlobalSettingsVO vo = new GlobalSettingsVO(); vo.setVersion(GlobalConfUtils.getAppVersion()); @@ -337,7 +337,7 @@ public ResWebData dmGlobalSettings() { } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/global_settings", method = { RequestMethod.POST }) + @RequestMapping(value = "/globalSettings", method = { RequestMethod.POST }) public ResWebData globalSettings(HttpServletRequest request, HttpServletResponse response) { RdpGlobalSettingsVO settings = new RdpGlobalSettingsVO(); settings.setFeatures(new HashMap<>()); @@ -354,7 +354,7 @@ public ResWebData globalSettings(HttpServletRequest request, HttpServletRespo } @RequestAuth(strategy = RequestAuth.AuthStrategy.Ignore) - @RequestMapping(value = DmControllerUrlPrefix.CONSOLE_PREFIX + "/dm_console_settings", method = { RequestMethod.POST }) + @RequestMapping(value = DmControllerUrlPrefix.CONSOLE_PREFIX + "/dmConsoleSettings", method = { RequestMethod.POST }) public ResWebData dmConsoleSettings(HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpConstantController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpConstantController.java index f0aa56e0c..cf4cfb090 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpConstantController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpConstantController.java @@ -47,7 +47,7 @@ public class RdpConstantController { .asList(Db2, Db2Fori, GaussDB, GaussDBForOpenGauss, KingbaseES, MariaDB, MySQL, ObForOracle, OceanBase, Oracle, PostgreSQL, SQLServer, TiDB, ClickHouse, Doris, Greenplum, SelectDB, StarRocks, PolarDBPg, PolarDbMySQL, PolarDbX, AdbForMySQL, Hologres, MaxCompute, MongoDB, Redis); @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/listregionareas", method = RequestMethod.POST) + @RequestMapping(value = "/listRegionAreas", method = RequestMethod.POST) public ResWebData listRegionAreas() { List re = new ArrayList<>(); for (RegionArea ra : RegionArea.values()) { @@ -59,14 +59,14 @@ public ResWebData listRegionAreas() { } @RequestAuth(strategy = RequestAuth.AuthStrategy.Ignore) - @RequestMapping(value = "/listfilterdstypes", method = RequestMethod.POST) + @RequestMapping(value = "/listFilterDsTypes", method = RequestMethod.POST) public ResWebData listFilterDsTypes() { List dsTypes = Arrays.stream(DataSourceType.values()).map(Enum::name).collect(Collectors.toList()); return ResWebDataUtils.buildSuccess(dsTypes); } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/listdstypesbydeploytype", method = RequestMethod.POST) + @RequestMapping(value = "/listDsTypesByDeployType", method = RequestMethod.POST) public ResWebData listDsTypesByDeployType() { List> result = DataSourceType.groupByDisplay(SUPPORTED_DS_TYPES).stream().map(this::toDsTypeNames).collect(Collectors.toList()); return ResWebDataUtils.buildSuccess(result); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsConstantController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsConstantController.java index a3bf35cab..3baf4484a 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsConstantController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsConstantController.java @@ -33,7 +33,6 @@ import com.clougence.clouddm.base.metadata.rdp.enumeration.SecurityType; import com.clougence.clouddm.console.web.global.jwtsession.RequestAuth; import com.clougence.clouddm.console.web.global.jwtsession.RequestAuth.AuthStrategy; -import com.clougence.clouddm.console.web.model.fo.ConnectTypeByDsFO; import com.clougence.clouddm.console.web.model.fo.DsSecurityOptionFO; import com.clougence.clouddm.console.web.model.vo.ConnectTypeVO; import com.clougence.clouddm.console.web.model.vo.DsSecurityDetailVO; @@ -61,19 +60,19 @@ public class RdpDsConstantController { } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/dsllmembeddingtypes", method = RequestMethod.POST) + @RequestMapping(value = "/dsLlmEmbeddingTypes", method = RequestMethod.POST) public ResWebData dsLlmEmbeddingTypes() { return ResWebDataUtils.buildSuccess(LLM_EMBEDDING_DS); } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/dsllmchattypes", method = RequestMethod.POST) + @RequestMapping(value = "/dsLlmChatTypes", method = RequestMethod.POST) public ResWebData dsLlmChatTypes() { return ResWebDataUtils.buildSuccess(LLM_CHAT_DS); } @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/dsconnecttype", method = RequestMethod.POST) + @RequestMapping(value = "/dsConnectType", method = RequestMethod.POST) public ResWebData dsConnectType() { List vos = new ArrayList<>(); for (ConnectType c : ConnectType.values()) { @@ -90,33 +89,11 @@ public ResWebData dsConnectType() { return ResWebDataUtils.buildSuccess(vos); } - @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/connecttypebyds", method = RequestMethod.POST) - public ResWebData connectTypeByDs(@Valid @RequestBody ConnectTypeByDsFO dsFO) { - List vos = new ArrayList<>(); - for (ConnectType c : ConnectType.values()) { - if (dsFO.getDataSourceType() != c.getDsType()) { - continue; - } - - ConnectTypeVO v; - if (c == ConnectType.ORACLE_SID || c == ConnectType.CLICKHOUSE_HTTP) { - v = new ConnectTypeVO(c, true); - } else { - v = new ConnectTypeVO(c, false); - } - - vos.add(v); - } - - return ResWebDataUtils.buildSuccess(vos); - } - private static final String DEFAULT_DB_NAME_LABEL_PREFIX = "DEFAULT_DB_NAME_LABEL_"; public static final String DEFAULT_DB_NAME_LABEL_RDB = DEFAULT_DB_NAME_LABEL_PREFIX + "RDB"; @RequestAuth(strategy = AuthStrategy.Ignore) - @RequestMapping(value = "/dssecurityoption", method = RequestMethod.POST) + @RequestMapping(value = "/dsSecurityOption", method = RequestMethod.POST) public ResWebData dsSecurityOption(@Valid @RequestBody DsSecurityOptionFO data) { DsSecurityDetailVO detail = new DsSecurityDetailVO(); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsController.java index 768304a96..281eb37ed 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpDsController.java @@ -93,7 +93,7 @@ public class RdpDsController { private DmDsDeletePrepareService dmDsDeletePrepareService; @RequestAuth(RDP_DS_READ) - @RequestMapping(value = "/listbycondition", method = RequestMethod.POST) + @RequestMapping(value = "/listByCondition", method = RequestMethod.POST) public ResWebData listByCondition(@RequestBody @Valid ListDsFO listDsFO, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -158,7 +158,7 @@ protected RdpSimpleDsVO genRdpSimpleDsVO(DmDsDO dsDO) { } @RequestAuth(RDP_DS_READ) - @RequestMapping(value = "/queryds", method = RequestMethod.POST) + @RequestMapping(value = "/queryDs", method = RequestMethod.POST) public ResWebData queryDs(@RequestBody @Valid QueryDsFO queryDsFO, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -245,7 +245,7 @@ public ResWebData delDs(@RequestBody @Valid DeleteDsFO deleteDsFO, HttpServle } @RequestAuth(RDP_DS_READ) - @RequestMapping(value = "/querydsconfig", method = RequestMethod.POST) + @RequestMapping(value = "/queryDsConfig", method = RequestMethod.POST) public ResWebData queryDsConfig(@RequestBody QueryDsConfigFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -260,7 +260,7 @@ public ResWebData queryDsConfig(@RequestBody QueryDsConfigFO fo, HttpServletR } @RequestAuth(RDP_DS_READ) - @RequestMapping(value = "/queryllmconfig", method = RequestMethod.POST) + @RequestMapping(value = "/queryLLMConfig", method = RequestMethod.POST) public ResWebData queryLLMConfig(@RequestBody DsLLMConfigModelsFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -298,7 +298,7 @@ public ResWebData queryLLMConfig(@RequestBody DsLLMConfigModelsFO fo, HttpSer } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/upsertdsconfig", method = RequestMethod.POST) + @RequestMapping(value = "/upsertDsConfig", method = RequestMethod.POST) public ResWebData upsertDsConfig(@RequestBody UpsertDsKvConfigFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -313,7 +313,7 @@ public ResWebData upsertDsConfig(@RequestBody UpsertDsKvConfigFO fo, HttpServ } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/updatedatasourcedesc", method = RequestMethod.POST) + @RequestMapping(value = "/updateDataSourceDesc", method = RequestMethod.POST) public ResWebData updateDataSourceDesc(@RequestBody @Valid UpdateDsDescFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -328,7 +328,7 @@ public ResWebData updateDataSourceDesc(@RequestBody @Valid UpdateDsDescFO fo, } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/updateaccountandpassword", method = RequestMethod.POST) + @RequestMapping(value = "/updateAccountAndPassword", method = RequestMethod.POST) public ResWebData updateAccountAndPassword(@RequestParam("DataSourceUpdateData") String data, @RequestParam(value = "securityFile", required = false) MultipartFile securityFile, @RequestParam(value = "clientSecurityFile", required = false) MultipartFile clientSecurityFile, @@ -354,7 +354,7 @@ public ResWebData updateAccountAndPassword(@RequestParam("DataSourceUpdateDat } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/deleteaccount", method = RequestMethod.POST) + @RequestMapping(value = "/deleteAccount", method = RequestMethod.POST) public ResWebData deleteAccount(@RequestBody @Valid DeleteAccountFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -368,7 +368,7 @@ public ResWebData deleteAccount(@RequestBody @Valid DeleteAccountFO fo, HttpS } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/updatepublichost", method = RequestMethod.POST) + @RequestMapping(value = "/updatePublicHost", method = RequestMethod.POST) public ResWebData updatePublicHost(@RequestBody @Valid UpdatePubHostFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -383,7 +383,7 @@ public ResWebData updatePublicHost(@RequestBody @Valid UpdatePubHostFO fo, Ht } @RequestAuth(level = SecurityLevel.HIGH, value = RDP_DS_MANAGE) - @RequestMapping(value = "/updateprivatehost", method = RequestMethod.POST) + @RequestMapping(value = "/updatePrivateHost", method = RequestMethod.POST) public ResWebData updatePrivateHost(@RequestBody @Valid UpdatePriHostFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpResAuthController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpResAuthController.java index 1bd5ba79a..ca2f6dbf3 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpResAuthController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpResAuthController.java @@ -214,13 +214,4 @@ public ResWebData> listMyAuthRes(@Valid @RequestBody ListMyAuthR return ResWebDataUtils.buildSuccess(collect); } - @RequestAuth(strategy = Ignore) - @RequestMapping(value = "/listMyAuthTicket", method = RequestMethod.POST) - public ResWebData listMyAuthTicket(@Valid @RequestBody ListMyAuthTicketFO fo, HttpServletRequest request) { - String uid = (String) request.getAttribute(RdpUserService.UID); - fo.setUid(uid); - IPage data = this.approvalControlService.queryAuthTicketListByPage(uid, fo); - return ResWebDataUtils.buildSuccess(data); - } - } diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserConfigController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserConfigController.java index 04081de63..dcdb777ee 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserConfigController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserConfigController.java @@ -65,7 +65,7 @@ public class RdpUserConfigController { private RdpOpAuditService rdpOpAuditService; @RequestAuth(strategy = AuthStrategy.RefAnyOnes) - @RequestMapping(value = "/getcurruserconfigs", method = RequestMethod.POST) + @RequestMapping(value = "/getCurrUserConfigs", method = RequestMethod.POST) public ResWebData getCurrUserConfigs(HttpServletRequest request) { // prepare auth info String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -89,7 +89,7 @@ public ResWebData getUserSpecifiedConfs(@RequestBody @Valid GetUserSpecifiedC } @RequestAuth(level = HIGH, value = RDP_PRI_USER_KV_CONF_W) - @RequestMapping(value = "/upsertuserconfigs", method = RequestMethod.POST) + @RequestMapping(value = "/upsertUserConfigs", method = RequestMethod.POST) public ResWebData upsertUserConfigs(@RequestBody @Valid UpsertUserConfigFO configFO, HttpServletRequest request) { if (CollectionUtils.isEmpty(configFO.getUpdateConfigs()) && CollectionUtils.isEmpty(configFO.getNeedCreateConfigs())) { throw new ErrorMessageException(DmI18nUtils.getMessage(I18nRdpMsgKeys.UPDATE_USER_CONFIG_PARAMS_ARE_EMPTY.name())); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserManagerController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserManagerController.java index 8814dfec1..af37e0d42 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserManagerController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpUserManagerController.java @@ -84,7 +84,7 @@ public class RdpUserManagerController { private RdpOpAuditService rdpOpAuditService; @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/resetpasswd", method = { RequestMethod.POST }) + @RequestMapping(value = "/resetPasswd", method = { RequestMethod.POST }) public ResWebData resetPasswd(@Valid @RequestBody ResetPasswdFO fo, HttpServletRequest request) { String uid = (String) request.getAttribute(RdpUserService.UID); @@ -126,7 +126,7 @@ public ResWebData resetPasswd(@Valid @RequestBody ResetPasswdFO fo, HttpServl } @RequestAuth(level = HIGH, value = RDP_USER_READ) - @RequestMapping(value = "/listsubaccounts", method = { RequestMethod.POST }) + @RequestMapping(value = "/listSubAccounts", method = { RequestMethod.POST }) public ResWebData listSubAccounts(@Valid @RequestBody ListSubAccountsFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); List users = this.rdpUserService.listSubAccounts(puid, fo); @@ -134,13 +134,13 @@ public ResWebData listSubAccounts(@Valid @RequestBody ListSubAccountsFO fo, H } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/ctrl_addsubaccount", method = RequestMethod.POST) + @RequestMapping(value = "/ctrlAddSubAccount", method = RequestMethod.POST) public ResWebData ctrlAddSubAccount() { return ResWebDataUtils.buildSuccess(); } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/addsubaccount", method = { RequestMethod.POST }) + @RequestMapping(value = "/addSubAccount", method = { RequestMethod.POST }) public ResWebData addSubAccount(@Valid @RequestBody AddSubAccountFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -159,7 +159,7 @@ public ResWebData addSubAccount(@Valid @RequestBody AddSubAccountFO fo, HttpS } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/updatesubaccount", method = { RequestMethod.POST }) + @RequestMapping(value = "/updateSubAccount", method = { RequestMethod.POST }) public ResWebData updateSubAccount(@Valid @RequestBody UpdateSubAccountFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -180,7 +180,7 @@ public ResWebData updateSubAccount(@Valid @RequestBody UpdateSubAccountFO fo, } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/checksubaccountduplicate", method = { RequestMethod.POST }) + @RequestMapping(value = "/checkSubAccountDuplicate", method = { RequestMethod.POST }) public ResWebData checkSubAccountDuplicate(@Valid @RequestBody CheckSubAccountFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -193,7 +193,7 @@ public ResWebData checkSubAccountDuplicate(@Valid @RequestBody CheckSubAccoun } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/deletesubaccount", method = { RequestMethod.POST }) + @RequestMapping(value = "/deleteSubAccount", method = { RequestMethod.POST }) public ResWebData deleteSubAccount(@Valid @RequestBody DeleteSubAccountFO fo, HttpServletRequest request) { String puid = (String) request.getAttribute(RdpUserService.PUID); String uid = (String) request.getAttribute(RdpUserService.UID); @@ -226,7 +226,7 @@ public ResWebData deleteSubAccount(@Valid @RequestBody DeleteSubAccountFO fo, } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/updateuserrole", method = RequestMethod.POST) + @RequestMapping(value = "/updateUserRole", method = RequestMethod.POST) public ResWebData updateUserRole(@Valid @RequestBody UpdateUserRoleFO fo, HttpServletRequest request, HttpServletResponse response) { String uid = (String) request.getAttribute(RdpUserService.UID); String puid = (String) request.getAttribute(RdpUserService.PUID); @@ -254,7 +254,7 @@ public ResWebData updateUserRole(@Valid @RequestBody UpdateUserRoleFO fo, Htt } @RequestAuth(level = HIGH, value = RDP_USER_MANAGE) - @RequestMapping(value = "/updateaccountability", method = RequestMethod.POST) + @RequestMapping(value = "/updateAccountAbility", method = RequestMethod.POST) public ResWebData updateAccountAbility(@Valid @RequestBody AccountAbilityFO fo, HttpServletRequest request) { String uid = (String) request.getAttribute(RdpUserService.UID); String puid = (String) request.getAttribute(RdpUserService.PUID); diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpVerifyController.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpVerifyController.java index 8fbb7f251..7dc9ffaad 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpVerifyController.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/rdp/controller/RdpVerifyController.java @@ -41,19 +41,19 @@ public class RdpVerifyController { @RequestAuth(strategy = Ignore) - @RequestMapping(value = "/sendcode", method = RequestMethod.POST) + @RequestMapping(value = "/sendCode", method = RequestMethod.POST) public ResWebData sendCode(@Valid @RequestBody SendCodeFO sendCodeFO) { return ResWebDataUtils.buildSuccess(); } @RequestAuth(strategy = Ignore) - @RequestMapping(value = "/sendcodeinloginstate", method = RequestMethod.POST) + @RequestMapping(value = "/sendCodeInLoginState", method = RequestMethod.POST) public ResWebData sendCodeInLoginState(@Valid @RequestBody SendCodeAfterLoginFO verifyData) { return ResWebDataUtils.buildSuccess(); } @RequestAuth(strategy = Ignore) - @RequestMapping(value = "/sendcodebyaccount", method = RequestMethod.POST) + @RequestMapping(value = "/sendCodeByAccount", method = RequestMethod.POST) public ResWebData sendCodeByAccount(@RequestBody @Valid SendCodeByAccountFO sendCodeFO) { return ResWebDataUtils.buildSuccess(); } diff --git a/frontend/src/services/http/api/cluster.js b/frontend/src/services/http/api/cluster.js index 0d8e88736..b5866379f 100644 --- a/frontend/src/services/http/api/cluster.js +++ b/frontend/src/services/http/api/cluster.js @@ -1,16 +1,16 @@ export const clusterApi = { // createCluster: '/clouddm/console/api/v1/cluster/create', // deleteCluster: '/clouddm/console/api/v1/cluster/delete', - // getClusterList: '/clouddm/console/api/v1/cluster/listbycondition', - // updateClusterDesc: '/clouddm/console/api/v1/cluster/updatedesc', - // getCluster: '/clouddm/console/api/v1/cluster/querybyid', + // getClusterList: '/clouddm/console/api/v1/cluster/listByCondition', + // updateClusterDesc: '/clouddm/console/api/v1/cluster/updateDesc', + // getCluster: '/clouddm/console/api/v1/cluster/queryById', // dm dmClusterCreate: '/clouddm/console/api/v1/cluster/create', dmClusterDelete: '/clouddm/console/api/v1/cluster/delete', - dmClusterListByCondition: '/clouddm/console/api/v1/cluster/listbycondition', - dmClusterUpdateDesc: '/clouddm/console/api/v1/cluster/updatedesc', - dmClusterQueryById: '/clouddm/console/api/v1/cluster/querybyid', + dmClusterListByCondition: '/clouddm/console/api/v1/cluster/listByCondition', + dmClusterUpdateDesc: '/clouddm/console/api/v1/cluster/updateDesc', + dmClusterQueryById: '/clouddm/console/api/v1/cluster/queryById', // cc ccClusterCreate: '/cloudcanal/console/api/v1/inner/cluster/create', diff --git a/frontend/src/services/http/api/constant.js b/frontend/src/services/http/api/constant.js index da45f763a..6729449a0 100644 --- a/frontend/src/services/http/api/constant.js +++ b/frontend/src/services/http/api/constant.js @@ -41,8 +41,8 @@ export const constantApi = { // listExportSqExecType: '/clouddm/console/api/v1/constant/listexportsqexectype', // rdp // dsLLMTypes: '/rdp/console/api/v1/constant/ds/dsllmtypes', - // dsLLMEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsllmembeddingtypes', - // dsLLMChatTypes: '/rdp/console/api/v1/constant/ds/dsllmchattypes', + // dsLLMEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsLlmEmbeddingTypes', + // dsLLMChatTypes: '/rdp/console/api/v1/constant/ds/dsLlmChatTypes', // listDownloadProduct: '/rdp/console/api/v1/constant/listDownloadProduct', // cc @@ -124,15 +124,15 @@ export const constantApi = { dmConstantListDsConnectionOption: '/clouddm/console/api/v1/constant/listdsconnectionoption', // rdp - rdpConstantListRegionAreas: '/rdp/console/api/v1/constant/listregionareas', + rdpConstantListRegionAreas: '/rdp/console/api/v1/constant/listRegionAreas', rdpConstantDsSupportedRegion: '/rdp/console/api/v1/constant/dssupportedregion', - rdpConstantListFilterDsTypes: '/rdp/console/api/v1/constant/listfilterdstypes', - rdpConstantListDsTypesByDeployType: '/rdp/console/api/v1/constant/listdstypesbydeploytype', + rdpConstantListFilterDsTypes: '/rdp/console/api/v1/constant/listFilterDsTypes', + rdpConstantListDsTypesByDeployType: '/rdp/console/api/v1/constant/listDsTypesByDeployType', - rdpConstantDsLLMEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsllmembeddingtypes', - rdpConstantDsLLMChatTypes: '/rdp/console/api/v1/constant/ds/dsllmchattypes', - rdpConstantDsSecurityOption: '/rdp/console/api/v1/constant/ds/dssecurityoption', - rdpConstantDsDsConnectType: '/rdp/console/api/v1/constant/ds/dsconnecttype', - rdpConstantDsDsLlmEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsllmembeddingtypes', - rdpConstantDsDsLlmChatTypes: '/rdp/console/api/v1/constant/ds/dsllmchattypes' + rdpConstantDsLLMEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsLlmEmbeddingTypes', + rdpConstantDsLLMChatTypes: '/rdp/console/api/v1/constant/ds/dsLlmChatTypes', + rdpConstantDsSecurityOption: '/rdp/console/api/v1/constant/ds/dsSecurityOption', + rdpConstantDsDsConnectType: '/rdp/console/api/v1/constant/ds/dsConnectType', + rdpConstantDsDsLlmEmbeddingTypes: '/rdp/console/api/v1/constant/ds/dsLlmEmbeddingTypes', + rdpConstantDsDsLlmChatTypes: '/rdp/console/api/v1/constant/ds/dsLlmChatTypes' }; diff --git a/frontend/src/services/http/api/datasource.js b/frontend/src/services/http/api/datasource.js index 6234102e2..c837287ad 100644 --- a/frontend/src/services/http/api/datasource.js +++ b/frontend/src/services/http/api/datasource.js @@ -1,22 +1,22 @@ export const datasourceApi = { // rdp - rdpDataSourceListByCondition: '/rdp/console/api/v1/datasource/listbycondition', + rdpDataSourceListByCondition: '/rdp/console/api/v1/datasource/listByCondition', rdpDataSourceDsKvConfigDef: '/rdp/console/api/v1/datasource/dsKvConfigDef', - rdpDataSourceQueryLLMConfig: '/rdp/console/api/v1/datasource/queryllmconfig', + rdpDataSourceQueryLLMConfig: '/rdp/console/api/v1/datasource/queryLLMConfig', rdpDataSourceDelete: '/rdp/console/api/v1/datasource/delete', - rdpDataSourceUpdateDataSourceDesc: '/rdp/console/api/v1/datasource/updatedatasourcedesc', + rdpDataSourceUpdateDataSourceDesc: '/rdp/console/api/v1/datasource/updateDataSourceDesc', rdpDataSourceUpdateAliyunRdsAkSk: '/rdp/console/api/v1/datasource/updatealiyunrdsaksk', - rdpDataSourceDeleteAccount: '/rdp/console/api/v1/datasource/deleteaccount', - rdpDataSourceUpdatePublicHost: '/rdp/console/api/v1/datasource/updatepublichost', - rdpDataSourceQueryDs: '/rdp/console/api/v1/datasource/queryds', - rdpDataSourceQueryDsConfig: '/rdp/console/api/v1/datasource/querydsconfig', - rdpDataSourceUpsertDsConfig: '/rdp/console/api/v1/datasource/upsertdsconfig', + rdpDataSourceDeleteAccount: '/rdp/console/api/v1/datasource/deleteAccount', + rdpDataSourceUpdatePublicHost: '/rdp/console/api/v1/datasource/updatePublicHost', + rdpDataSourceQueryDs: '/rdp/console/api/v1/datasource/queryDs', + rdpDataSourceQueryDsConfig: '/rdp/console/api/v1/datasource/queryDsConfig', + rdpDataSourceUpsertDsConfig: '/rdp/console/api/v1/datasource/upsertDsConfig', rdpDataSourceDsKvConfig: '/rdp/console/api/v1/datasource/dsKvConfig', - rdpDataSourceUpdatePrivateHost: '/rdp/console/api/v1/datasource/updateprivatehost', + rdpDataSourceUpdatePrivateHost: '/rdp/console/api/v1/datasource/updatePrivateHost', rdpDataSourceAdd: '/rdp/console/api/v1/datasource/add', rdpDataSourceCheckDriverStatus: '/rdp/console/api/v1/datasource/checkDriverStatus', rdpDataSourceDownloadDriver: '/rdp/console/api/v1/datasource/downloadDriver', - rdpDataSourceUpdateAccountAndPassword: '/rdp/console/api/v1/datasource/updateaccountandpassword', // cc + rdpDataSourceUpdateAccountAndPassword: '/rdp/console/api/v1/datasource/updateAccountAndPassword', // cc ccDataSourceListDbTablesUniqs: '/cloudcanal/console/api/v1/inner/datasource/listdbtablesuniqs', ccDataSourceGetTypeMapping: '/cloudcanal/console/api/v1/inner/datasource/gettypemapping', ccDataSourceDbList: '/cloudcanal/console/api/v1/inner/datasource/db/list', @@ -34,12 +34,12 @@ export const datasourceApi = { // dm dmDataSourceListDsBindCluster: '/clouddm/console/api/v1/datasource/listDsBindCluster', - dmDataSourceConnectDs: '/clouddm/console/api/v1/datasource/connectds', + dmDataSourceConnectDs: '/clouddm/console/api/v1/datasource/connectDs', dmDataSourceAddDs: '/clouddm/console/api/v1/datasource/addds', - dmDataSourceListByCondition: '/clouddm/console/api/v1/datasource/listbycondition', - dmDataSourceQueryDsConfig: '/clouddm/console/api/v1/datasource/querydsconfig', - dmDataSourceUpsertDsConfig: '/clouddm/console/api/v1/datasource/upsertdsconfig', - dmDataSourceQueryDs: '/clouddm/console/api/v1/datasource/queryds', + dmDataSourceListByCondition: '/clouddm/console/api/v1/datasource/listByCondition', + dmDataSourceQueryDsConfig: '/clouddm/console/api/v1/datasource/queryDsConfig', + dmDataSourceUpsertDsConfig: '/clouddm/console/api/v1/datasource/upsertDsConfig', + dmDataSourceQueryDs: '/clouddm/console/api/v1/datasource/queryDs', dmDataSourceUpdateDsAccount: '/clouddm/console/api/v1/datasource/updateDsAccount', dmDataSourceEnableDsQuery: '/clouddm/console/api/v1/datasource/enableDsQuery', dmDataSourceListSpec: '/clouddm/console/api/v1/datasource/listSpec', diff --git a/frontend/src/services/http/api/query.js b/frontend/src/services/http/api/query.js index 6c2537e5a..db2086aec 100644 --- a/frontend/src/services/http/api/query.js +++ b/frontend/src/services/http/api/query.js @@ -1,7 +1,7 @@ export const queryApi = { - // createSession: '/clouddm/console/api/v1/query/createsession',* + // createSession: '/clouddm/console/api/v1/query/createSession',* // cancelQuery: '/clouddm/console/api/v1/query/cancel',* - // closesSession: '/clouddm/console/api/v1/query/closesession',* + // closesSession: '/clouddm/console/api/v1/query/closeSession',* // commit: '/clouddm/console/api/v1/query/commit',* // executeQuery: '/clouddm/console/api/v1/query/execute',* // getAutoCommit: '/clouddm/console/api/v1/query/getautocommit',* @@ -13,8 +13,8 @@ export const queryApi = { // fetchDsStatusConf: '/clouddm/console/api/v1/query/fetchDsStatusConf',* // dm - dmQueryCreateSession: '/clouddm/console/api/v1/query/createsession', - dmQueryClosesSession: '/clouddm/console/api/v1/query/closesession', + dmQueryCreateSession: '/clouddm/console/api/v1/query/createSession', + dmQueryClosesSession: '/clouddm/console/api/v1/query/closeSession', dmQueryFetchDsStatusConf: '/clouddm/console/api/v1/query/fetchDsStatusConf', dmQueryExportResult: '/clouddm/console/api/v1/query/exportResult', dmQueryCloseResultWindow: '/clouddm/console/api/v1/query/closeResultWindow', diff --git a/frontend/src/services/http/api/ticket.js b/frontend/src/services/http/api/ticket.js index 1beae4f79..935a109a4 100644 --- a/frontend/src/services/http/api/ticket.js +++ b/frontend/src/services/http/api/ticket.js @@ -56,7 +56,7 @@ export const ticketApi = { dmTicketQueryQueryTicketDetail: '/clouddm/console/api/v1/approval/queryQueryApprovalDetail', // rdp - rdpTicketListBasic: '/clouddm/console/api/v1/approval/listbasic', + rdpTicketListBasic: '/clouddm/console/api/v1/approval/listBasic', rdpTicketClose: '/clouddm/console/api/v1/approval/close', rdpTicketCreateDataSourceAuthTicket: '/clouddm/console/api/v1/approval/createDataSourceAuthApproval', rdpTicketQueryDataSourceAuthTicketDetail: '/clouddm/console/api/v1/approval/queryDataSourceAuthApprovalDetail', @@ -65,7 +65,7 @@ export const ticketApi = { }; // export const ticketApiRdp = { -// listTickets: '/clouddm/console/api/v1/approval/listbasic',* +// listTickets: '/clouddm/console/api/v1/approval/listBasic',* // listTickeBaseInfo: '/clouddm/console/api/v1/approval/queryApprovalBaseInfo',* // listTicketsAuthDetail: '/clouddm/console/api/v1/approval/queryDataSourceAuthApprovalDetail',* // approvalTicket: '/clouddm/console/api/v1/approval/approval',* diff --git a/frontend/src/services/http/api/user.js b/frontend/src/services/http/api/user.js index d8a11ba91..9ec1169a5 100644 --- a/frontend/src/services/http/api/user.js +++ b/frontend/src/services/http/api/user.js @@ -4,12 +4,12 @@ export const userApi = { // login: '/login', // logout: '/logout', // requestJumpUrl: '/requestJumpUrl', - // getGlobalSettings: '/global_settings', + // getGlobalSettings: '/globalSettings', // listOrg: '/list_org', - // checkSupplement: '/check_supplement', + // checkSupplement: '/checkSupplement', // resetPwdUnLogin: '/resetpwdunlogin', - // dmGlobalSettings: '/clouddm/console/api/v1/dm_global_settings', - // dmConsoleSettings: '/clouddm/console/api/v1/dm_console_settings', + // dmGlobalSettings: '/clouddm/console/api/v1/dmGlobalSettings', + // dmConsoleSettings: '/clouddm/console/api/v1/dmConsoleSettings', // rdp // resetPwdWithOriginPwd: '/rdp/console/api/v1/user/resetPwdWithOriginPwd', @@ -18,22 +18,22 @@ export const userApi = { // resetSubAccountPwd: '/rdp/console/api/v1/user/resetSubAccountPwd', // watermark: '/rdp/console/api/v1/user/waterMark',* // getUserInfo: '/rdp/console/api/v1/user/queryLoginUser',* - // resetPassword: '/rdp/console/api/v1/user/manager/resetpasswd', - // getSubAccountList: '/rdp/console/api/v1/user/manager/listsubaccounts', - // updateSubAccount: '/rdp/console/api/v1/user/manager/updatesubaccount', - // addSubAccount: '/rdp/console/api/v1/user/manager/addsubaccount', - // deleteSubAccount: '/rdp/console/api/v1/user/manager/deletesubaccount', - // updateUserRole: '/rdp/console/api/v1/user/manager/updateuserrole', - // stopSubAccount: '/rdp/console/api/v1/user/manager/updateaccountability', - // checkSubAccountDuplicate: '/rdp/console/api/v1/user/manager/checksubaccountduplicate', + // resetPassword: '/rdp/console/api/v1/user/manager/resetPasswd', + // getSubAccountList: '/rdp/console/api/v1/user/manager/listSubAccounts', + // updateSubAccount: '/rdp/console/api/v1/user/manager/updateSubAccount', + // addSubAccount: '/rdp/console/api/v1/user/manager/addSubAccount', + // deleteSubAccount: '/rdp/console/api/v1/user/manager/deleteSubAccount', + // updateUserRole: '/rdp/console/api/v1/user/manager/updateUserRole', + // stopSubAccount: '/rdp/console/api/v1/user/manager/updateAccountAbility', + // checkSubAccountDuplicate: '/rdp/console/api/v1/user/manager/checkSubAccountDuplicate', // getResourceSummary: '/rdp/console/api/v1/user/resourceSummary', // resetOpPwd: '/rdp/console/api/v1/user/resetOpPasswd', // getDbopAudits: '/clauddm/console/api/v1/user/dpopaudits', /// data source operating records // verifyOpPwd: '/rdp/console/api/v1/user/opPasswdVerify', // listMyAuth: '/rdp/console/api/v1/user/listMyAuth', // listRules: '/rdp/console/api/v1/user/listRules', - // getCurrUserConfigs: '/rdp/console/api/v1/user/config/getcurruserconfigs', - // updateUserConfigs: '/rdp/console/api/v1/user/config/upsertuserconfigs', + // getCurrUserConfigs: '/rdp/console/api/v1/user/config/getCurrUserConfigs', + // updateUserConfigs: '/rdp/console/api/v1/user/config/upsertUserConfigs', // queryPrimaryUser: '/rdp/console/api/v1/user/queryPrimaryUser', // queryRemainingTrialDay: '/cloudcanal/console/api/v1/inner/saas/queryremainingtrialday', // saasCcProductNames: '/rdp/console/api/v1/saas/ccproductnames', @@ -44,12 +44,12 @@ export const userApi = { logout: '/logout', loginMfaValid: '/loginMfaValid', requestJumpUrl: '/requestJumpUrl', - getGlobalSettings: '/global_settings', + getGlobalSettings: '/globalSettings', listOrg: '/list_org', - checkSupplement: '/check_supplement', + checkSupplement: '/checkSupplement', - dmGlobalSettings: '/clouddm/console/api/v1/dm_global_settings', - dmConsoleSettings: '/clouddm/console/api/v1/dm_console_settings', + dmGlobalSettings: '/clouddm/console/api/v1/dmGlobalSettings', + dmConsoleSettings: '/clouddm/console/api/v1/dmConsoleSettings', // rdp rdpUserResetPwdWithOriginPwd: '/rdp/console/api/v1/user/resetPwdWithOriginPwd', @@ -74,19 +74,19 @@ export const userApi = { rdpUserGetPrimaryAccountPwdPolicy: '/rdp/console/api/v1/user/getPrimaryAccountPwdPolicy', rdpUserGetSubAccountPwdPolicy: '/rdp/console/api/v1/user/getSubAccountPwdPolicy', - rdpUserManagerListSubAccounts: '/rdp/console/api/v1/user/manager/listsubaccounts', - rdpUserManagerUpdateSubAccount: '/rdp/console/api/v1/user/manager/updatesubaccount', + rdpUserManagerListSubAccounts: '/rdp/console/api/v1/user/manager/listSubAccounts', + rdpUserManagerUpdateSubAccount: '/rdp/console/api/v1/user/manager/updateSubAccount', // API - rdpUserManagerCtrlAddSubAccount: '/rdp/console/api/v1/user/manager/ctrl_addsubaccount', - rdpUserManagerAddSubAccount: '/rdp/console/api/v1/user/manager/addsubaccount', - rdpUserManagerDeleteSubAccount: '/rdp/console/api/v1/user/manager/deletesubaccount', - rdpUserManagerUpdateUserRole: '/rdp/console/api/v1/user/manager/updateuserrole', - rdpUserManagerStopSubAccount: '/rdp/console/api/v1/user/manager/updateaccountability', - rdpUserManagerCheckSubAccountDuplicate: '/rdp/console/api/v1/user/manager/checksubaccountduplicate', + rdpUserManagerCtrlAddSubAccount: '/rdp/console/api/v1/user/manager/ctrlAddSubAccount', + rdpUserManagerAddSubAccount: '/rdp/console/api/v1/user/manager/addSubAccount', + rdpUserManagerDeleteSubAccount: '/rdp/console/api/v1/user/manager/deleteSubAccount', + rdpUserManagerUpdateUserRole: '/rdp/console/api/v1/user/manager/updateUserRole', + rdpUserManagerStopSubAccount: '/rdp/console/api/v1/user/manager/updateAccountAbility', + rdpUserManagerCheckSubAccountDuplicate: '/rdp/console/api/v1/user/manager/checkSubAccountDuplicate', rdpUserConfigGetUserSpecifiedConfs: '/rdp/console/api/v1/user/config/getUserSpecifiedConfs', - rdpUserConfigGetCurrUserConfigs: '/rdp/console/api/v1/user/config/getcurruserconfigs', - rdpUserConfigUpsertUserConfigs: '/rdp/console/api/v1/user/config/upsertuserconfigs', + rdpUserConfigGetCurrUserConfigs: '/rdp/console/api/v1/user/config/getCurrUserConfigs', + rdpUserConfigUpsertUserConfigs: '/rdp/console/api/v1/user/config/upsertUserConfigs', // cc ccUserQueryLoginUser: '/cloudcanal/console/api/v1/inner/user/queryLoginUser', diff --git a/frontend/src/services/http/api/worker.js b/frontend/src/services/http/api/worker.js index 7b4d1cf71..fbd3d8c0c 100644 --- a/frontend/src/services/http/api/worker.js +++ b/frontend/src/services/http/api/worker.js @@ -1,20 +1,20 @@ export const workerApi = { - // createWorker: '/clouddm/console/api/v1/worker/createinitialworker', - // getWorkerList: '/clouddm/console/api/v1/worker/listworkers', - // getDownloadUrl: '/clouddm/console/api/v1/worker/downloadclienturl', - // deleteWorker: '/clouddm/console/api/v1/worker/deleteworker', - // startWorker: '/clouddm/console/api/v1/worker/waittoonline', - // stopWorker: '/clouddm/console/api/v1/worker/waittooffline', + // createWorker: '/clouddm/console/api/v1/worker/createInitialWorker', + // getWorkerList: '/clouddm/console/api/v1/worker/listWorkers', + // getDownloadUrl: '/clouddm/console/api/v1/worker/downloadClientUrl', + // deleteWorker: '/clouddm/console/api/v1/worker/deleteWorker', + // startWorker: '/clouddm/console/api/v1/worker/waitToOnline', + // stopWorker: '/clouddm/console/api/v1/worker/waitToOffline', // dm - dmWorkerCreateInitialWorker: '/clouddm/console/api/v1/worker/createinitialworker', - dmWorkerListWorkers: '/clouddm/console/api/v1/worker/listworkers', - dmWorkerDownloadClientUrl: '/clouddm/console/api/v1/worker/downloadclienturl', - dmWorkerDeleteWorker: '/clouddm/console/api/v1/worker/deleteworker', - dmWorkerWaitToOnline: '/clouddm/console/api/v1/worker/waittoonline', - dmWorkerWaitToOffline: '/clouddm/console/api/v1/worker/waittooffline', - dmWorkerClientCoreConfig: '/clouddm/console/api/v1/worker/clientcoreconfig', - dmWorkerUpdateWorkerDesc: '/clouddm/console/api/v1/worker/updateworkerdesc', + dmWorkerCreateInitialWorker: '/clouddm/console/api/v1/worker/createInitialWorker', + dmWorkerListWorkers: '/clouddm/console/api/v1/worker/listWorkers', + dmWorkerDownloadClientUrl: '/clouddm/console/api/v1/worker/downloadClientUrl', + dmWorkerDeleteWorker: '/clouddm/console/api/v1/worker/deleteWorker', + dmWorkerWaitToOnline: '/clouddm/console/api/v1/worker/waitToOnline', + dmWorkerWaitToOffline: '/clouddm/console/api/v1/worker/waitToOffline', + dmWorkerClientCoreConfig: '/clouddm/console/api/v1/worker/clientCoreConfig', + dmWorkerUpdateWorkerDesc: '/clouddm/console/api/v1/worker/updateWorkerDesc', // cc ccWorkerListWorker: '/cloudcanal/console/api/v1/inner/worker/listworker', diff --git a/frontend/src/services/http/request.js b/frontend/src/services/http/request.js index d3de94b20..53ce3d7d9 100644 --- a/frontend/src/services/http/request.js +++ b/frontend/src/services/http/request.js @@ -22,7 +22,7 @@ const UPDATE_DATA_SOURCE_STATUS_LIST = [ '/clouddm/console/api/v1/editor/table/editorDef', '/clouddm/console/api/v1/editor/table/initEditor', '/clouddm/console/api/v1/editor/table/generateScript', - '/clouddm/console/api/v1/query/createsession', + '/clouddm/console/api/v1/query/createSession', '/clouddm/console/api/v1/browse/actions/requestScript', '/clouddm/console/api/v1/browse/actions/generateScript', '/clouddm/console/api/v1/editor/table/scriptExecute', @@ -131,7 +131,7 @@ const request = async (opt) => { const { url: requestUrl, msg, modal = true, page } = options; try { - // if (!['/login', '/register', '/logout', '/global_settings', '/list_org', '/login_supplement', '/check_supplement', '/load_supplement_info'].includes(options.url)) { + // if (!['/login', '/register', '/logout', '/globalSettings', '/list_org', '/login_supplement', '/checkSupplement', '/load_supplement_info'].includes(options.url)) { // options.baseURL = process.env.VUE_APP_BASE_URL; // } const res = await instance(options); diff --git a/frontend/src/views/initialization/index.vue b/frontend/src/views/initialization/index.vue index c29591ca0..ceb26325e 100644 --- a/frontend/src/views/initialization/index.vue +++ b/frontend/src/views/initialization/index.vue @@ -195,7 +195,7 @@ const REDIRECT_HOME_DELAY_MS = 2500; function buildDmGlobalSettingsUrl() { const baseUrl = (process.env.VUE_APP_BASE_URL || '').replace(/\/$/, ''); - return `${baseUrl}/clouddm/console/api/v1/dm_global_settings`; + return `${baseUrl}/clouddm/console/api/v1/dmGlobalSettings`; } function buildInitInstallLogWsUrl() {