frontend backend

babysor · Feb 3, 2020 · c27167a · c27167a
1 parent de8e29f
commit c27167a
Show file tree

Hide file tree

Showing 64 changed files with 1,668 additions and 236 deletions.
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -0,0 +1,29 @@
+# Created by .ignore support plugin (hsz.mobi)
+.DS_Store
+node_modules
+node/
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+*.iml
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+
+src/main/resources/static
+src/main/resources/templates
+target
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 -->
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>backend</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <shiro.version>1.4.0</shiro.version>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>hibernate-validator</artifactId>
+                    <groupId>org.hibernate.validator</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <!--
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.theborakompanioni</groupId>
+            <artifactId>thymeleaf-extras-shiro</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>${shiro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-beanutils</artifactId>
+                    <groupId>commons-beanutils</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+            <version>${shiro.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>${shiro.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.45</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <addResources>true</addResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <!-- Overlay guacamole-common-js (zip) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>main-class-placement</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <move todir="src/main/resources/static">
+                                    <fileset dir="../frontend/dist">
+                                        <exclude name="*.html"/>
+                                    </fileset>
+                                </move>
+                                <move todir="src/main/resources/templates">
+                                    <fileset dir="../frontend/dist">
+                                        <include name="*.html"/>
+                                    </fileset>
+                                </move>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.7</version>
+                <configuration>
+                    <verbose>true</verbose>
+                    <overwrite>true</overwrite>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.41</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+
+
+</project>
diff --git a/...om/fit2cloud/metersphere/Application.java → ...om/fit2cloud/metersphere/Application.java b/...om/fit2cloud/metersphere/Application.java → ...om/fit2cloud/metersphere/Application.java
diff --git a/...t2cloud/metersphere/base/domain/User.java → ...t2cloud/metersphere/base/domain/User.java b/...t2cloud/metersphere/base/domain/User.java → ...t2cloud/metersphere/base/domain/User.java
diff --git a/.../metersphere/base/domain/UserExample.java → .../metersphere/base/domain/UserExample.java b/.../metersphere/base/domain/UserExample.java → .../metersphere/base/domain/UserExample.java
diff --git a/...d/metersphere/base/mapper/UserMapper.java → ...d/metersphere/base/mapper/UserMapper.java b/...d/metersphere/base/mapper/UserMapper.java → ...d/metersphere/base/mapper/UserMapper.java
diff --git a/...ud/metersphere/base/mapper/UserMapper.xml → ...ud/metersphere/base/mapper/UserMapper.xml b/...ud/metersphere/base/mapper/UserMapper.xml → ...ud/metersphere/base/mapper/UserMapper.xml
diff --git a/...oud/metersphere/config/MybatisConfig.java → ...oud/metersphere/config/MybatisConfig.java b/...oud/metersphere/config/MybatisConfig.java → ...oud/metersphere/config/MybatisConfig.java
diff --git a/...cloud/metersphere/config/ShiroConfig.java → ...cloud/metersphere/config/ShiroConfig.java b/...cloud/metersphere/config/ShiroConfig.java → ...cloud/metersphere/config/ShiroConfig.java
diff --git a/...t2cloud/metersphere/config/WebConfig.java → ...t2cloud/metersphere/config/WebConfig.java b/...t2cloud/metersphere/config/WebConfig.java → ...t2cloud/metersphere/config/WebConfig.java
diff --git a/...d/metersphere/config/WebSocketConfig.java → ...d/metersphere/config/WebSocketConfig.java b/...d/metersphere/config/WebSocketConfig.java → ...d/metersphere/config/WebSocketConfig.java
diff --git a/...tersphere/controller/IndexController.java → ...tersphere/controller/IndexController.java b/...tersphere/controller/IndexController.java → ...tersphere/controller/IndexController.java
diff --git a/...tersphere/controller/LoginController.java → ...tersphere/controller/LoginController.java b/...tersphere/controller/LoginController.java → ...tersphere/controller/LoginController.java
diff --git a/.../metersphere/controller/ResultHolder.java → .../metersphere/controller/ResultHolder.java b/.../metersphere/controller/ResultHolder.java → .../metersphere/controller/ResultHolder.java
diff --git a/...etersphere/controller/TestController.java → ...etersphere/controller/TestController.java b/...etersphere/controller/TestController.java → ...etersphere/controller/TestController.java
diff --git a/...here/controller/request/LoginRequest.java → ...here/controller/request/LoginRequest.java b/...here/controller/request/LoginRequest.java → ...here/controller/request/LoginRequest.java
diff --git a/...ersphere/interceptor/TestInterceptor.java → ...ersphere/interceptor/TestInterceptor.java b/...ersphere/interceptor/TestInterceptor.java → ...ersphere/interceptor/TestInterceptor.java
diff --git a/...oud/metersphere/security/LoginFilter.java → ...oud/metersphere/security/LoginFilter.java b/...oud/metersphere/security/LoginFilter.java → ...oud/metersphere/security/LoginFilter.java
diff --git a/...ud/metersphere/security/ShiroDBRealm.java → ...ud/metersphere/security/ShiroDBRealm.java b/...ud/metersphere/security/ShiroDBRealm.java → ...ud/metersphere/security/ShiroDBRealm.java
diff --git a/...t2cloud/metersphere/user/SessionUser.java → ...t2cloud/metersphere/user/SessionUser.java b/...t2cloud/metersphere/user/SessionUser.java → ...t2cloud/metersphere/user/SessionUser.java
diff --git a/...2cloud/metersphere/user/SessionUtils.java → ...2cloud/metersphere/user/SessionUtils.java b/...2cloud/metersphere/user/SessionUtils.java → ...2cloud/metersphere/user/SessionUtils.java
diff --git a/...websocket/ServerEndpointConfigurator.java → ...websocket/ServerEndpointConfigurator.java b/...websocket/ServerEndpointConfigurator.java → ...websocket/ServerEndpointConfigurator.java
diff --git a/...etersphere/websocket/WebSocketServer.java → ...etersphere/websocket/WebSocketServer.java b/...etersphere/websocket/WebSocketServer.java → ...etersphere/websocket/WebSocketServer.java
diff --git a/src/main/resources/application.properties → ...src/main/resources/application.properties b/src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/src/main/resources/generatorConfig.xml → ...nd/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml → ...nd/src/main/resources/generatorConfig.xml
diff --git a/src/main/resources/logback.xml → backend/src/main/resources/logback.xml b/src/main/resources/logback.xml → backend/src/main/resources/logback.xml
diff --git a/...t2cloud/metersphere/ApplicationTests.java → ...t2cloud/metersphere/ApplicationTests.java b/...t2cloud/metersphere/ApplicationTests.java → ...t2cloud/metersphere/ApplicationTests.java
diff --git a/frontend/.editorconfig b/frontend/.editorconfig
@@ -0,0 +1,14 @@
+# https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -0,0 +1,29 @@
+.DS_Store
+node_modules
+node/
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+*.iml
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.setting
+.project
+.classpath
+yarn.lock
+package-lock.json
+
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}
diff --git a/frontend/package.json b/frontend/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "vue-demo",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^1.2.26",
+    "@fortawesome/free-regular-svg-icons": "^5.12.0",
+    "@fortawesome/free-solid-svg-icons": "^5.12.0",
+    "@fortawesome/vue-fontawesome": "^0.1.9",
+    "axios": "^0.19.0",
+    "core-js": "^3.4.3",
+    "element-ui": "^2.13.0",
+    "vue": "^2.6.10",
+    "vue-i18n": "^8.15.3",
+    "vue-router": "^3.1.3"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.1.0",
+    "@vue/cli-plugin-eslint": "^4.1.0",
+    "@vue/cli-service": "^4.1.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^5.16.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "vue-template-compiler": "^2.6.10"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}