package name changed.
This commit is contained in:
parent
253a7da6cc
commit
8830231352
|
@ -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>
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere;
|
||||
package io.metersphere;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.base.domain;
|
||||
package io.metersphere.base.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.base.domain;
|
||||
package io.metersphere.base.domain;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
|
@ -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;
|
|
@ -1,7 +1,7 @@
|
|||
<?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},
|
|
@ -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 {
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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.*;
|
|
@ -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;
|
|
@ -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;
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.controller.request;
|
||||
package io.metersphere.controller.request;
|
||||
|
||||
public class LoginRequest {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.interceptor;
|
||||
package io.metersphere.interceptor;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
|
@ -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;
|
|
@ -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;
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.user;
|
||||
package io.metersphere.user;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.fit2cloud.metersphere.user;
|
||||
package io.metersphere.user;
|
||||
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.session.Session;
|
|
@ -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;
|
|
@ -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.*;
|
|
@ -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}
|
|
@ -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>
|
||||
|
|
|
@ -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;
|
|
@ -2,13 +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>
|
||||
<artifactId>vue-demo</artifactId>
|
||||
<groupId>com.fit2cloud</groupId>
|
||||
<artifactId>metersphere-server</artifactId>
|
||||
<groupId>io.metersphere</groupId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>frontend</artifactId>
|
||||
|
||||
<properties>
|
||||
|
|
86
pom.xml
86
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>
|
Loading…
Reference in New Issue