add open api

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/BaseServiceImpl.java

@@ -1,16 +1,15 @@
 package org.dbsyncer.biz.impl;
 
-import org.dbsyncer.parser.ProfileComponent;
-import org.dbsyncer.parser.enums.MetaEnum;
-import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.MessageService;
+import org.dbsyncer.parser.ProfileComponent;
+import org.dbsyncer.parser.enums.MetaEnum;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Meta;
 import org.dbsyncer.parser.model.TableGroup;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.dbsyncer.sdk.enums.ModelEnum;
 import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
@@ -23,7 +22,7 @@ public class BaseServiceImpl {
     @Resource
     private LogService logService;
 
-    @Autowired
+    @Resource
     private MessageService messageService;
 
     /**

dbsyncer-storage/src/main/java/org/dbsyncer/storage/AbstractStorageService.java

@@ -9,9 +9,9 @@ import org.dbsyncer.storage.strategy.Strategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +29,7 @@ public abstract class AbstractStorageService implements StorageService, Disposab
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private Map<String, Strategy> map;
 
     private final Lock lock = new ReentrantLock();

dbsyncer-web/src/main/java/org/dbsyncer/web/config/WebAppConfig.java

@@ -8,7 +8,6 @@ import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.parser.model.UserInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationProvider;
@@ -25,6 +24,7 @@ import org.springframework.security.web.authentication.AuthenticationFailureHand
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSessionEvent;
@@ -59,7 +59,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
      */
     private static final int MAXIMUM_SESSIONS = 1;
 
-    @Autowired
+    @Resource
     private UserConfigService userConfigService;
 
 

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/BaseController.java

@@ -3,9 +3,9 @@ package org.dbsyncer.web.controller;
 import org.dbsyncer.biz.ConditionService;
 import org.dbsyncer.biz.ConvertService;
 import org.dbsyncer.biz.PluginService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,13 +17,13 @@ import java.util.Map;
  */
 public abstract class BaseController {
 
-    @Autowired
+    @Resource
     private ConditionService filterService;
 
-    @Autowired
+    @Resource
     private ConvertService convertService;
 
-    @Autowired
+    @Resource
     private PluginService pluginService;
 
     /**

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/ConnectorController.java

@@ -5,11 +5,16 @@ import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -19,7 +24,7 @@ public class ConnectorController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private ConnectorService connectorService;
 
     @GetMapping("/page/add")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/MappingController.java

@@ -7,11 +7,16 @@ import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -21,13 +26,13 @@ public class MappingController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private ConnectorService connectorService;
 
-    @Autowired
+    @Resource
     private MappingService mappingService;
 
-    @Autowired
+    @Resource
     private TableGroupService tableGroupService;
 
     @GetMapping("/pageAdd")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/MetaController.java

@@ -4,19 +4,20 @@ import org.dbsyncer.biz.MonitorService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
+
 @Controller
 @RequestMapping("/meta")
 public class MetaController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private MonitorService monitorService;
 
     @GetMapping("/getAll")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/ProjectGroupController.java

@@ -7,11 +7,15 @@ import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -27,13 +31,13 @@ public class ProjectGroupController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private ProjectGroupService projectGroupService;
 
-    @Autowired
+    @Resource
     private ConnectorService connectorService;
 
-    @Autowired
+    @Resource
     private MappingService mappingService;
 
     @GetMapping("/page/add")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/TableGroupController.java

@@ -7,11 +7,16 @@ import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -21,10 +26,10 @@ public class TableGroupController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private TableGroupService tableGroupService;
 
-    @Autowired
+    @Resource
     private MappingService mappingService;
 
     @GetMapping("/page/{page}")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/TestController.java → dbsyncer-web/src/main/java/org/dbsyncer/web/controller/openapi/OpenApiController.java

@@ -1,5 +1,9 @@
-package org.dbsyncer.web.controller;
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
+package org.dbsyncer.web.controller.openapi;
 
+import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.common.util.RandomUtil;
 import org.dbsyncer.common.util.StringUtil;
 import org.slf4j.Logger;
@@ -34,9 +38,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * OpenAPI
+ *
+ * @Version 1.0.0
+ * @Author AE86
+ * @Date 2023-11-16 01:38
+ */
 @Controller
-@RequestMapping("/test")
-public class TestController implements InitializingBean {
+@RequestMapping("/gateway")
+public class OpenApiController implements InitializingBean {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -52,18 +63,17 @@ public class TestController implements InitializingBean {
     private ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
 
     @ResponseBody
-    @RequestMapping("/demo")
-    public String demo(ModelMap modelMap, Long id, String version) {
+    @RequestMapping("/demo.json")
+    public RestResult demo(Long id, String version) {
         logger.info("id:{},version:{}", id, version);
-        modelMap.put("data", RandomUtil.nextInt(1, 100));
-        return id + version;
+        return RestResult.restSuccess(RandomUtil.nextInt(1, 100));
     }
 
     @ResponseBody
-    @RequestMapping("/adapter.json")
+    @RequestMapping("/api.json")
     public Object adapter(HttpServletRequest request, HttpServletResponse response) {
         try {
-            InvocableHandlerMethod invocableMethod = handlers.get("/test/demo");
+            InvocableHandlerMethod invocableMethod = handlers.get("/gateway/demo.json");
             // 模拟参数
             Map<String, Object> params = new HashMap<>();
             params.put("id", 1000L);
@@ -100,7 +110,7 @@ public class TestController implements InitializingBean {
     }
 
     private void initHandlerMapping() {
-        parsePackage.put("/test/", "");
+        parsePackage.put("/gateway/", "");
         RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class);
         // 获取url与类和方法的对应信息
         Map<RequestMappingInfo, HandlerMethod> map = mapping.getHandlerMethods();

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/plugin/PluginController.java

@@ -8,7 +8,6 @@ import org.dbsyncer.common.config.AppConfig;
 import org.dbsyncer.common.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,8 +16,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 
 @Controller
 @RequestMapping("/plugin")
@@ -26,10 +31,10 @@ public class PluginController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private PluginService pluginService;
 
-    @Autowired
+    @Resource
     private AppConfig appConfig;
 
     @RequestMapping("")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/system/SystemController.java

@@ -5,7 +5,6 @@ import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -22,7 +22,7 @@ public class SystemController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private SystemConfigService systemConfigService;
 
     @RequestMapping("")

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/user/UserController.java

@@ -6,7 +6,6 @@ import org.dbsyncer.biz.vo.UserInfoVo;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
@@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -33,7 +33,7 @@ public class UserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private UserConfigService userConfigService;
 
     @RequestMapping("")

dbsyncer-web/src/main/java/org/dbsyncer/web/remote/UserService.java

@@ -1,12 +0,0 @@
-package org.dbsyncer.web.remote;
-
-public interface UserService {
-
-    /**
-     * 远程调用接口
-     * @param params
-     * @return
-     */
-    String hello(String params);
-
-}

dbsyncer-web/src/main/java/org/dbsyncer/web/remote/UserServiceImpl.java

@@ -1,14 +0,0 @@
-package org.dbsyncer.web.remote;
-
-import java.time.LocalDateTime;
-
-public class UserServiceImpl implements UserService {
-
-    private String name = "def";
-
-    @Override
-    public String hello(String params) {
-        return name + LocalDateTime.now().toString();
-    }
-
-}