diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java index 7214f9b..84707c1 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java @@ -6,9 +6,7 @@ import com.muyu.domain.EngineVersion; import com.muyu.req.EngineVersionQueryReq; import com.muyu.service.EngineVersionService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,4 +32,22 @@ public class EngineVersionController { public Result> list(EngineVersionQueryReq engineConfigQueryReq) { return Result.success(engineVersionService.list(EngineVersion.queryBuild(engineConfigQueryReq))); } + + @PostMapping("/insert") + public Result insert(EngineVersion engineVersion) { + EngineVersion add = engineVersionService.add(engineVersion); + return Result.success(add); + } + + @PostMapping("/update") + public Result update(EngineVersion engineVersion) { + EngineVersion update = engineVersionService.updateMsg(engineVersion); + return Result.success(update); + } + + @PostMapping("/delete/{id}") + public Result delete(@PathVariable Long id) { + boolean b = engineVersionService.removeById(id); + return Result.success(b); + } } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java index a957210..1776d5e 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java @@ -21,4 +21,8 @@ public interface EngineVersionService extends IService { * @return 引擎规则配置集合 */ public List list(EngineVersion engineConfig); + + EngineVersion add(EngineVersion engineVersion); + + EngineVersion updateMsg(EngineVersion engineVersion); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java index d085d97..ca8fa1c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.service.serviceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.EngineVersion; import com.muyu.mapper.EngineVersionMapper; @@ -40,4 +41,20 @@ public class EngineVersionServiceImpl extends ServiceImpl,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource +22:20:44.593 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +22:20:44.593 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +22:20:44.691 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of 0d4857c4-322f-40d5-a89a-b5ff9082f81b +22:20:44.694 [main] INFO c.a.n.client.naming - [,109] - Create naming rpc client for uuid->0d4857c4-322f-40d5-a89a-b5ff9082f81b +22:20:44.694 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager +22:20:44.694 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService +22:20:44.695 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler +22:20:44.695 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Try to connect to server on start up, server: {serverIp = '47.116.184.54', server main port = 8848} +22:20:44.695 [main] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:47.116.184.54 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false} +22:20:44.766 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Success to connect to server [47.116.184.54:8848] on start up, connectionId = 1724336447775_139.224.212.27_62895 +22:20:44.767 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler +22:20:44.767 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Notify connected event to listeners. +22:20:44.767 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [0d4857c4-322f-40d5-a89a-b5ff9082f81b] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$575/0x00000214aa4e0228 +22:20:44.767 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.client.naming - [onConnected,90] - Grpc connection connect +22:20:44.769 [main] INFO c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] cloud-2112 registering service cloud-engine with instance Instance{instanceId='null', ip='192.168.52.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=null, preserved.register.source=SPRING_CLOUD}} +22:20:44.796 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-engine 192.168.52.1:9701 register finished +22:20:46.011 [main] INFO c.m.EngineApplication - [logStarted,56] - Started EngineApplication in 20.861 seconds (process running for 21.751) +22:20:46.021 [main] INFO c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis +22:20:46.021 [main] INFO c.a.n.c.c.i.CacheData - [,99] - nacos.cache.data.init.snapshot = true +22:20:46.022 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine.yml+DEFAULT_GROUP+cloud-2112 +22:20:46.033 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine.yml, group=DEFAULT_GROUP, cnt=1 +22:20:46.033 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine.yml, group=DEFAULT_GROUP +22:20:46.034 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine+DEFAULT_GROUP+cloud-2112 +22:20:46.034 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine, group=DEFAULT_GROUP, cnt=1 +22:20:46.034 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine, group=DEFAULT_GROUP +22:20:46.036 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-engine-dev.yml+DEFAULT_GROUP+cloud-2112 +22:20:46.036 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-engine-dev.yml, group=DEFAULT_GROUP, cnt=1 +22:20:46.036 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-engine-dev.yml, group=DEFAULT_GROUP +22:20:46.128 [RMI TCP Connection(5)-172.16.0.7] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' +22:21:57.848 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now... +22:21:57.848 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [deregisterService,272] - [DEREGISTER-SERVICE] cloud-2112 deregistering service cloud-engine with instance: Instance{instanceId='null', ip='192.168.52.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={}} +22:21:57.864 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished. +22:21:57.879 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,254] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown begin