From 883023135298cca72405a0ae1ca90758b586c281 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 3 Feb 2020 16:30:16 +0800 Subject: [PATCH] package name changed. --- backend/pom.xml | 11 +- .../metersphere/Application.java | 2 +- .../metersphere/base/domain/User.java | 2 +- .../metersphere/base/domain/UserExample.java | 2 +- .../metersphere/base/mapper/UserMapper.java | 6 +- .../metersphere/base/mapper/UserMapper.xml | 18 +-- .../metersphere/config/MybatisConfig.java | 4 +- .../metersphere/config/ShiroConfig.java | 6 +- .../metersphere/config/WebConfig.java | 4 +- .../metersphere/config/WebSocketConfig.java | 2 +- .../controller/IndexController.java | 4 +- .../controller/LoginController.java | 4 +- .../metersphere/controller/ResultHolder.java | 2 +- .../controller/TestController.java | 4 +- .../controller/request/LoginRequest.java | 2 +- .../interceptor/TestInterceptor.java | 2 +- .../metersphere/security/LoginFilter.java | 4 +- .../metersphere/security/ShiroDBRealm.java | 4 +- .../metersphere/user/SessionUser.java | 2 +- .../metersphere/user/SessionUtils.java | 2 +- .../websocket/ServerEndpointConfigurator.java | 4 +- .../websocket/WebSocketServer.java | 4 +- .../src/main/resources/application.properties | 1 - .../src/main/resources/generatorConfig.xml | 6 +- .../metersphere/ApplicationTests.java | 6 +- frontend/pom.xml | 122 +++++++++--------- pom.xml | 86 ++---------- 27 files changed, 124 insertions(+), 192 deletions(-) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/Application.java (93%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/base/domain/User.java (96%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/base/domain/UserExample.java (99%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/base/mapper/UserMapper.java (81%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/base/mapper/UserMapper.xml (90%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/config/MybatisConfig.java (88%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/config/ShiroConfig.java (97%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/config/WebConfig.java (80%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/config/WebSocketConfig.java (89%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/controller/IndexController.java (88%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/controller/LoginController.java (94%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/controller/ResultHolder.java (97%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/controller/TestController.java (91%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/controller/request/LoginRequest.java (88%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/interceptor/TestInterceptor.java (91%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/security/LoginFilter.java (93%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/security/ShiroDBRealm.java (94%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/user/SessionUser.java (91%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/user/SessionUtils.java (91%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/websocket/ServerEndpointConfigurator.java (85%) rename backend/src/main/java/{com/fit2cloud => io}/metersphere/websocket/WebSocketServer.java (91%) rename backend/src/test/java/{com/fit2cloud => io}/metersphere/ApplicationTests.java (79%) diff --git a/backend/pom.xml b/backend/pom.xml index 2dbdacfcd8..e9c54878a5 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -2,15 +2,15 @@ + + - org.springframework.boot - spring-boot-starter-parent - 2.2.2.RELEASE - + metersphere-server + io.metersphere + 1.0 4.0.0 - backend @@ -252,5 +252,4 @@ - \ No newline at end of file diff --git a/backend/src/main/java/com/fit2cloud/metersphere/Application.java b/backend/src/main/java/io/metersphere/Application.java similarity index 93% rename from backend/src/main/java/com/fit2cloud/metersphere/Application.java rename to backend/src/main/java/io/metersphere/Application.java index d0878d722c..80a5989ce2 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/Application.java +++ b/backend/src/main/java/io/metersphere/Application.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere; +package io.metersphere; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/base/domain/User.java b/backend/src/main/java/io/metersphere/base/domain/User.java similarity index 96% rename from backend/src/main/java/com/fit2cloud/metersphere/base/domain/User.java rename to backend/src/main/java/io/metersphere/base/domain/User.java index 3e0860a7fa..1627d3e6d5 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/base/domain/User.java +++ b/backend/src/main/java/io/metersphere/base/domain/User.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.base.domain; +package io.metersphere.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/base/domain/UserExample.java b/backend/src/main/java/io/metersphere/base/domain/UserExample.java similarity index 99% rename from backend/src/main/java/com/fit2cloud/metersphere/base/domain/UserExample.java rename to backend/src/main/java/io/metersphere/base/domain/UserExample.java index dfb26ae9f6..bd69ac5b0e 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/base/domain/UserExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/UserExample.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.base.domain; +package io.metersphere.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.java b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java similarity index 81% rename from backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.java rename to backend/src/main/java/io/metersphere/base/mapper/UserMapper.java index 25809664bd..78c62c1053 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java @@ -1,7 +1,7 @@ -package com.fit2cloud.metersphere.base.mapper; +package io.metersphere.base.mapper; -import com.fit2cloud.metersphere.base.domain.User; -import com.fit2cloud.metersphere.base.domain.UserExample; +import io.metersphere.base.domain.User; +import io.metersphere.base.domain.UserExample; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml similarity index 90% rename from backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.xml rename to backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml index acaddee46d..7eca812f5b 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ id, name, email, phone, status, create_time, update_time - select distinct @@ -95,13 +95,13 @@ delete from user where id = #{id,jdbcType=VARCHAR} - + delete from user - + insert into user (id, name, email, phone, status, create_time, update_time) @@ -109,7 +109,7 @@ #{phone,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}) - + insert into user @@ -158,7 +158,7 @@ - select count(*) from user @@ -206,7 +206,7 @@ - + update user @@ -230,7 +230,7 @@ where id = #{id,jdbcType=VARCHAR} - + update user set name = #{name,jdbcType=VARCHAR}, email = #{email,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/com/fit2cloud/metersphere/config/MybatisConfig.java b/backend/src/main/java/io/metersphere/config/MybatisConfig.java similarity index 88% rename from backend/src/main/java/com/fit2cloud/metersphere/config/MybatisConfig.java rename to backend/src/main/java/io/metersphere/config/MybatisConfig.java index 89a961a34d..35e537aff9 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/config/MybatisConfig.java +++ b/backend/src/main/java/io/metersphere/config/MybatisConfig.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.config; +package io.metersphere.config; import com.github.pagehelper.PageInterceptor; import org.mybatis.spring.annotation.MapperScan; @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import java.util.Properties; @Configuration -@MapperScan(basePackages = "com.fit2cloud.metersphere.base.mapper", sqlSessionFactoryRef = "sqlSessionFactory") +@MapperScan(basePackages = "io.metersphere.base.mapper", sqlSessionFactoryRef = "sqlSessionFactory") @EnableTransactionManagement @PropertySource(value = {"file:/opt/fit2cloud/conf/metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true) public class MybatisConfig { diff --git a/backend/src/main/java/com/fit2cloud/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java similarity index 97% rename from backend/src/main/java/com/fit2cloud/metersphere/config/ShiroConfig.java rename to backend/src/main/java/io/metersphere/config/ShiroConfig.java index 8b5e4698e2..e8027d8db0 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/config/ShiroConfig.java +++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java @@ -1,8 +1,8 @@ -package com.fit2cloud.metersphere.config; +package io.metersphere.config; import at.pollux.thymeleaf.shiro.dialect.ShiroDialect; -import com.fit2cloud.metersphere.security.LoginFilter; -import com.fit2cloud.metersphere.security.ShiroDBRealm; +import io.metersphere.security.LoginFilter; +import io.metersphere.security.ShiroDBRealm; import org.apache.shiro.cache.MemoryConstrainedCacheManager; import org.apache.shiro.session.mgt.SessionManager; import org.apache.shiro.spring.LifecycleBeanPostProcessor; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/config/WebConfig.java b/backend/src/main/java/io/metersphere/config/WebConfig.java similarity index 80% rename from backend/src/main/java/com/fit2cloud/metersphere/config/WebConfig.java rename to backend/src/main/java/io/metersphere/config/WebConfig.java index 09d42c5455..35acc14672 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/config/WebConfig.java +++ b/backend/src/main/java/io/metersphere/config/WebConfig.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.config; +package io.metersphere.config; -import com.fit2cloud.metersphere.interceptor.TestInterceptor; +import io.metersphere.interceptor.TestInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/config/WebSocketConfig.java b/backend/src/main/java/io/metersphere/config/WebSocketConfig.java similarity index 89% rename from backend/src/main/java/com/fit2cloud/metersphere/config/WebSocketConfig.java rename to backend/src/main/java/io/metersphere/config/WebSocketConfig.java index ca71eb80d7..c89e16839b 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/config/WebSocketConfig.java +++ b/backend/src/main/java/io/metersphere/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.config; +package io.metersphere.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/controller/IndexController.java b/backend/src/main/java/io/metersphere/controller/IndexController.java similarity index 88% rename from backend/src/main/java/com/fit2cloud/metersphere/controller/IndexController.java rename to backend/src/main/java/io/metersphere/controller/IndexController.java index ecf2aad575..e90dd0ea10 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/controller/IndexController.java +++ b/backend/src/main/java/io/metersphere/controller/IndexController.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.controller; +package io.metersphere.controller; -import com.fit2cloud.metersphere.user.SessionUtils; +import io.metersphere.user.SessionUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java similarity index 94% rename from backend/src/main/java/com/fit2cloud/metersphere/controller/LoginController.java rename to backend/src/main/java/io/metersphere/controller/LoginController.java index 1946b3e13c..4cb84d1e4e 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/controller/LoginController.java +++ b/backend/src/main/java/io/metersphere/controller/LoginController.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.controller; +package io.metersphere.controller; -import com.fit2cloud.metersphere.controller.request.LoginRequest; +import io.metersphere.controller.request.LoginRequest; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/controller/ResultHolder.java b/backend/src/main/java/io/metersphere/controller/ResultHolder.java similarity index 97% rename from backend/src/main/java/com/fit2cloud/metersphere/controller/ResultHolder.java rename to backend/src/main/java/io/metersphere/controller/ResultHolder.java index 0937ea7e22..b8db2fb142 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/controller/ResultHolder.java +++ b/backend/src/main/java/io/metersphere/controller/ResultHolder.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.controller; +package io.metersphere.controller; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/controller/TestController.java b/backend/src/main/java/io/metersphere/controller/TestController.java similarity index 91% rename from backend/src/main/java/com/fit2cloud/metersphere/controller/TestController.java rename to backend/src/main/java/io/metersphere/controller/TestController.java index e4043147f9..2a0eb16906 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/controller/TestController.java +++ b/backend/src/main/java/io/metersphere/controller/TestController.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.controller; +package io.metersphere.controller; -import com.fit2cloud.metersphere.user.SessionUtils; +import io.metersphere.user.SessionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/controller/request/LoginRequest.java b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java similarity index 88% rename from backend/src/main/java/com/fit2cloud/metersphere/controller/request/LoginRequest.java rename to backend/src/main/java/io/metersphere/controller/request/LoginRequest.java index a9c39b66fb..3f1ec2737e 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/controller/request/LoginRequest.java +++ b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.controller.request; +package io.metersphere.controller.request; public class LoginRequest { diff --git a/backend/src/main/java/com/fit2cloud/metersphere/interceptor/TestInterceptor.java b/backend/src/main/java/io/metersphere/interceptor/TestInterceptor.java similarity index 91% rename from backend/src/main/java/com/fit2cloud/metersphere/interceptor/TestInterceptor.java rename to backend/src/main/java/io/metersphere/interceptor/TestInterceptor.java index 412c880067..0894c12968 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/interceptor/TestInterceptor.java +++ b/backend/src/main/java/io/metersphere/interceptor/TestInterceptor.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.interceptor; +package io.metersphere.interceptor; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/security/LoginFilter.java b/backend/src/main/java/io/metersphere/security/LoginFilter.java similarity index 93% rename from backend/src/main/java/com/fit2cloud/metersphere/security/LoginFilter.java rename to backend/src/main/java/io/metersphere/security/LoginFilter.java index 8c7987d187..fac3991bb4 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/security/LoginFilter.java +++ b/backend/src/main/java/io/metersphere/security/LoginFilter.java @@ -1,7 +1,7 @@ -package com.fit2cloud.metersphere.security; +package io.metersphere.security; import com.alibaba.fastjson.JSONObject; -import com.fit2cloud.metersphere.controller.ResultHolder; +import io.metersphere.controller.ResultHolder; import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; import javax.servlet.ServletRequest; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/security/ShiroDBRealm.java b/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java similarity index 94% rename from backend/src/main/java/com/fit2cloud/metersphere/security/ShiroDBRealm.java rename to backend/src/main/java/io/metersphere/security/ShiroDBRealm.java index fff730fbe8..ae11bb25cb 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/security/ShiroDBRealm.java +++ b/backend/src/main/java/io/metersphere/security/ShiroDBRealm.java @@ -1,7 +1,7 @@ -package com.fit2cloud.metersphere.security; +package io.metersphere.security; -import com.fit2cloud.metersphere.user.SessionUser; +import io.metersphere.user.SessionUser; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; import org.apache.shiro.authz.AuthorizationInfo; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/user/SessionUser.java b/backend/src/main/java/io/metersphere/user/SessionUser.java similarity index 91% rename from backend/src/main/java/com/fit2cloud/metersphere/user/SessionUser.java rename to backend/src/main/java/io/metersphere/user/SessionUser.java index 3fe412ab9c..0a36e97649 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/user/SessionUser.java +++ b/backend/src/main/java/io/metersphere/user/SessionUser.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.user; +package io.metersphere.user; import java.io.Serializable; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/user/SessionUtils.java b/backend/src/main/java/io/metersphere/user/SessionUtils.java similarity index 91% rename from backend/src/main/java/com/fit2cloud/metersphere/user/SessionUtils.java rename to backend/src/main/java/io/metersphere/user/SessionUtils.java index ceae1ae704..0de933ebe8 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/user/SessionUtils.java +++ b/backend/src/main/java/io/metersphere/user/SessionUtils.java @@ -1,4 +1,4 @@ -package com.fit2cloud.metersphere.user; +package io.metersphere.user; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/websocket/ServerEndpointConfigurator.java b/backend/src/main/java/io/metersphere/websocket/ServerEndpointConfigurator.java similarity index 85% rename from backend/src/main/java/com/fit2cloud/metersphere/websocket/ServerEndpointConfigurator.java rename to backend/src/main/java/io/metersphere/websocket/ServerEndpointConfigurator.java index 788cab51b3..ede3f2e57d 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/websocket/ServerEndpointConfigurator.java +++ b/backend/src/main/java/io/metersphere/websocket/ServerEndpointConfigurator.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.websocket; +package io.metersphere.websocket; -import com.fit2cloud.metersphere.user.SessionUtils; +import io.metersphere.user.SessionUtils; import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; diff --git a/backend/src/main/java/com/fit2cloud/metersphere/websocket/WebSocketServer.java b/backend/src/main/java/io/metersphere/websocket/WebSocketServer.java similarity index 91% rename from backend/src/main/java/com/fit2cloud/metersphere/websocket/WebSocketServer.java rename to backend/src/main/java/io/metersphere/websocket/WebSocketServer.java index 60187ded24..d70e31815f 100644 --- a/backend/src/main/java/com/fit2cloud/metersphere/websocket/WebSocketServer.java +++ b/backend/src/main/java/io/metersphere/websocket/WebSocketServer.java @@ -1,6 +1,6 @@ -package com.fit2cloud.metersphere.websocket; +package io.metersphere.websocket; -import com.fit2cloud.metersphere.user.SessionUtils; +import io.metersphere.user.SessionUtils; import org.springframework.stereotype.Component; import javax.websocket.*; diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index a1ccfd13b3..a5bb195f4c 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -21,6 +21,5 @@ mybatis.configuration.multiple-result-sets-enabled=true mybatis.configuration.use-column-label=true mybatis.configuration.auto-mapping-behavior=full mybatis.configuration.default-statement-timeout=25000 -mybatis.mapper-locations=classpath:mybatis/**/*.xml,classpath*:com/fit2cloud/metersphere/mapper/**/*.xml logging.file.path=/opt/fit2cloud/logs/${spring.application.name} \ No newline at end of file diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index db0befeeb1..1686b43184 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -30,16 +30,16 @@ - + - + - diff --git a/backend/src/test/java/com/fit2cloud/metersphere/ApplicationTests.java b/backend/src/test/java/io/metersphere/ApplicationTests.java similarity index 79% rename from backend/src/test/java/com/fit2cloud/metersphere/ApplicationTests.java rename to backend/src/test/java/io/metersphere/ApplicationTests.java index e3a46a17e7..2cb42192a5 100644 --- a/backend/src/test/java/com/fit2cloud/metersphere/ApplicationTests.java +++ b/backend/src/test/java/io/metersphere/ApplicationTests.java @@ -1,8 +1,8 @@ -package com.fit2cloud.metersphere; +package io.metersphere; -import com.fit2cloud.metersphere.base.domain.User; -import com.fit2cloud.metersphere.base.mapper.UserMapper; +import io.metersphere.base.domain.User; +import io.metersphere.base.mapper.UserMapper; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/frontend/pom.xml b/frontend/pom.xml index 8dd702aa4c..e78f03d58c 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -2,67 +2,69 @@ - - vue-demo - com.fit2cloud - 1.0 - - 4.0.0 - frontend - - UTF-8 - UTF-8 - 1.9.1 - + + metersphere-server + io.metersphere + 1.0 + - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - - - install node and yarn - - install-node-and-yarn - - - generate-resources - - v12.14.1 - v1.21.1 - - - - - yarn install - - yarn - - - - install - - - - - yarn build - - yarn - - - build - - - - - - + 4.0.0 + frontend + + + UTF-8 + UTF-8 + 1.9.1 + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + + install node and yarn + + install-node-and-yarn + + + generate-resources + + v12.14.1 + v1.21.1 + + + + + yarn install + + yarn + + + + install + + + + + yarn build + + yarn + + + build + + + + + + diff --git a/pom.xml b/pom.xml index 0c07c5d93f..28b5a5fcf2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,90 +2,22 @@ 4.0.0 - com.fit2cloud + io.metersphere metersphere-server - 0.0.1-SNAPSHOT + 1.0 pom + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + root frontend backend - - 1.8 - 4.12 - 5.2.1 - - - - - - - org.apache.jmeter - ApacheJMeter_http - ${jmeter.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - - - org.apache.commons - commons-lang3 - 3.9 - - - org.apache.httpcomponents - httpclient - 4.5.10 - - - org.apache.httpcomponents - httpasyncclient - 4.1.4 - - - commons-io - commons-io - 2.6 - - - - org.influxdb - influxdb-java - 2.16 - - - - org.slf4j - slf4j-simple - 1.7.29 - - - - junit - junit - ${junit.version} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - \ No newline at end of file