package name changed.

backend/pom.xml

@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <artifactId>metersphere-server</artifactId>
+        <groupId>io.metersphere</groupId>
+        <version>1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>backend</artifactId>
 
     <properties>
@@ -252,5 +252,4 @@
     </build>
 
 
-
 </project>
\ No newline at end of file

backend/src/main/java/com/fit2cloud/metersphere/Application.java → backend/src/main/java/io/metersphere/Application.java

-package com.fit2cloud.metersphere;
+package io.metersphere;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

backend/src/main/java/com/fit2cloud/metersphere/base/domain/User.java → backend/src/main/java/io/metersphere/base/domain/User.java

-package com.fit2cloud.metersphere.base.domain;
+package io.metersphere.base.domain;
 
 import java.io.Serializable;
 

backend/src/main/java/com/fit2cloud/metersphere/base/domain/UserExample.java → backend/src/main/java/io/metersphere/base/domain/UserExample.java

-package com.fit2cloud.metersphere.base.domain;
+package io.metersphere.base.domain;
 
 import java.util.ArrayList;
 import java.util.List;

backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.java → backend/src/main/java/io/metersphere/base/mapper/UserMapper.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/base/mapper/UserMapper.xml → backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fit2cloud.metersphere.base.mapper.UserMapper">
-  <resultMap id="BaseResultMap" type="com.fit2cloud.metersphere.base.domain.User">
+<mapper namespace="io.metersphere.base.mapper.UserMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.User">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="email" jdbcType="VARCHAR" property="email" />
@@ -71,7 +71,7 @@
   <sql id="Base_Column_List">
     id, name, email, phone, status, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.fit2cloud.metersphere.base.domain.UserExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.UserExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -95,13 +95,13 @@
     delete from user
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.fit2cloud.metersphere.base.domain.UserExample">
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.UserExample">
     delete from user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.fit2cloud.metersphere.base.domain.User">
+  <insert id="insert" parameterType="io.metersphere.base.domain.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>
-  <insert id="insertSelective" parameterType="com.fit2cloud.metersphere.base.domain.User">
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.User">
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.fit2cloud.metersphere.base.domain.UserExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="io.metersphere.base.domain.UserExample" resultType="java.lang.Long">
     select count(*) from user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -206,7 +206,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.fit2cloud.metersphere.base.domain.User">
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.User">
     update user
     <set>
       <if test="name != null">
@@ -230,7 +230,7 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.fit2cloud.metersphere.base.domain.User">
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.User">
     update user
     set name = #{name,jdbcType=VARCHAR},
       email = #{email,jdbcType=VARCHAR},

backend/src/main/java/com/fit2cloud/metersphere/config/MybatisConfig.java → backend/src/main/java/io/metersphere/config/MybatisConfig.java

-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 {

backend/src/main/java/com/fit2cloud/metersphere/config/ShiroConfig.java → backend/src/main/java/io/metersphere/config/ShiroConfig.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/config/WebConfig.java → backend/src/main/java/io/metersphere/config/WebConfig.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/config/WebSocketConfig.java → backend/src/main/java/io/metersphere/config/WebSocketConfig.java

-package com.fit2cloud.metersphere.config;
+package io.metersphere.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

backend/src/main/java/com/fit2cloud/metersphere/controller/IndexController.java → backend/src/main/java/io/metersphere/controller/IndexController.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/controller/LoginController.java → backend/src/main/java/io/metersphere/controller/LoginController.java

-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.*;

backend/src/main/java/com/fit2cloud/metersphere/controller/ResultHolder.java → backend/src/main/java/io/metersphere/controller/ResultHolder.java

-package com.fit2cloud.metersphere.controller;
+package io.metersphere.controller;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

backend/src/main/java/com/fit2cloud/metersphere/controller/TestController.java → backend/src/main/java/io/metersphere/controller/TestController.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/controller/request/LoginRequest.java → backend/src/main/java/io/metersphere/controller/request/LoginRequest.java

-package com.fit2cloud.metersphere.controller.request;
+package io.metersphere.controller.request;
 
 public class LoginRequest {
 

backend/src/main/java/com/fit2cloud/metersphere/interceptor/TestInterceptor.java → backend/src/main/java/io/metersphere/interceptor/TestInterceptor.java

-package com.fit2cloud.metersphere.interceptor;
+package io.metersphere.interceptor;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;

backend/src/main/java/com/fit2cloud/metersphere/security/LoginFilter.java → backend/src/main/java/io/metersphere/security/LoginFilter.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/security/ShiroDBRealm.java → backend/src/main/java/io/metersphere/security/ShiroDBRealm.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/user/SessionUser.java → backend/src/main/java/io/metersphere/user/SessionUser.java

-package com.fit2cloud.metersphere.user;
+package io.metersphere.user;
 
 import java.io.Serializable;
 

backend/src/main/java/com/fit2cloud/metersphere/user/SessionUtils.java → backend/src/main/java/io/metersphere/user/SessionUtils.java

-package com.fit2cloud.metersphere.user;
+package io.metersphere.user;
 
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;

backend/src/main/java/com/fit2cloud/metersphere/websocket/ServerEndpointConfigurator.java → backend/src/main/java/io/metersphere/websocket/ServerEndpointConfigurator.java

-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;

backend/src/main/java/com/fit2cloud/metersphere/websocket/WebSocketServer.java → backend/src/main/java/io/metersphere/websocket/WebSocketServer.java

-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.*;

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

backend/src/main/resources/generatorConfig.xml

@@ -30,16 +30,16 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
         <!-- 模型对象 -->
-        <javaModelGenerator targetPackage="com.fit2cloud.metersphere.base.domain" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="io.metersphere.base.domain" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
             <property name="trimStrings" value="true"/>
         </javaModelGenerator>
         <!-- XML映射文件 -->
-        <sqlMapGenerator targetPackage="com.fit2cloud.metersphere.base.mapper" targetProject="src/main/java">
+        <sqlMapGenerator targetPackage="io.metersphere.base.mapper" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
         <!-- 接口 -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.fit2cloud.metersphere.base.mapper"
+        <javaClientGenerator type="XMLMAPPER" targetPackage="io.metersphere.base.mapper"
                              targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>

backend/src/test/java/com/fit2cloud/metersphere/ApplicationTests.java → backend/src/test/java/io/metersphere/ApplicationTests.java

-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;

frontend/pom.xml

@@ -2,67 +2,69 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>vue-demo</artifactId>
-        <groupId>com.fit2cloud</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>frontend</artifactId>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
-    </properties>
+  <parent>
+    <artifactId>metersphere-server</artifactId>
+    <groupId>io.metersphere</groupId>
+    <version>1.0</version>
+  </parent>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <version>${frontend-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <!-- optional: you don't really need execution ids, but it looks nice in your build log. -->
-                        <id>install node and yarn</id>
-                        <goals>
-                            <goal>install-node-and-yarn</goal>
-                        </goals>
-                        <!-- optional: default phase is "generate-resources" -->
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <nodeVersion>v12.14.1</nodeVersion>
-                            <yarnVersion>v1.21.1</yarnVersion>
-                        </configuration>
-                    </execution>
-                    <!-- Install all project dependencies -->
-                    <execution>
-                        <id>yarn install</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <!-- optional: The default argument is actually
-                            "install", so unless you need to run some other yarn command,
-                            you can remove this whole <configuration> section.
-                            -->
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <!-- Build and minify static files -->
-                    <execution>
-                        <id>yarn build</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>build</arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>frontend</artifactId>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <version>${frontend-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <!-- optional: you don't really need execution ids, but it looks nice in your build log. -->
+            <id>install node and yarn</id>
+            <goals>
+              <goal>install-node-and-yarn</goal>
+            </goals>
+            <!-- optional: default phase is "generate-resources" -->
+            <phase>generate-resources</phase>
+            <configuration>
+              <nodeVersion>v12.14.1</nodeVersion>
+              <yarnVersion>v1.21.1</yarnVersion>
+            </configuration>
+          </execution>
+          <!-- Install all project dependencies -->
+          <execution>
+            <id>yarn install</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <!-- optional: The default argument is actually
+              "install", so unless you need to run some other yarn command,
+              you can remove this whole <configuration> section.
+              -->
+              <arguments>install</arguments>
+            </configuration>
+          </execution>
+          <!-- Build and minify static files -->
+          <execution>
+            <id>yarn build</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>build</arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

pom.xml

@@ -2,90 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.fit2cloud</groupId>
+    <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    
     <name>root</name>
     <modules>
         <module>frontend</module>
         <module>backend</module>
     </modules>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <junit.version>4.12</junit.version>
-        <jmeter.version>5.2.1</jmeter.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- jmeter -->
-            <dependency>
-                <groupId>org.apache.jmeter</groupId>
-                <artifactId>ApacheJMeter_http</artifactId>
-                <version>${jmeter.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.logging.log4j</groupId>
-                        <artifactId>log4j-slf4j-impl</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.5.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpasyncclient</artifactId>
-                <version>4.1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.6</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.influxdb</groupId>
-                <artifactId>influxdb-java</artifactId>
-                <version>2.16</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.7.29</version>
-            </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file