Merge branch 'feature_mediator_render' into 'master'

Feature mediator render

See merge request crowd-2019/crowd-test-service-backend!7

.gitignore

@@ -1,9 +1,9 @@
+/eclipse
 tmp
 precompiled
 /conf/application.conf
 test-result
 .classpath
-.project
 *.launch
 *.classpath
 *.DS_Store
@@ -13,5 +13,4 @@ test-result
 **.log
 /log/
 .idea/
-**target/
-.settings/
+**target/

core/pom.xml

@@ -0,0 +1,87 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.mooctest.crowd</groupId>
+    <artifactId>core</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+
+        <!--dubbo-domainservice-api-->
+        <!--dubbo-dependency-->
+        <!-- https://mvnrepository.com/artifact/io.dubbo.springboot/spring-boot-starter-dubbo -->
+        <dependency>
+            <groupId>io.dubbo.springboot</groupId>
+            <artifactId>spring-boot-starter-dubbo</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.1.6.RELEASE</version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.surefire</groupId>-->
+<!--                <artifactId>surefire-junit4</artifactId>-->
+<!--                <version>2.12.4</version>-->
+<!--            </plugin>-->
+        </plugins>
+    </build>
+</project>

core/src/main/java/com/mooctest/crowd/domain/command/CreateProjectCommand.java

@@ -0,0 +1,12 @@
+package com.mooctest.crowd.domain.command;
+
+import lombok.Data;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 14:37
+ */
+@Data
+public class CreateProjectCommand {
+}

src/main/java/com/mooctest/crowd/domain/command/LoginCommand.java → core/src/main/java/com/mooctest/crowd/domain/command/LoginCommand.java

@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
 /**
  * @Author: xuexb
  * @Date: 2019.7.5 14:24
@@ -12,7 +15,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class LoginCommand {
+    @NotNull(message = "Mobile number must not be null")
+    @Pattern(regexp = "^[0-9]{11}$", message = "Mobile number is illegal")
     private String mobileNum;
+
     private String password;
     private String checkCode;
 }

core/src/main/java/com/mooctest/crowd/domain/command/ProjectDetailsCommand.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.domain.command;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 14:42
+ */
+public class ProjectDetailsCommand {
+}

core/src/main/java/com/mooctest/crowd/domain/command/RegisterCommand.java

@@ -0,0 +1,29 @@
+package com.mooctest.crowd.domain.command;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @Author: xuexb
+ * @Date: 2019.7.5 14:09
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RegisterCommand {
+    @NotNull(message = "Mobile number must not be null")
+    @Pattern(regexp = "^[0-9]{11}$", message = "Mobile number is illegal")
+    private String mobileNum;
+
+    @NotNull(message = "Checkcode must not be null")
+    private String checkCode;
+
+    @NotNull(message = "Password must not be null")
+    @Length(min = 6, max = 16, message = "The length of password must between 6~16")
+    private String password;
+}

src/main/java/com/mooctest/crowd/domain/domainobject/Account.java → core/src/main/java/com/mooctest/crowd/domain/domainobject/Account.java

@@ -62,4 +62,13 @@ public class Account {
     }
 
 
+    public boolean login(String mobileNum, String password) throws PasswordErrorException {
+
+        if (this.getPassword().equals(password)){
+            return true;
+        }
+        else {
+            throw new PasswordErrorException();
+        }
+    }
 }

src/main/java/com/mooctest/crowd/domain/domainservice/RegisterDService.java → core/src/main/java/com/mooctest/crowd/domain/domainservice/RegisterDService.java

@@ -15,4 +15,8 @@ public class RegisterDService {
         account.setMobileNum(cmd.getMobileNum());
         return account;
     }
+
+    public static Account register(String mobileNum, String password) {
+        return null;
+    }
 }

src/main/java/com/mooctest/crowd/domain/exception/AccountNotExistException.java → core/src/main/java/com/mooctest/crowd/domain/exception/AccountNotExistException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @Author: xuexb
  * @Date: 2019.7.5 14:36
  */
-public class AccountNotExistException extends Exception {
+public class AccountNotExistException extends BaseException {
 }

core/src/main/java/com/mooctest/crowd/domain/exception/BadRequestException.java

@@ -0,0 +1,15 @@
+package com.mooctest.crowd.domain.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 09:05
+ */
+@NoArgsConstructor
+public class BadRequestException extends BaseException {
+    public BadRequestException(String msg){
+        super(msg);
+    }
+}

core/src/main/java/com/mooctest/crowd/domain/exception/BaseException.java

@@ -0,0 +1,15 @@
+package com.mooctest.crowd.domain.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 00:15
+ */
+@NoArgsConstructor
+public class BaseException extends Exception {
+    public BaseException(String msg){
+        super(msg);
+    }
+}

src/main/java/com/mooctest/crowd/domain/exception/CrowdTestProjectNotExistException.java → core/src/main/java/com/mooctest/crowd/domain/exception/CrowdTestProjectNotExistException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @author guochao
  * @date 2019/7/6 22:10
  */
-public class CrowdTestProjectNotExistException extends Throwable {
+public class CrowdTestProjectNotExistException extends BaseException {
 }

src/main/java/com/mooctest/crowd/domain/exception/CrowdTestReportNotExistException.java → core/src/main/java/com/mooctest/crowd/domain/exception/CrowdTestReportNotExistException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @author guochao
  * @date 2019/7/16 14:04
  */
-public class CrowdTestReportNotExistException extends Throwable {
+public class CrowdTestReportNotExistException extends BaseException {
 }

src/main/java/com/mooctest/crowd/domain/exception/CrowdTestTaskNoPriceException.java → core/src/main/java/com/mooctest/crowd/domain/exception/CrowdTestTaskNoPriceException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @author guochao
  * @date 2019/7/16 9:23
  */
-public class CrowdTestTaskNoPriceException extends Throwable {
+public class CrowdTestTaskNoPriceException extends BaseException {
 }

src/main/java/com/mooctest/crowd/domain/exception/CrowdTestTaskNotExistException.java → core/src/main/java/com/mooctest/crowd/domain/exception/CrowdTestTaskNotExistException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @author guochao
  * @date 2019/7/6 22:10
  */
-public class CrowdTestTaskNotExistException extends Throwable {
+public class CrowdTestTaskNotExistException extends BaseException {
 }

src/main/java/com/mooctest/crowd/domain/exception/PasswordErrorException.java → core/src/main/java/com/mooctest/crowd/domain/exception/PasswordErrorException.java

@@ -4,5 +4,5 @@ package com.mooctest.crowd.domain.exception;
  * @Author: xuexb
  * @Date: 2019.7.5 14:47
  */
-public class PasswordErrorException extends Throwable {
+public class PasswordErrorException extends BaseException {
 }

src/main/java/com/mooctest/crowd/domain/repository/AccountUTRepo.java → core/src/main/java/com/mooctest/crowd/domain/repository/AccountUTRepo.java

@@ -2,6 +2,7 @@ package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.domainobject.Account;
 import com.mooctest.crowd.domain.exception.AccountNotExistException;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +11,7 @@ import java.util.List;
  * @Author: xuexb
  * @Date: 2019.7.5 14:28
  */
+@Component
 public class AccountUTRepo implements IAccountRepo {
     @Override
     public Account getByMobileNum(String mobileNum) throws AccountNotExistException {

pom.xml

@@ -1,76 +1,13 @@
 <?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"
+<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">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.mooctest.crowd</groupId>
-    <artifactId>domain</artifactId>
+    <artifactId>crowd</artifactId>
+    <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-
-        <!--dubbo-domainservice-api-->
-        <!--dubbo-dependency-->
-        <!-- https://mvnrepository.com/artifact/io.dubbo.springboot/spring-boot-starter-dubbo -->
-        <dependency>
-            <groupId>io.dubbo.springboot</groupId>
-            <artifactId>spring-boot-starter-dubbo</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.6</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.surefire</groupId>
-                <artifactId>surefire-junit4</artifactId>
-                <version>2.18.1</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+    <modules>
+        <module>core</module>
+        <module>site</module>
+    </modules>
+</project>

site/pom.xml

@@ -0,0 +1,78 @@
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.6.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.mooctest.crowd</groupId>
+	<artifactId>site</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>site</name>
+	<description>Demo project for Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+		</dependency>
+		<dependency>
+			<groupId>com.mooctest.crowd</groupId>
+			<artifactId>core</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

site/src/main/java/com/mooctest/crowd/site/SiteApplication.java

@@ -0,0 +1,13 @@
+package com.mooctest.crowd.site;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SiteApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SiteApplication.class, args);
+	}
+
+}

site/src/main/java/com/mooctest/crowd/site/annotation/LoginRequired.java

@@ -0,0 +1,16 @@
+package com.mooctest.crowd.site.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-24 23:50
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LoginRequired {
+}

site/src/main/java/com/mooctest/crowd/site/command/AccountCommand.java

@@ -0,0 +1,14 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+/**
+ * @Author: xuexb
+ * @Date: 2019.7.5 14:24
+ */
+@Data
+public class AccountCommand {
+    private Long id;
+    private String mobileNum;
+    private String password;
+}

site/src/main/java/com/mooctest/crowd/site/command/CreateProjectCommand.java

@@ -0,0 +1,12 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 14:37
+ */
+@Data
+public class CreateProjectCommand {
+}

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestProjectCommand.java

@@ -0,0 +1,24 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+import java.io.File;
+
+/**
+ * @author guochao
+ * @date 2019/7/6 18:50
+ */
+@Data
+public class CrowdTestProjectCommand {
+    private Long id;
+    private String name;
+    private Long ownerId;
+    private Long managerId;
+    private Long distributeId;
+    private String description;
+    private File projectFile;
+    private File requirement;
+    private double quotedPrice;
+    private double fixedPrice;
+    private String status;
+}

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestReportCommand.java

@@ -0,0 +1,20 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+/**
+ * @author guochao
+ * @date 2019/7/11 14:16
+ */
+@Data
+public class CrowdTestReportCommand {
+
+    private Long id;
+    private Long projectId;
+    private Long taskId;
+    private int type;
+    private String description;
+    private String content;
+    private String status;
+
+}

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestTaskCommand.java

@@ -0,0 +1,22 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+import java.io.File;
+
+/**
+ * @author guochao
+ * @date 2019/7/11 14:14
+ */
+@Data
+public class CrowdTestTaskCommand {
+    private Long id;
+    private String name;
+    private Long projectId;
+    private Long evaluationAgencyId;
+    private int type;
+    private String description;
+    private File requirementFile;
+    public Double price;
+    private String status;
+}

site/src/main/java/com/mooctest/crowd/site/command/LoginCommand.java

@@ -0,0 +1,25 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @Author: xuexb
+ * @Date: 2019.7.5 14:24
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginCommand {
+    @NotNull(message = "Mobile number must not be null")
+    @Pattern(regexp = "^[0-9]{11}$", message = "Mobile number is illegal")
+    private String mobileNum;
+
+    private String password;
+    private String checkCode;
+}

site/src/main/java/com/mooctest/crowd/site/command/ModifyPasswordCommand.java

@@ -0,0 +1,14 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+/**
+ * @author guochao
+ * @date 2019/7/5 19:13
+ */
+@Data
+public class ModifyPasswordCommand {
+    private String mobileNum;
+    private String oldPassword;
+    private String newPassword;
+}

site/src/main/java/com/mooctest/crowd/site/command/ProjectDetailsCommand.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.site.command;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 14:42
+ */
+public class ProjectDetailsCommand {
+}

site/src/main/java/com/mooctest/crowd/site/command/RegisterCommand.java

@@ -0,0 +1,30 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @Author: xuexb
+ * @Date: 2019.7.5 14:09
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RegisterCommand {
+    @NotNull(message = "Mobile number must not be null")
+    @Pattern(regexp = "^[0-9]{11}$", message = "Mobile number is illegal")
+    private String mobileNum;
+
+    @NotNull(message = "Checkcode must not be null")
+    private String checkCode;
+
+    @NotNull(message = "Password must not be null")
+    @Length(min = 6, max = 16, message = "The length of password must between 6~16")
+    private String password;
+}

site/src/main/java/com/mooctest/crowd/site/constants/ResponseConstant.java

@@ -0,0 +1,13 @@
+package com.mooctest.crowd.site.constants;
+
+public class ResponseConstant {
+    public static final int OK = 2000;
+    public static final int FAIL = 4000;
+    public static final int ERROR = 5000;
+    public static final int UNAUTH = 40001;
+
+    public static final String REQUEST_SUCCESS = "请求成功";
+    public static final String REQUEST_FAILED = "请求失败";
+    public static final String SYSTEM_EEROR = "系统出错";
+    public static final String USER_NOT_EXISTS = "账号不存在";
+}

site/src/main/java/com/mooctest/crowd/site/controller/CommonController.java

@@ -0,0 +1 @@
+package com.mooctest.crowd.site.controller;


import com.mooctest.crowd.site.constants.ResponseConstant;
import com.mooctest.crowd.site.data.ResponseMessage;
import com.mooctest.crowd.site.data.dto.IndexDTO;
import com.mooctest.crowd.site.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:51
 */
@RestController
public class CommonController {

    @Autowired
    private CommonService commonService;

    @RequestMapping(value = "/index", method = RequestMethod.GET)
    public ResponseMessage<IndexDTO> index(){
        return new ResponseMessage<>(ResponseConstant.OK,
                ResponseConstant.REQUEST_SUCCESS,
                commonService.getIndexInfo());
    }
}

site/src/main/java/com/mooctest/crowd/site/controller/CrowdProjectController.java

@@ -0,0 +1,27 @@
+package com.mooctest.crowd.site.controller;
+
+import com.mooctest.crowd.site.command.CreateProjectCommand;
+import com.mooctest.crowd.site.command.ProjectDetailsCommand;
+import com.mooctest.crowd.site.constants.ResponseConstant;
+import com.mooctest.crowd.site.data.ResponseMessage;
+import com.mooctest.crowd.site.data.dto.ProjectDetailsDTO;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-24 23:50
+ */
+public class CrowdProjectController {
+
+    @RequestMapping(value = "/project", method = RequestMethod.POST)
+    public ResponseMessage<Boolean> createProject(CreateProjectCommand createProjectCommand){
+        return new ResponseMessage<>(ResponseConstant.OK, ResponseConstant.REQUEST_SUCCESS);
+    }
+
+    @RequestMapping(value = "/project", method = RequestMethod.GET)
+    public ResponseMessage<ProjectDetailsDTO> getProject(ProjectDetailsCommand projectDetailsCommand){
+        return new ResponseMessage<>(ResponseConstant.OK, ResponseConstant.REQUEST_SUCCESS);
+    }
+}

site/src/main/java/com/mooctest/crowd/site/controller/CrowdReportController.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.site.controller;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-24 23:50
+ */
+public class CrowdReportController {
+}

site/src/main/java/com/mooctest/crowd/site/controller/CrowdTaskController.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.site.controller;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-24 23:50
+ */
+public class CrowdTaskController {
+}

site/src/main/java/com/mooctest/crowd/site/controller/UserController.java

@@ -0,0 +1,42 @@
+package com.mooctest.crowd.site.controller;
+
+import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.constants.ResponseConstant;
+import com.mooctest.crowd.site.data.ResponseMessage;
+import com.mooctest.crowd.site.data.dto.UserDTO;
+import com.mooctest.crowd.domain.exception.AccountNotExistException;
+import com.mooctest.crowd.domain.exception.BadRequestException;
+import com.mooctest.crowd.domain.exception.PasswordErrorException;
+import com.mooctest.crowd.site.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-24 23:50
+ */
+@RestController
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(value = "/account", method = RequestMethod.POST)
+    public ResponseMessage<UserDTO> register(@Validated RegisterCommand registerCommand, BindingResult result) throws BadRequestException {
+        if (result.hasErrors())
+            throw new BadRequestException(result.getFieldError().getDefaultMessage());
+        return new ResponseMessage<>(ResponseConstant.OK, "注册成功", userService.register(registerCommand));
+    }
+
+    @RequestMapping(value = "/api/login", method = RequestMethod.GET)
+    public ResponseMessage<UserDTO> loginByMobileAndPwd(@Validated LoginCommand loginCommand, BindingResult result) throws PasswordErrorException, AccountNotExistException, BadRequestException {
+        if (result.hasErrors())
+            throw new BadRequestException(result.getFieldError().getDefaultMessage());
+        return new ResponseMessage<>(ResponseConstant.OK, "登录成功", userService.loginByMobileAndPwd(loginCommand));
+    }
+}

site/src/main/java/com/mooctest/crowd/site/controller/advice/ExceptionAdvice.java

@@ -0,0 +1,40 @@
+package com.mooctest.crowd.site.controller.advice;
+
+import com.mooctest.crowd.site.constants.ResponseConstant;
+import com.mooctest.crowd.site.data.ResponseMessage;
+import com.mooctest.crowd.domain.exception.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-07-25 00:08
+ */
+@Slf4j
+@RestControllerAdvice
+public class ExceptionAdvice {
+
+    @ExceptionHandler(BaseException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResponseMessage handleException(Exception e){
+        log.error("出错！", e);
+        if (e instanceof AccountNotExistException){
+            return new ResponseMessage(ResponseConstant.FAIL, ResponseConstant.USER_NOT_EXISTS);
+        } else if (e instanceof CrowdTestProjectNotExistException){
+            return new ResponseMessage(ResponseConstant.FAIL, "项目不存在");
+        } else if (e instanceof CrowdTestTaskNotExistException){
+            return new ResponseMessage(ResponseConstant.FAIL, "任务不存在");
+        } else if (e instanceof CrowdTestReportNotExistException){
+            return new ResponseMessage(ResponseConstant.FAIL, "报告不存在");
+        } else if (e instanceof CrowdTestTaskNoPriceException){
+            return new ResponseMessage(ResponseConstant.FAIL, "项目未设置价格");
+        } else if (e instanceof PasswordErrorException){
+            return new ResponseMessage(ResponseConstant.UNAUTH, "密码错误");
+        } else
+            return new ResponseMessage(ResponseConstant.FAIL, ResponseConstant.REQUEST_FAILED);
+    }
+}

site/src/main/java/com/mooctest/crowd/site/data/ResponseMessage.java

@@ -0,0 +1,22 @@
+package com.mooctest.crowd.site.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ResponseMessage<T> {
+    private int code;
+    private String msg;
+    private T data;
+
+    public static final ResponseMessage OK = new ResponseMessage();
+
+    public ResponseMessage(int code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+}

src/main/java/com/mooctest/crowd/domain/data/dto/IndexDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/IndexDTO.java

@@ -1,8 +1,8 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.EvolutionAgencyVO;
-import com.mooctest.crowd.domain.data.vo.CrowdTaskVO;
-import com.mooctest.crowd.domain.data.vo.UserVO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
+import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.UserVO;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/mooctest/crowd/domain/data/dto/MyCrowdDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/MyCrowdDTO.java

@@ -1,8 +1,8 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdProjectVO;
-import com.mooctest.crowd.domain.data.vo.CrowdTaskVO;
-import com.mooctest.crowd.domain.data.vo.UserVO;
+import com.mooctest.crowd.site.data.vo.CrowdProjectVO;
+import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.UserVO;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/mooctest/crowd/domain/data/dto/ProjectDetailsDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/ProjectDetailsDTO.java

@@ -1,8 +1,8 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdProjectVO;
-import com.mooctest.crowd.domain.data.vo.CrowdReportVO;
-import com.mooctest.crowd.domain.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.CrowdProjectVO;
+import com.mooctest.crowd.site.data.vo.CrowdReportVO;
+import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/mooctest/crowd/domain/data/dto/ReportDetailsDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/ReportDetailsDTO.java

@@ -1,6 +1,6 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdReportVO;
+import com.mooctest.crowd.site.data.vo.CrowdReportVO;
 import lombok.Data;
 
 /**

src/main/java/com/mooctest/crowd/domain/data/dto/TaskDetailsDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/TaskDetailsDTO.java

@@ -1,7 +1,7 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdReportVO;
-import com.mooctest.crowd.domain.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.CrowdReportVO;
+import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/mooctest/crowd/domain/data/dto/TaskSquareDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/TaskSquareDTO.java

@@ -1,6 +1,6 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/mooctest/crowd/domain/data/dto/UserDTO.java → site/src/main/java/com/mooctest/crowd/site/data/dto/UserDTO.java

@@ -1,7 +1,7 @@
-package com.mooctest.crowd.domain.data.dto;
+package com.mooctest.crowd.site.data.dto;
 
-import com.mooctest.crowd.domain.data.vo.CrowdProjectVO;
-import com.mooctest.crowd.domain.data.vo.UserVO;
+import com.mooctest.crowd.site.data.vo.CrowdProjectVO;
+import com.mooctest.crowd.site.data.vo.UserVO;
 import com.mooctest.crowd.domain.domainobject.Permission;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,4 +20,8 @@ public class UserDTO {
     private UserVO userVO;
     private List<Permission> permissions;
     private List<CrowdProjectVO> crowdProjectVOS;
+
+    public UserDTO(UserVO userVO) {
+        this.userVO = userVO;
+    }
 }

src/main/java/com/mooctest/crowd/domain/data/vo/CrowdProjectVO.java → site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdProjectVO.java

@@ -1,4 +1,4 @@
-package com.mooctest.crowd.domain.data.vo;
+package com.mooctest.crowd.site.data.vo;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
 import lombok.AllArgsConstructor;

src/main/java/com/mooctest/crowd/domain/data/vo/CrowdReportVO.java → site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdReportVO.java

@@ -1,4 +1,4 @@
-package com.mooctest.crowd.domain.data.vo;
+package com.mooctest.crowd.site.data.vo;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
 import com.mooctest.crowd.domain.domainobject.CrowdTestReport;

src/main/java/com/mooctest/crowd/domain/data/vo/CrowdTaskVO.java → site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -1,4 +1,4 @@
-package com.mooctest.crowd.domain.data.vo;
+package com.mooctest.crowd.site.data.vo;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
 import lombok.AllArgsConstructor;

src/main/java/com/mooctest/crowd/domain/data/vo/EvolutionAgencyVO.java → site/src/main/java/com/mooctest/crowd/site/data/vo/EvolutionAgencyVO.java

@@ -1,4 +1,4 @@
-package com.mooctest.crowd.domain.data.vo;
+package com.mooctest.crowd.site.data.vo;
 
 import lombok.Data;
 

site/src/main/java/com/mooctest/crowd/site/data/vo/UserVO.java

@@ -0,0 +1,39 @@
+package com.mooctest.crowd.site.data.vo;
+
+import com.mooctest.crowd.domain.domainobject.Account;
+import com.mooctest.crowd.domain.domainobject.User;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Date;
+
+/**
+ * @Author: xuexb
+ * @Date: 2019.7.15 20:41
+ */
+@Data
+@NoArgsConstructor
+public class UserVO {
+    private Long id;
+    private String name;
+    private String userName;
+    private String gender;
+    private String mobileNum;
+    private String province;
+    private String city;
+    private String photoUrl;
+
+    public UserVO(User user){
+        BeanUtils.copyProperties(user, this);
+    }
+
+    public User toUser(){
+        //todo
+        return new User();
+    }
+
+    public UserVO(Account account){
+        BeanUtils.copyProperties(account, this);
+    }
+}

src/main/java/com/mooctest/crowd/domain/mediator/Mediator.java → site/src/main/java/com/mooctest/crowd/site/mediator/Mediator.java

@@ -1,8 +1,9 @@
-package com.mooctest.crowd.domain.mediator;
+package com.mooctest.crowd.site.mediator;
 
-import com.mooctest.crowd.domain.command.*;
-import com.mooctest.crowd.domain.data.dto.*;
-import com.mooctest.crowd.domain.domainobject.Account;
+import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.data.dto.*;
+import com.mooctest.crowd.domain.exception.AccountNotExistException;
+import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.PasswordErrorException;
 
 /**
@@ -10,9 +11,10 @@ import com.mooctest.crowd.domain.exception.PasswordErrorException;
  * @Date: 2019.7.16 20:25
  */
 public interface Mediator {
-    boolean login(LoginCommand cmd) throws PasswordErrorException;
 
-    Account register(RegisterCommand registerCommand);
+    UserDTO loginByMobileAndPwd(LoginCommand cmd) throws PasswordErrorException, AccountNotExistException, BadRequestException;
+
+    UserDTO register(RegisterCommand registerCommand);
 
     IndexDTO renderIndex();
 

src/main/java/com/mooctest/crowd/domain/mediator/impl/WebMediatorImpl.java → site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1,29 +1,41 @@
-package com.mooctest.crowd.domain.mediator.impl;
+package com.mooctest.crowd.site.mediator.impl;
 
-import com.mooctest.crowd.domain.command.*;
-import com.mooctest.crowd.domain.data.dto.*;
+import com.mooctest.crowd.site.data.dto.*;
+import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.data.vo.*;
 import com.mooctest.crowd.domain.domainobject.Account;
+import com.mooctest.crowd.domain.exception.AccountNotExistException;
+import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.PasswordErrorException;
-import com.mooctest.crowd.domain.factory.AccountFactory;
-import com.mooctest.crowd.domain.mediator.Mediator;
+import com.mooctest.crowd.site.mediator.Mediator;
 import com.mooctest.crowd.domain.domainservice.RegisterDService;
-import org.springframework.stereotype.Service;
+import com.mooctest.crowd.domain.repository.AccountUTRepo;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author: xuexb
  * @Date: 2019.7.16 20:27
  */
-@Service
+@Component("WebMediator")
 public class WebMediatorImpl implements Mediator {
 
+    AccountUTRepo accountUTRepo = new AccountUTRepo();
+
     @Override
-    public boolean login(LoginCommand cmd) throws PasswordErrorException {
-        return AccountFactory.createAccount().login(cmd);
+    public UserDTO loginByMobileAndPwd(LoginCommand cmd) throws PasswordErrorException, AccountNotExistException, BadRequestException {
+        Account account = accountUTRepo.getByMobileNum(cmd.getMobileNum());
+        if (account.login(cmd.getMobileNum(),cmd.getPassword())) {
+            UserVO userVO = new UserVO(account);
+            return new UserDTO(userVO);
+        }else
+            throw new BadRequestException("登录失败");
     }
 
     @Override
-    public Account register(RegisterCommand registerCommand) {
-        return RegisterDService.register(registerCommand);
+    public UserDTO register(RegisterCommand registerCommand) {
+        Account account = RegisterDService.register(registerCommand.getMobileNum(), registerCommand.getPassword());
+        UserVO userVO = new UserVO(account);
+        return new UserDTO(userVO);
     }
 
     @Override

site/src/main/java/com/mooctest/crowd/site/service/CommonService.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.site.service;
+
+import com.mooctest.crowd.site.data.dto.IndexDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface CommonService {
+    IndexDTO getIndexInfo();
+}

site/src/main/java/com/mooctest/crowd/site/service/UserService.java

@@ -0,0 +1 @@
+package com.mooctest.crowd.site.service;

import com.mooctest.crowd.site.command.LoginCommand;
import com.mooctest.crowd.site.command.RegisterCommand;
import com.mooctest.crowd.site.data.dto.UserDTO;
import com.mooctest.crowd.domain.exception.AccountNotExistException;
import com.mooctest.crowd.domain.exception.BadRequestException;
import com.mooctest.crowd.domain.exception.PasswordErrorException;
import org.springframework.stereotype.Service;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:52
 */
public interface UserService {
    UserDTO register(RegisterCommand registerCommand);

    UserDTO loginByMobileAndPwd(LoginCommand loginCommand) throws PasswordErrorException, AccountNotExistException, BadRequestException;
}

site/src/main/java/com/mooctest/crowd/site/service/impl/CommonServiceImpl.java

@@ -0,0 +1,21 @@
+package com.mooctest.crowd.site.service.impl;
+
+import com.mooctest.crowd.site.data.dto.IndexDTO;
+import com.mooctest.crowd.site.mediator.Mediator;
+import com.mooctest.crowd.site.service.CommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CommonServiceImpl implements CommonService {
+
+    @Autowired
+    @Qualifier("WebMediator")
+    private Mediator mediator;
+
+    @Override
+    public IndexDTO getIndexInfo() {
+        return mediator.renderIndex();
+    }
+}

site/src/main/java/com/mooctest/crowd/site/service/impl/UserServiceImpl.java

@@ -0,0 +1 @@
+package com.mooctest.crowd.site.service.impl;

import com.mooctest.crowd.site.command.LoginCommand;
import com.mooctest.crowd.site.command.RegisterCommand;
import com.mooctest.crowd.site.data.dto.UserDTO;

import com.mooctest.crowd.domain.exception.AccountNotExistException;
import com.mooctest.crowd.domain.exception.BadRequestException;
import com.mooctest.crowd.domain.exception.PasswordErrorException;
import com.mooctest.crowd.site.mediator.Mediator;
import com.mooctest.crowd.site.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:53
 */
@Service
public class UserServiceImpl implements UserService {

    @Autowired
    @Qualifier("WebMediator")
    private Mediator mediator;

    @Override
    public UserDTO register(RegisterCommand registerCommand) {
        return mediator.register(registerCommand);
    }

    @Override
    public UserDTO loginByMobileAndPwd(LoginCommand loginCommand) throws PasswordErrorException, AccountNotExistException, BadRequestException {
        return mediator.loginByMobileAndPwd(loginCommand);
    }
}

site/src/main/resources/application.properties

@@ -0,0 +1 @@
+

site/src/test/java/com/mooctest/crowd/site/SiteApplicationTests.java

@@ -0,0 +1,16 @@
+package com.mooctest.crowd.site;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SiteApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

src/test/java/com/mooctest/crowd/domain/mediator/impl/WebMediatorImplTest.java → site/src/test/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImplTest.java

@@ -1,19 +1,21 @@
-package com.mooctest.crowd.domain.mediator.impl;
+package com.mooctest.crowd.site.mediator.impl;
 
-import com.mooctest.crowd.domain.command.*;
-import com.mooctest.crowd.domain.data.dto.*;
+import com.mooctest.crowd.site.command.AccountCommand;
+import com.mooctest.crowd.site.command.CrowdTestProjectCommand;
+import com.mooctest.crowd.site.command.CrowdTestReportCommand;
+import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
+import com.mooctest.crowd.site.data.dto.*;
 import com.mooctest.crowd.domain.domainobject.Account;
-import com.mooctest.crowd.domain.exception.PasswordErrorException;
 import com.mooctest.crowd.domain.factory.AccountFactory;
-import com.mooctest.crowd.domain.mediator.Mediator;
+import com.mooctest.crowd.site.mediator.Mediator;
+import com.mooctest.crowd.site.mediator.impl.WebMediatorImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * @Author: xuexb
@@ -36,29 +38,17 @@ public class WebMediatorImplTest {
         mediator = new WebMediatorImpl();
     }
 
-    @Test
-    public void should_return_true_when_login_success() throws PasswordErrorException {
-        //arrange
-        PowerMockito.mockStatic(AccountFactory.class);
-        PowerMockito.when(AccountFactory.createAccount()).thenReturn(account);
-        LoginCommand cmd = new LoginCommand("EXiSTS_MOBILE", "CORRECT_PWD", "CODE");
-        //action
-        boolean success = mediator.login(cmd);
-        //assert
-        assertTrue(success);
-    }
+//    @Test
+//    public void should_return_true_when_login_success() throws PasswordErrorException, BadRequestException, AccountNotExistException {
+//        //arrange
+//        PowerMockito.mockStatic(AccountFactory.class);
+//        PowerMockito.when(AccountFactory.createAccount()).thenReturn(account);
+//        LoginCommand cmd = new LoginCommand("EXiSTS_MOBILE", "CORRECT_PWD", "CODE");
+//        //action
+//        UserDTO success = mediator.loginByMobileAndPwd(cmd);
+//    }
 
-    @Test
-    public void should_return_account_when_register_success() {
-        //arrange
-        RegisterCommand registerCommand = new RegisterCommand("NEW_MOBILE","CODE","PWD");
-
-        //action
-        Account newAccount = mediator.register(registerCommand);
 
-        //assert
-        assertEquals("NEW_MOBILE", newAccount.getMobileNum());
-    }
 
     @Test
     public void should_return_index_dto_when_render_index(){

src/main/java/com/mooctest/crowd/domain/command/RegisterCommand.java

@@ -1,18 +0,0 @@
-package com.mooctest.crowd.domain.command;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @Author: xuexb
- * @Date: 2019.7.5 14:09
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RegisterCommand {
-    private String mobileNum;
-    private String checkCode;
-    private String password;
-}

src/main/java/com/mooctest/crowd/domain/controller/CommonController.java

@@ -1 +0,0 @@
-package com.mooctest.crowd.domain.controller;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:51
 */
public class CommonController {
}

src/main/java/com/mooctest/crowd/domain/data/vo/UserVO.java

@@ -1,25 +0,0 @@
-package com.mooctest.crowd.domain.data.vo;
-
-import com.mooctest.crowd.domain.domainobject.User;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-/**
- * @Author: xuexb
- * @Date: 2019.7.15 20:41
- */
-@Data
-public class UserVO {
-
-    public UserVO(User user){
-        BeanUtils.copyProperties(user, this);
-    }
-
-    public User toUser(){
-        //todo
-
-        return new User();
-    }
-}

src/main/java/com/mooctest/crowd/domain/service/UserService.java

@@ -1 +0,0 @@
-package com.mooctest.crowd.domain.service;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:52
 */
public interface UserService {
}

src/main/java/com/mooctest/crowd/domain/service/impl/UserServiceImpl.java

@@ -1 +0,0 @@
-package com.mooctest.crowd.domain.service.impl;

import com.mooctest.crowd.domain.service.UserService;

/**
 * @Author: xuexb
 * @Date: 2019.7.22 16:53
 */
public class UserServiceImpl implements UserService {
}