From 83e669b6b4f211b68fb39770e4c327b2f7b7c2e8 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 4 May 2023 16:21:17 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/system/controller/UserController.java |  2 +-
 .../io/metersphere/system/service/UserService.java    | 11 -----------
 .../test/java/io/metersphere/system/Application.java  |  2 ++
 pom.xml                                               |  2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java
index f54802628e..824d8a8405 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java
@@ -2,7 +2,7 @@ package io.metersphere.system.controller;
 
 
 import io.metersphere.domain.User;
-import io.metersphere.system.service.UserService;
+import io.metersphere.sdk.UserService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
deleted file mode 100644
index b852f90978..0000000000
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.metersphere.system.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.metersphere.domain.User;
-import io.metersphere.sdk.mapper.UserMapper;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserService extends ServiceImpl<UserMapper, User> {
-
-}
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/Application.java b/backend/services/system-setting/src/test/java/io/metersphere/system/Application.java
index fa63330927..fe637012f5 100644
--- a/backend/services/system-setting/src/test/java/io/metersphere/system/Application.java
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/Application.java
@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication(exclude = {
         QuartzAutoConfiguration.class,
@@ -15,6 +16,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
         MybatisAutoConfiguration.class
 })
 @ServletComponentScan
+@ComponentScan(basePackages = {"io.metersphere.sdk", "io.metersphere.system"})
 public class Application {
 
     public static void main(String[] args) {
diff --git a/pom.xml b/pom.xml
index 7afc43e09b..f2943a7555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
         <!--        -->
         <skipAntRunForJenkins>false</skipAntRunForJenkins>
         <commons-dbcp2-version>2.9.0</commons-dbcp2-version>
-        <jacoco.version>0.8.7</jacoco.version>
+        <jacoco.version>0.8.10</jacoco.version>
     </properties>
 
     <modules>