diff --git a/.gitignore b/.gitignore
index a715be31d2b4dc958ae79c16e33e6c3b8260efcd..8aecc05cab8c458289ba97c271490ff49064858d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
 !**/src/test/**
+/docs/**
 
 ### STS ###
 .apt_generated
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index a45eb6ba269cd38f8965cef786729790945d9537..0000000000000000000000000000000000000000
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if (mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if (mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 642d572ce90e5085986bdd9c9204b9404f028084..0000000000000000000000000000000000000000
--- a/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/pom.xml b/pom.xml
index 0ac99439c176508c7fb664570576e6e3acbed718..62a660c970017ff77e0b74678a5d92a53689668d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,10 +36,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
-        <!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
@@ -86,7 +90,39 @@
             <!--                </exclusion>-->
             <!--            </exclusions>-->
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.swagger2markup</groupId>
+            <artifactId>swagger2markup</artifactId>
+            <version>1.3.3</version>
+        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>nl.jworks.markdown_to_asciidoc</groupId>-->
+        <!--            <artifactId>markdown_to_asciidoc</artifactId>-->
+        <!--            <version>1.0</version>-->
+        <!--        </dependency>-->
     </dependencies>
+    <repositories>
+        <repository>
+            <snapshots>
+                <!--                <enabled>false</enabled>-->
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+            <id>jcenter-releases</id>
+            <name>jcenter</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
 
     <build>
         <plugins>
diff --git a/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor1.java b/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor1.java
index 789f3a034d4ad58a39158dc2254ca10fe0e96ed8..83f126725bce3b18edbc6c2b0153bcde88c7f5da 100644
--- a/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor1.java
+++ b/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor1.java
@@ -17,7 +17,7 @@ public class MyInteceptor1 implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("MyInteceptor1pre");
-        return false;
+        return true;
     }
 
     @Override
diff --git a/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor2.java b/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor2.java
new file mode 100644
index 0000000000000000000000000000000000000000..285cbca3667e67d87c5606b3031936a70357f94c
--- /dev/null
+++ b/src/main/java/com/lin/sppringbootdemo/Inteceptor/MyInteceptor2.java
@@ -0,0 +1,33 @@
+package com.lin.sppringbootdemo.Inteceptor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.handler.Handler;
+
+@Component
+public class MyInteceptor2 implements HandlerInterceptor {
+    Logger log = LoggerFactory.getLogger(MyInteceptor1.class);
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        log.info("MyInteceptor2pre");
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        log.info("MyInteceptor2post");
+    }
+
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        log.info("MyInteceptor2after");
+    }
+}
diff --git a/src/main/java/com/lin/sppringbootdemo/config/LimitConfig.java b/src/main/java/com/lin/sppringbootdemo/config/LimitConfig.java
index 3fb2879dd2292818f1e3d51bb294aac778fbbb60..3eca8ec34e16bea2a6f78ce542fc69fededbc0b2 100644
--- a/src/main/java/com/lin/sppringbootdemo/config/LimitConfig.java
+++ b/src/main/java/com/lin/sppringbootdemo/config/LimitConfig.java
@@ -2,18 +2,16 @@ package com.lin.sppringbootdemo.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 @Component
 @ConfigurationProperties(prefix = "limit")
+//@PropertySource
 @Data
 public class LimitConfig {
 
     int minMoney;
     int maxMOney;
     String description;
-
-
-
-
 }
diff --git a/src/main/java/com/lin/sppringbootdemo/config/SwaggerConfig.java b/src/main/java/com/lin/sppringbootdemo/config/SwaggerConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e47d7359c2200bceb04f1169059089b63134f5f
--- /dev/null
+++ b/src/main/java/com/lin/sppringbootdemo/config/SwaggerConfig.java
@@ -0,0 +1,44 @@
+package com.lin.sppringbootdemo.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@Configuration
+public class SwaggerConfig {
+
+
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.lin.sppringbootdemo.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("SpringbootDemoAPI文档")
+                .description("SpringbootDemoAPI文档")
+                .contact(new Contact("SpringbootDemoAPI文档", "http://www.baidu.com", "191580387@qq.com"))
+                .termsOfServiceUrl("http://www.baidu.com")
+                .version("1.0")
+                .build();
+
+    }
+
+
+}
diff --git a/src/main/java/com/lin/sppringbootdemo/config/WebMvcConfig.java b/src/main/java/com/lin/sppringbootdemo/config/WebMvcConfig.java
index 489a99f92618145450dc316088ff10bc893982a5..db86caf3a1547588d3fddc65aa60032972aeca50 100644
--- a/src/main/java/com/lin/sppringbootdemo/config/WebMvcConfig.java
+++ b/src/main/java/com/lin/sppringbootdemo/config/WebMvcConfig.java
@@ -1,6 +1,7 @@
 package com.lin.sppringbootdemo.config;
 
 import com.lin.sppringbootdemo.Inteceptor.MyInteceptor1;
+import com.lin.sppringbootdemo.Inteceptor.MyInteceptor2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -12,8 +13,15 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Autowired
     private MyInteceptor1 myInteceptor1;
 
+    @Autowired
+    private MyInteceptor2 myInteceptor2;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(myInteceptor1).addPathPatterns("/*");
+        registry.addInterceptor(myInteceptor2).addPathPatterns("/*");
     }
+
+
+
 }
diff --git a/src/main/java/com/lin/sppringbootdemo/controller/GlobalErrorController.java b/src/main/java/com/lin/sppringbootdemo/controller/GlobalErrorController.java
new file mode 100644
index 0000000000000000000000000000000000000000..394f7964b50f9a67c44e56d2ed29343af470c2df
--- /dev/null
+++ b/src/main/java/com/lin/sppringbootdemo/controller/GlobalErrorController.java
@@ -0,0 +1,77 @@
+package com.lin.sppringbootdemo.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.lin.sppringbootdemo.enums.ResultEnum;
+import com.lin.sppringbootdemo.exception.TestLinException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+@Slf4j
+@Controller
+@RequestMapping("/error")
+public class GlobalErrorController extends BasicErrorController {
+
+    @Autowired
+    public GlobalErrorController(ErrorAttributes errorAttributes, ServerProperties serverProperties) {
+        super(errorAttributes, serverProperties.getError());
+    }
+
+
+    @RequestMapping(produces = "text/html")
+    @Override
+    public ModelAndView errorHtml(HttpServletRequest request,
+                                  HttpServletResponse response) {
+
+
+        return super.errorHtml(request, response);
+    }
+
+    @RequestMapping
+    @ResponseBody
+    @Override
+    @SuppressWarnings("unchecked")
+    public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
+        Map<String, Object> body = super.getErrorAttributes(request,
+                isIncludeStackTrace(request, MediaType.ALL));
+
+        String message = body.get("message") != null ? (String) body.get("message") : null;
+        Integer statusCode = body.get("status") != null ? (Integer) body.get("status") : null;
+
+        Object exception = body.get("exception");
+        if (exception instanceof TestLinException) {
+            TestLinException bre = (TestLinException) exception;
+            statusCode = bre.getCode();
+        }
+
+        //加枚举
+//        Wrapper<Object> wrap = WrapMapper.wrap(statusCode == 0 ? Wrapper.ERROR_CODE : statusCode, message);
+        ResultEnum resultEnum = (statusCode == 0 ? ResultEnum.UNKNOW_ERROE : ResultEnum.getEnumByCode(statusCode));
+        Map res = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            String s = mapper.writeValueAsString(resultEnum);
+            res = mapper.readValue(s, Map.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        HttpStatus status = super.getStatus(request);
+        return new ResponseEntity<Map<String, Object>>(res, status);
+    }
+
+
+}
diff --git a/src/main/java/com/lin/sppringbootdemo/controller/HelloController.java b/src/main/java/com/lin/sppringbootdemo/controller/HelloController.java
index b9daddf397dc52bcdd7b1dfc0c1843d32cc63757..b4f2c7fd689c90f8bf6f4f7e76a508801722f27d 100644
--- a/src/main/java/com/lin/sppringbootdemo/controller/HelloController.java
+++ b/src/main/java/com/lin/sppringbootdemo/controller/HelloController.java
@@ -1,12 +1,16 @@
 package com.lin.sppringbootdemo.controller;
 
 import com.lin.sppringbootdemo.config.LimitConfig;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+
+@Api("hello接口")
 @Slf4j
 @Controller
 public class HelloController {
@@ -15,11 +19,23 @@ public class HelloController {
     LimitConfig limitConfig;
 
 
-    @GetMapping("/config")
-    public String HelloController(){
+    @ApiOperation("thyhello")
+    @GetMapping("/thy/config")
+    public String thyController(ModelMap map){
+//        return limitConfig.toString();
+        map.put("host","asdfghjk");
+        return "thymeleaf/index";
+    }
+
+
+    @ApiOperation("ftlhello")
+    @GetMapping("/ftl/config")
+    public String ftlController(ModelMap map){
 //        return limitConfig.toString();
-        return "index";
+        map.put("host","asdfghjk");
+        return "freemarker/index";
     }
 
 
+
 }
diff --git a/src/main/java/com/lin/sppringbootdemo/controller/TestLinController.java b/src/main/java/com/lin/sppringbootdemo/controller/TestLinController.java
index ddcfa9c4f3c918d63756838abf02fa43c71ab161..336490437159c61425badcf0ef348cc38b4207a4 100644
--- a/src/main/java/com/lin/sppringbootdemo/controller/TestLinController.java
+++ b/src/main/java/com/lin/sppringbootdemo/controller/TestLinController.java
@@ -7,16 +7,17 @@ import com.lin.sppringbootdemo.jpa.TestLinRepository;
 import com.lin.sppringbootdemo.mapper.TestLinMapper;
 import com.lin.sppringbootdemo.service.TestLinService;
 import com.lin.sppringbootdemo.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Optional;
 
+@Api("lin接口")
 @Slf4j
 @RestController
 public class TestLinController {
@@ -28,21 +29,24 @@ public class TestLinController {
     @Autowired
     private TestLinService testLinService;
 
-    @RequestMapping("/user")
+    @ApiOperation("单个查询接口")
+    @GetMapping("/user")
     public ResultData<String> index() {
         TestLin user = testLinMapper.selectByID(1);
 
         return ResultUtil.success(user);
     }
 
-    @RequestMapping("/one")
+    @ApiOperation("单个查接口")
+    @GetMapping("/one")
     public ResultData<String> selectOne() {
         Optional<TestLin> one = testLinRepository.findById(1);
         TestLin testLin = one.orElse(null);
         return ResultUtil.success(testLin);
     }
 
-    @RequestMapping("/add")
+    @ApiOperation("增加接口")
+    @PostMapping("/add")
     public ResultData<TestLin> add(@Valid TestLin testLin, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultUtil.fail(bindingResult.getFieldError().getDefaultMessage());
@@ -52,7 +56,8 @@ public class TestLinController {
         return ResultUtil.success(save);
     }
 
-    @RequestMapping("/getage/{id}")
+    @ApiOperation("根据ID查询接口")
+    @GetMapping("/getage/{id}")
     public ResultData<String> getAge(@PathVariable Integer id) throws Exception {
 //        try {
 //            testLinService.getAge(id);
diff --git a/src/main/java/com/lin/sppringbootdemo/enums/ResultEnum.java b/src/main/java/com/lin/sppringbootdemo/enums/ResultEnum.java
index b5d1c21a1c262cee1cdac2e77757f53d41a408e6..e681b10cb38981fed9a79a538b612b5e0371509c 100644
--- a/src/main/java/com/lin/sppringbootdemo/enums/ResultEnum.java
+++ b/src/main/java/com/lin/sppringbootdemo/enums/ResultEnum.java
@@ -21,4 +21,20 @@ public enum ResultEnum {
         this.code = code;
         this.msg = msg;
     }
+
+    ResultEnum(ResultEnum resultEnum) {
+        this.code = resultEnum.getCode();
+        this.msg = resultEnum.getMsg();
+    }
+
+    public static ResultEnum getEnumByCode(int code) {
+        for (ResultEnum resultEnum : ResultEnum.values()) {
+            if (resultEnum.getCode() == code) {
+                return resultEnum;
+            }
+        }
+        return null;
+    }
+
+
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 907006f55fba01193e309a73212258d24f4b7ff3..95f25897de7ba1eccb9b4cbb0e7ef26e7018c07f 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,6 +5,7 @@ spring:
     password: UATbwcrm123!
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
+#    type: org.apache.commons.dbcp2.BasicDataSource
   jpa:
     show-sql: true
     hibernate:
@@ -13,9 +14,19 @@ spring:
   mvc:
     view:
       prefix: "/"
-      suffix: ".html"
+      suffix: {".html",".jsp","ftl"}
       favicon:
         enable: true
+  thymeleaf:
+    cache: true
+    check-template-location: true
+    enabled: true
+    encoding: utf-8
+    servlet:
+      content-type: text/html
+    mode: HTMl5
+    prefix: classpath:/templates/
+    suffix: .html
 limit:
   minMoney: 2
   maxMoney: 100
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ecc76175302a35c87472d4f028282eb9bac6ec8b..3b82e422c628010528a57dede95997e55c09dd4d 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,11 +1,42 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.16.250:6606/bwcrm
-    username: uatbwcrm
-    password: UATbwcrm123!
+    url: jdbc:mysql://localhost:3306/bwcrm
+    username: root
+    password: 1234
+#    url: jdbc:mysql://192.168.16.250:6606/bwcrm
+#    username: uatbwcrm
+#    password: UATbwcrm123!
     driver-class-name: com.mysql.jdbc.Driver
-
+    type: com.alibaba.druid.pool.DruidDataSource
+  jpa:
+    show-sql: true
+    hibernate:
+      ddl-auto: none
+    open-in-view: true
+  mvc:
+    view:
+      prefix: "/"
+      suffix: {".html",".jsp",".ftl"}
+      favicon:
+        enable: true
+  freemarker:
+    template-loader-path: classpath:/templates/
+    cache: false
+    charset: UTF-8
+    check-template-location: true
+    content-type: text/html
+    request-context-attribute: request
+    expose-request-attributes: false
+    expose-session-attributes: false
+    suffix: .ftl
 limit:
-  minMoney: 1
-  maxMoney: 10
-  description: 最少${limit.minMoney}，最多${limit.maxMoney}
\ No newline at end of file
+  minMoney: 2
+  maxMoney: 100
+  description: 最少${limit.minMoney}，最多${limit.maxMoney}
+logging:
+  level:
+    root: info
+server:
+  port: 8089
+mybatis:
+  mapper-locations: classpath:mappers/*Mapper.xml
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3d7808a0c672513d472ab235d04d18e363fc8a87..9f96606843aad128715316a8a488e24ee7df661f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod
diff --git a/src/main/resources/templates/freemarker/index.ftl b/src/main/resources/templates/freemarker/index.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..d46a38390726f0218335f4f4ad180e66d027fa09
--- /dev/null
+++ b/src/main/resources/templates/freemarker/index.ftl
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8"/>
+    <title></title>
+</head>
+<body>
+FreeMarker模板引擎
+<h1>${host}</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/thymeleaf/index.html
similarity index 45%
rename from src/main/resources/templates/index.html
rename to src/main/resources/templates/thymeleaf/index.html
index 46fc82ed1a4219a9f8fd98d309a68a4b3e35760c..b473189de27d4acc1a041d945d5cba0e1afcc5ac 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/thymeleaf/index.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html>
-<html lang="en">
+<!DOCTYPE HTML>
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
     <title>Title</title>
 </head>
 <body>
-<h1>fghjkl</h1>
+<h1 th:text="${host}">你好</h1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/index.html b/src/main/webapp/layuiNetCompany-v1.1.0/html/index.html
deleted file mode 100644
index e3ad19c0458898d1c0075afbc97036d1480b6a94..0000000000000000000000000000000000000000
--- a/src/main/webapp/layuiNetCompany-v1.1.0/html/index.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
-  <title>网络公司-首页</title>
-  <link rel="stylesheet" href="../res/layui/css/layui.css">
-  <link rel="stylesheet" href="../res/static/css/index.css">
-</head>
-<body>
-  <!-- nav部分 -->
-  <div class="nav index">
-    <div class="layui-container">
-      <!-- 公司logo -->
-      <div class="nav-logo">
-        <a href="index.html">
-          <img src="../res/static/img/logo.png" alt="网络公司">
-        </a>
-      </div>
-      <div class="nav-list">
-        <button>
-          <span></span><span></span><span></span>
-        </button>
-        <ul class="layui-nav" lay-filter="">
-          <li class="layui-nav-item"><a href="product.html">产品</a></li>
-          <li class="layui-nav-item"><a href="news.html">动态</a></li>
-          <li class="layui-nav-item"><a href="case.html">案例</a></li>
-          <li class="layui-nav-item"><a href="about.html">关于</a></li>
-          <li class="layui-nav-item"><a href="https://fly.layui.com/store/" target="_blank">模板</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <!-- banner部分 -->
-  <div>
-    <div class="layui-carousel" id="banner">
-      <div carousel-item>
-        <div>
-          <img src="../res/static/img/banner1.jpg">
-          <div class="panel">
-            <p class="title">网络公司</p>
-            <p>完美前端体验</p>
-          </div>
-        </div>
-        <div>
-          <img src="../res/static/img/banner2.jpg">
-          <div class="panel">
-            <p class="title">网络公司</p>
-            <p>完美前端体验</p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!-- main部分 -->
-  <div class="main-product">
-    <div class="layui-container">
-      <p class="title">专为前端而研制的<span>核心产品</span></p>
-      <div class="layui-row layui-col-space25">
-        <div class="layui-col-sm6 layui-col-md3">
-          <div class="content">
-            <div><img src="../res/static/img/Big_icon1.png"></div>
-            <div>
-              <p class="label">JS基础库</p>
-              <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
-            </div>
-            <a href="javascript:;">查看产品 ></a>
-          </div>
-        </div>
-        <div class="layui-col-sm6 layui-col-md3 ">
-          <div class="content">
-            <div><img src="../res/static/img/Big_icon2.png"></div>
-            <div>
-              <p class="label">CSS处理</p>
-              <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
-            </div>
-            <a href="javascript:;">查看产品 ></a>
-          </div>
-        </div>
-        <div class="layui-col-sm6 layui-col-md3 ">
-          <div class="content">
-            <div><img src="../res/static/img/Big_icon3.png"></div>
-            <div>
-              <p class="label">兼容性</p>
-              <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
-            </div>
-            <a href="javascript:;">查看产品 ></a>
-          </div>
-        </div>
-        <div class="layui-col-sm6 layui-col-md3 ">
-          <div class="content">
-            <div><img src="../res/static/img/Big_icon4.png"></div>
-            <div>
-              <p class="label">响应式</p>
-              <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
-            </div>
-            <a href="javascript:;">查看产品 ></a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="main-service">
-    <div class="layui-container">
-      <p class="title">为客户打造完美的<span>专业服务</span></p>
-      <div class="layui-row layui-col-space25 layui-col-space80">
-        <div class="layui-col-sm6">
-          <div class="content">
-            <div class="content-left"><img src="../res/static/img/home_img1.jpg"></div>
-            <div class="content-right">
-              <p class="label">1 对 1 前端指导</p>
-              <span></span>
-              <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
-            </div>
-          </div>
-        </div>
-        <div class="layui-col-sm6">
-          <div class="content">
-            <div class="content-left"><img src="../res/static/img/home_img2.jpg"></div>
-            <div class="content-right">
-              <p class="label">1 对 1 前端指导</p>
-              <span></span>
-              <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
-            </div>
-          </div>
-        </div>
-        <div class="layui-col-sm6">
-          <div class="content">
-            <div class="content-left"><img src="../res/static/img/home_img3.jpg"></div>
-            <div class="content-right">
-              <p class="label">1 对 1 前端指导</p>
-              <span></span>
-              <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
-            </div>
-          </div>
-        </div>
-        <div class="layui-col-sm6">
-          <div class="content">
-            <div class="content-left"><img src="../res/static/img/home_img4.jpg"></div>
-            <div class="content-right">
-              <p class="label">1 对 1 前端指导</p>
-              <span></span>
-              <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="service-more"><a href="">查看更多</a></div>
-    </div>
-  </div>
-  <!-- footer部分 -->
-  <div class="footer">
-    <div class="layui-container">
-      <p class="footer-web">
-        <a href="javascript:;">合作伙伴</a>
-        <a href="javascript:;">企业画报</a>
-        <a href="javascript:;">JS网</a>
-        <a href="javascript:;">千图网</a>
-        <a href="javascript:;">昵图网</a>
-        <a href="javascript:;">素材网</a>
-        <a href="javascript:;">花瓣网</a>
-      </p>
-      <div class="layui-row footer-contact">
-        <div class="layui-col-sm2 layui-col-lg1"><img src="../res/static/img/erweima.jpg"></div>
-        <div class="layui-col-sm10 layui-col-lg11">
-          <div class="layui-row">
-            <div class="layui-col-sm6 layui-col-md8 layui-col-lg9">
-              <p class="contact-top"><i class="layui-icon layui-icon-cellphone"></i>&nbsp;400-8888888&nbsp;&nbsp;(9:00-18:00)</p>
-              <p class="contact-bottom"><i class="layui-icon layui-icon-home"></i>&nbsp;88888888@163.com</span></p>
-            </div>
-            <div class="layui-col-sm6 layui-col-md4 layui-col-lg3">
-              <p class="contact-top"><span class="right">该模板版权归 <a href="https://www.layui.com/" target="_blank">layui.com</a> 所有</span></p>
-              <p class="contact-bottom"><span class="right">Copyright&nbsp;©&nbsp;2016-2018&nbsp;&nbsp;ICP&nbsp;备888888号</span></p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-<script src="../res/layui/layui.js"></script>
-<!--[if lt IE 9]>
-  <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
-  <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
-<![endif]-->
-<script>
-  layui.config({
-    base: '../res/static/js/' 
-  }).use('firm'); 
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/about.html b/src/main/webapp/layuiNetCompany/html/about.html
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/html/about.html
rename to src/main/webapp/layuiNetCompany/html/about.html
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/case.html b/src/main/webapp/layuiNetCompany/html/case.html
similarity index 97%
rename from src/main/webapp/layuiNetCompany-v1.1.0/html/case.html
rename to src/main/webapp/layuiNetCompany/html/case.html
index 3efdc5557dafa18bec50da2a49c689741523a543..fe67a5b62def41d81a7adc6dd5d86ef47cfdf640 100644
--- a/src/main/webapp/layuiNetCompany-v1.1.0/html/case.html
+++ b/src/main/webapp/layuiNetCompany/html/case.html
@@ -127,8 +127,8 @@
 <![endif]-->
 <script>
   layui.config({
-    base: '../res/static/js/' 
-  }).use('firm'); 
+    base: '../res/static/js/'
+  }).use('firm');
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/layuiNetCompany/html/index.html b/src/main/webapp/layuiNetCompany/html/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..450f137be7b3244e55d67ce2c3be2b30fb7a9818
--- /dev/null
+++ b/src/main/webapp/layuiNetCompany/html/index.html
@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
+    <title>网络公司-首页</title>
+    <link rel="stylesheet" href="../res/layui/css/layui.css">
+    <link rel="stylesheet" href="../res/static/css/index.css">
+    <script src="http://code.jquery.com/jquery-2.1.4.min.js"></script>
+
+</head>
+<body>
+<!-- nav部分 -->
+<div class="nav index">
+    <div class="layui-container">
+        <!-- 公司logo -->
+        <div class="nav-logo">
+            <a href="index.html">
+                <img src="../res/static/img/logo.png" alt="网络公司">
+            </a>
+        </div>
+        <div class="nav-list">
+            <button>
+                <span></span><span></span><span></span>
+            </button>
+            <ul class="layui-nav" lay-filter="">
+                <li class="layui-nav-item"><a href="product.html">产品</a></li>
+                <li class="layui-nav-item"><a href="news.html">动态</a></li>
+                <li class="layui-nav-item"><a href="case.html">案例</a></li>
+                <li class="layui-nav-item"><a href="about.html">关于</a></li>
+                <li class="layui-nav-item"><a href="https://fly.layui.com/store/" target="_blank">模板</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+<!-- banner部分 -->
+<div>
+    <div class="layui-carousel" id="banner">
+        <div carousel-item>
+            <div>
+                <img src="../res/static/img/banner1.jpg">
+                <div class="panel">
+                    <p class="title">网络公司</p>
+                    <p>完美前端体验</p>
+                </div>
+            </div>
+            <div>
+                <img src="../res/static/img/banner2.jpg">
+                <div class="panel">
+                    <p class="title">网络公司</p>
+                    <p>完美前端体验</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- main部分 -->
+<div class="main-product">
+    <div class="layui-container">
+        <p class="title">专为前端而研制的<span>核心产品</span></p>
+        <div class="layui-row layui-col-space25">
+            <div class="layui-col-sm6 layui-col-md3">
+                <div class="content">
+                    <div><img src="../res/static/img/Big_icon1.png"></div>
+                    <div>
+                        <p class="label">JS基础库</p>
+                        <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
+                    </div>
+                    <a href="javascript:;">查看产品 ></a>
+                </div>
+            </div>
+            <div class="layui-col-sm6 layui-col-md3 ">
+                <div class="content">
+                    <div><img src="../res/static/img/Big_icon2.png"></div>
+                    <div>
+                        <p class="label">CSS处理</p>
+                        <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
+                    </div>
+                    <a href="javascript:;" id="pr1od">查看产品 ></a>
+                    <button id="prod">查看产品</button>
+                </div>
+            </div>
+            <div class="layui-col-sm6 layui-col-md3 ">
+                <div class="content">
+                    <div><img src="../res/static/img/Big_icon3.png"></div>
+                    <div>
+                        <p class="label">兼容性</p>
+                        <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
+                    </div>
+                    <a href="javascript:;">查看产品 ></a>
+                </div>
+            </div>
+            <div class="layui-col-sm6 layui-col-md3 ">
+                <div class="content">
+                    <div><img src="../res/static/img/Big_icon4.png"></div>
+                    <div>
+                        <p class="label">响应式</p>
+                        <p>从小屏逐步扩展到大屏，最终实现所有屏幕适配，适应移动互联潮流。</p>
+                    </div>
+                    <a href="javascript:;">查看产品 ></a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="main-service">
+    <div class="layui-container">
+        <p class="title">为客户打造完美的<span>专业服务</span></p>
+        <div class="layui-row layui-col-space25 layui-col-space80">
+            <div class="layui-col-sm6">
+                <div class="content">
+                    <div class="content-left"><img src="../res/static/img/home_img1.jpg"></div>
+                    <div class="content-right">
+                        <p class="label">1 对 1 前端指导</p>
+                        <span></span>
+                        <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-col-sm6">
+                <div class="content">
+                    <div class="content-left"><img src="../res/static/img/home_img2.jpg"></div>
+                    <div class="content-right">
+                        <p class="label">1 对 1 前端指导</p>
+                        <span></span>
+                        <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-col-sm6">
+                <div class="content">
+                    <div class="content-left"><img src="../res/static/img/home_img3.jpg"></div>
+                    <div class="content-right">
+                        <p class="label">1 对 1 前端指导</p>
+                        <span></span>
+                        <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-col-sm6">
+                <div class="content">
+                    <div class="content-left"><img src="../res/static/img/home_img4.jpg"></div>
+                    <div class="content-right">
+                        <p class="label">1 对 1 前端指导</p>
+                        <span></span>
+                        <p>更有多个包含不同主题的Web组件，可快速构建界面出色、体验优秀的跨屏页面，大幅提升开发效率。</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="service-more"><a href="">查看更多</a></div>
+    </div>
+</div>
+<!-- footer部分 -->
+<div class="footer">
+    <div class="layui-container">
+        <p class="footer-web">
+            <a href="javascript:;">合作伙伴</a>
+            <a href="javascript:;">企业画报</a>
+            <a href="javascript:;">JS网</a>
+            <a href="javascript:;">千图网</a>
+            <a href="javascript:;">昵图网</a>
+            <a href="javascript:;">素材网</a>
+            <a href="javascript:;">花瓣网</a>
+        </p>
+        <div class="layui-row footer-contact">
+            <div class="layui-col-sm2 layui-col-lg1"><img src="../res/static/img/erweima.jpg"></div>
+            <div class="layui-col-sm10 layui-col-lg11">
+                <div class="layui-row">
+                    <div class="layui-col-sm6 layui-col-md8 layui-col-lg9">
+                        <p class="contact-top"><i class="layui-icon layui-icon-cellphone"></i>&nbsp;400-8888888&nbsp;&nbsp;(9:00-18:00)
+                        </p>
+                        <p class="contact-bottom"><i
+                                class="layui-icon layui-icon-home"></i>&nbsp;88888888@163.com</span></p>
+                    </div>
+                    <div class="layui-col-sm6 layui-col-md4 layui-col-lg3">
+                        <p class="contact-top"><span class="right">该模板版权归 <a href="https://www.layui.com/"
+                                                                             target="_blank">layui.com</a> 所有</span></p>
+                        <p class="contact-bottom"><span class="right">Copyright&nbsp;©&nbsp;2016-2018&nbsp;&nbsp;ICP&nbsp;备888888号</span>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../res/layui/layui.js"></script>
+
+<!--[if lt IE 9]>
+<script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+<script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+<![endif]-->
+<script>
+    layui.config({
+        base: '../res/static/js/'
+    }).use('firm');
+    $("#prod").click(function () {
+        $.ajax({
+            url: "/user",
+            type: "get",
+            success: function (data) {
+                top.window.alert(JSON.stringify(data))
+                top.window.location.href = "../html/news.html"
+
+            }
+        })
+    })
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/news.html b/src/main/webapp/layuiNetCompany/html/news.html
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/html/news.html
rename to src/main/webapp/layuiNetCompany/html/news.html
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/newsDetail.html b/src/main/webapp/layuiNetCompany/html/newsDetail.html
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/html/newsDetail.html
rename to src/main/webapp/layuiNetCompany/html/newsDetail.html
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/html/product.html b/src/main/webapp/layuiNetCompany/html/product.html
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/html/product.html
rename to src/main/webapp/layuiNetCompany/html/product.html
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/layui.css b/src/main/webapp/layuiNetCompany/res/layui/css/layui.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/layui.css
rename to src/main/webapp/layuiNetCompany/res/layui/css/layui.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/layui.mobile.css b/src/main/webapp/layuiNetCompany/res/layui/css/layui.mobile.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/layui.mobile.css
rename to src/main/webapp/layuiNetCompany/res/layui/css/layui.mobile.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/code.css b/src/main/webapp/layuiNetCompany/res/layui/css/modules/code.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/code.css
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/code.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/laydate/default/laydate.css b/src/main/webapp/layuiNetCompany/res/layui/css/modules/laydate/default/laydate.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/laydate/default/laydate.css
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/laydate/default/laydate.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/icon-ext.png b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/icon-ext.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/icon-ext.png
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/icon-ext.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/icon.png b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/icon.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/icon.png
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/icon.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/layer.css b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/layer.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/layer.css
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/layer.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-0.gif b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-0.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-0.gif
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-0.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-1.gif b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-1.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-1.gif
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-1.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-2.gif b/src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-2.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/css/modules/layer/default/loading-2.gif
rename to src/main/webapp/layuiNetCompany/res/layui/css/modules/layer/default/loading-2.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.eot b/src/main/webapp/layuiNetCompany/res/layui/font/iconfont.eot
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.eot
rename to src/main/webapp/layuiNetCompany/res/layui/font/iconfont.eot
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.svg b/src/main/webapp/layuiNetCompany/res/layui/font/iconfont.svg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.svg
rename to src/main/webapp/layuiNetCompany/res/layui/font/iconfont.svg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.ttf b/src/main/webapp/layuiNetCompany/res/layui/font/iconfont.ttf
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.ttf
rename to src/main/webapp/layuiNetCompany/res/layui/font/iconfont.ttf
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.woff b/src/main/webapp/layuiNetCompany/res/layui/font/iconfont.woff
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/font/iconfont.woff
rename to src/main/webapp/layuiNetCompany/res/layui/font/iconfont.woff
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/0.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/0.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/0.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/0.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/1.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/1.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/1.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/1.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/10.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/10.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/10.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/10.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/11.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/11.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/11.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/11.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/12.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/12.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/12.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/12.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/13.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/13.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/13.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/13.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/14.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/14.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/14.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/14.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/15.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/15.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/15.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/15.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/16.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/16.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/16.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/16.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/17.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/17.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/17.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/17.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/18.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/18.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/18.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/18.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/19.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/19.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/19.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/19.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/2.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/2.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/2.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/2.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/20.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/20.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/20.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/20.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/21.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/21.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/21.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/21.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/22.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/22.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/22.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/22.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/23.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/23.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/23.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/23.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/24.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/24.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/24.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/24.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/25.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/25.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/25.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/25.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/26.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/26.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/26.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/26.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/27.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/27.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/27.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/27.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/28.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/28.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/28.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/28.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/29.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/29.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/29.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/29.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/3.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/3.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/3.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/3.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/30.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/30.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/30.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/30.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/31.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/31.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/31.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/31.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/32.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/32.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/32.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/32.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/33.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/33.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/33.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/33.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/34.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/34.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/34.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/34.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/35.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/35.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/35.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/35.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/36.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/36.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/36.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/36.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/37.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/37.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/37.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/37.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/38.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/38.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/38.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/38.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/39.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/39.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/39.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/39.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/4.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/4.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/4.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/4.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/40.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/40.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/40.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/40.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/41.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/41.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/41.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/41.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/42.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/42.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/42.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/42.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/43.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/43.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/43.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/43.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/44.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/44.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/44.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/44.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/45.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/45.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/45.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/45.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/46.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/46.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/46.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/46.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/47.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/47.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/47.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/47.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/48.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/48.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/48.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/48.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/49.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/49.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/49.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/49.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/5.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/5.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/5.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/5.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/50.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/50.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/50.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/50.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/51.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/51.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/51.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/51.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/52.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/52.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/52.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/52.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/53.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/53.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/53.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/53.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/54.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/54.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/54.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/54.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/55.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/55.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/55.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/55.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/56.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/56.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/56.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/56.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/57.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/57.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/57.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/57.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/58.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/58.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/58.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/58.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/59.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/59.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/59.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/59.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/6.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/6.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/6.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/6.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/60.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/60.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/60.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/60.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/61.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/61.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/61.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/61.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/62.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/62.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/62.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/62.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/63.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/63.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/63.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/63.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/64.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/64.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/64.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/64.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/65.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/65.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/65.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/65.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/66.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/66.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/66.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/66.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/67.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/67.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/67.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/67.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/68.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/68.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/68.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/68.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/69.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/69.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/69.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/69.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/7.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/7.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/7.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/7.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/70.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/70.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/70.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/70.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/71.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/71.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/71.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/71.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/8.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/8.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/8.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/8.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/9.gif b/src/main/webapp/layuiNetCompany/res/layui/images/face/9.gif
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/images/face/9.gif
rename to src/main/webapp/layuiNetCompany/res/layui/images/face/9.gif
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/carousel.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/carousel.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/carousel.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/carousel.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/code.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/code.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/code.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/code.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/colorpicker.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/colorpicker.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/colorpicker.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/colorpicker.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/element.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/element.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/element.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/element.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/flow.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/flow.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/flow.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/flow.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/form.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/form.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/form.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/form.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/jquery.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/jquery.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/jquery.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/jquery.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laydate.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/laydate.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laydate.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/laydate.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/layedit.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/layedit.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/layedit.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/layedit.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/layer.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/layer.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/layer.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/layer.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laypage.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/laypage.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laypage.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/laypage.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laytpl.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/laytpl.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/laytpl.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/laytpl.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/mobile.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/mobile.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/mobile.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/mobile.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/rate.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/rate.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/rate.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/rate.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/slider.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/slider.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/slider.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/slider.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/table.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/table.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/table.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/table.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/tree.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/tree.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/tree.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/tree.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/upload.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/upload.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/upload.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/upload.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/util.js b/src/main/webapp/layuiNetCompany/res/layui/lay/modules/util.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/lay/modules/util.js
rename to src/main/webapp/layuiNetCompany/res/layui/lay/modules/util.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/layui.all.js b/src/main/webapp/layuiNetCompany/res/layui/layui.all.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/layui.all.js
rename to src/main/webapp/layuiNetCompany/res/layui/layui.all.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/layui/layui.js b/src/main/webapp/layuiNetCompany/res/layui/layui.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/layui/layui.js
rename to src/main/webapp/layuiNetCompany/res/layui/layui.js
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/css/index.css b/src/main/webapp/layuiNetCompany/res/static/css/index.css
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/css/index.css
rename to src/main/webapp/layuiNetCompany/res/static/css/index.css
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon1.png b/src/main/webapp/layuiNetCompany/res/static/img/Big_icon1.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon1.png
rename to src/main/webapp/layuiNetCompany/res/static/img/Big_icon1.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon2.png b/src/main/webapp/layuiNetCompany/res/static/img/Big_icon2.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon2.png
rename to src/main/webapp/layuiNetCompany/res/static/img/Big_icon2.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon3.png b/src/main/webapp/layuiNetCompany/res/static/img/Big_icon3.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon3.png
rename to src/main/webapp/layuiNetCompany/res/static/img/Big_icon3.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon4.png b/src/main/webapp/layuiNetCompany/res/static/img/Big_icon4.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Big_icon4.png
rename to src/main/webapp/layuiNetCompany/res/static/img/Big_icon4.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/Product_img1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/Product_img1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/Product_img2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/Product_img2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img3.jpg b/src/main/webapp/layuiNetCompany/res/static/img/Product_img3.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img3.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/Product_img3.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img4.jpg b/src/main/webapp/layuiNetCompany/res/static/img/Product_img4.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/Product_img4.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/Product_img4.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/banner1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/banner1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/banner1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/banner1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/banner2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/banner2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/banner2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/banner2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case3.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case3.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case3.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case3.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case4.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case4.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case4.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case4.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case5.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case5.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case5.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case5.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case6.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case6.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case6.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case6.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case7.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case7.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case7.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case7.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case8.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case8.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case8.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case8.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case9.jpg b/src/main/webapp/layuiNetCompany/res/static/img/case9.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/case9.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/case9.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/erweima.jpg b/src/main/webapp/layuiNetCompany/res/static/img/erweima.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/erweima.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/erweima.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/home_img1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/home_img1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/home_img2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/home_img2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img3.jpg b/src/main/webapp/layuiNetCompany/res/static/img/home_img3.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img3.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/home_img3.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img4.jpg b/src/main/webapp/layuiNetCompany/res/static/img/home_img4.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/home_img4.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/home_img4.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/logo.png b/src/main/webapp/layuiNetCompany/res/static/img/logo.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/logo.png
rename to src/main/webapp/layuiNetCompany/res/static/img/logo.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/nav_img1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/nav_img1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/nav_img2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/nav_img2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img3.jpg b/src/main/webapp/layuiNetCompany/res/static/img/nav_img3.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img3.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/nav_img3.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img4.jpg b/src/main/webapp/layuiNetCompany/res/static/img/nav_img4.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/nav_img4.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/nav_img4.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/news_big.jpg b/src/main/webapp/layuiNetCompany/res/static/img/news_big.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/news_big.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/news_big.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/news_img1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/news_img1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/news_img1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/news_img1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img1.jpg b/src/main/webapp/layuiNetCompany/res/static/img/us_img1.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img1.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img1.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img2.jpg b/src/main/webapp/layuiNetCompany/res/static/img/us_img2.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img2.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img2.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img3.jpg b/src/main/webapp/layuiNetCompany/res/static/img/us_img3.jpg
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img3.jpg
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img3.jpg
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img4.png b/src/main/webapp/layuiNetCompany/res/static/img/us_img4.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img4.png
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img4.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img5.png b/src/main/webapp/layuiNetCompany/res/static/img/us_img5.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img5.png
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img5.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img6.png b/src/main/webapp/layuiNetCompany/res/static/img/us_img6.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img6.png
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img6.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img7.png b/src/main/webapp/layuiNetCompany/res/static/img/us_img7.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img7.png
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img7.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img8.png b/src/main/webapp/layuiNetCompany/res/static/img/us_img8.png
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/img/us_img8.png
rename to src/main/webapp/layuiNetCompany/res/static/img/us_img8.png
diff --git a/src/main/webapp/layuiNetCompany-v1.1.0/res/static/js/firm.js b/src/main/webapp/layuiNetCompany/res/static/js/firm.js
similarity index 100%
rename from src/main/webapp/layuiNetCompany-v1.1.0/res/static/js/firm.js
rename to src/main/webapp/layuiNetCompany/res/static/js/firm.js
diff --git a/src/main/webapp/test.jsp b/src/main/webapp/test.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..b5754e20373fdaa5331ef6e4623dbae636225e3b
--- /dev/null
+++ b/src/main/webapp/test.jsp
@@ -0,0 +1 @@
+ok
\ No newline at end of file
diff --git a/src/test/java/com/lin/sppringbootdemo/swagger/SwaggerClass.java b/src/test/java/com/lin/sppringbootdemo/swagger/SwaggerClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..8535f223ed95c2fd2a97e0fde43b485c8d4c7fe5
--- /dev/null
+++ b/src/test/java/com/lin/sppringbootdemo/swagger/SwaggerClass.java
@@ -0,0 +1,127 @@
+package com.lin.sppringbootdemo.swagger;
+
+import io.github.swagger2markup.GroupBy;
+import io.github.swagger2markup.Language;
+import io.github.swagger2markup.Swagger2MarkupConfig;
+import io.github.swagger2markup.Swagger2MarkupConverter;
+import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
+import io.github.swagger2markup.markup.builder.MarkupLanguage;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.net.URL;
+import java.nio.file.Paths;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SwaggerClass {
+
+    /**
+     * 生成AsciiDocs格式文档
+     * @throws Exception
+     */
+    @Test
+    public void generateAsciiDocs() throws Exception {
+        //    输出Ascii格式
+        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
+                .withMarkupLanguage(MarkupLanguage.ASCIIDOC)
+                .withOutputLanguage(Language.ZH)
+                .withPathsGroupedBy(GroupBy.TAGS)
+                .withGeneratedExamples()
+                .withoutInlineSchema()
+                .build();
+
+        Swagger2MarkupConverter.from(new URL("http://127.0.0.1:8089/v2/api-docs"))
+                .withConfig(config)
+                .build()
+                .toFolder(Paths.get("./docs/asciidoc/generated"));
+    }
+
+    /**
+     * 生成Markdown格式文档
+     * @throws Exception
+     */
+    @Test
+    public void generateMarkdownDocs() throws Exception {
+        //    输出Markdown格式
+        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
+                .withMarkupLanguage(MarkupLanguage.MARKDOWN)
+                .withOutputLanguage(Language.ZH)
+                .withPathsGroupedBy(GroupBy.TAGS)
+                .withGeneratedExamples()
+                .withoutInlineSchema()
+                .build();
+
+        Swagger2MarkupConverter.from(new URL("http://localhost:8089/v2/api-docs"))
+                .withConfig(config)
+                .build()
+                .toFolder(Paths.get("./docs/markdown/generated"));
+    }
+    /**
+     * 生成Confluence格式文档
+     * @throws Exception
+     */
+    @Test
+    public void generateConfluenceDocs() throws Exception {
+        //    输出Confluence使用的格式
+        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
+                .withMarkupLanguage(MarkupLanguage.CONFLUENCE_MARKUP)
+                .withOutputLanguage(Language.ZH)
+                .withPathsGroupedBy(GroupBy.TAGS)
+                .withGeneratedExamples()
+                .withoutInlineSchema()
+                .build();
+
+        Swagger2MarkupConverter.from(new URL("http://localhost:8089/v2/api-docs"))
+                .withConfig(config)
+                .build()
+                .toFolder(Paths.get("./docs/confluence/generated"));
+    }
+
+    /**
+     * 生成AsciiDocs格式文档,并汇总成一个文件
+     * @throws Exception
+     */
+    @Test
+    public void generateAsciiDocsToFile() throws Exception {
+        //    输出Ascii到单文件
+        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
+                .withMarkupLanguage(MarkupLanguage.ASCIIDOC)
+                .withOutputLanguage(Language.ZH)
+                .withPathsGroupedBy(GroupBy.TAGS)
+                .withGeneratedExamples()
+                .withoutInlineSchema()
+                .build();
+
+        Swagger2MarkupConverter.from(new URL("http://localhost:8089/v2/api-docs"))
+                .withConfig(config)
+                .build()
+                .toFile(Paths.get("./docs/asciidoc/generated/all"));
+    }
+
+    /**
+     * 生成Markdown格式文档,并汇总成一个文件
+     * @throws Exception
+     */
+    @Test
+    public void generateMarkdownDocsToFile() throws Exception {
+        //    输出Markdown到单文件
+        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
+                .withMarkupLanguage(MarkupLanguage.MARKDOWN)
+                .withOutputLanguage(Language.ZH)
+                .withPathsGroupedBy(GroupBy.TAGS)
+                .withGeneratedExamples()
+                .withoutInlineSchema()
+                .build();
+
+        Swagger2MarkupConverter.from(new URL("http://localhost:8089/v2/api-docs"))
+                .withConfig(config)
+                .build()
+                .toFile(Paths.get("./docs/markdown/generated/all"));
+    }
+
+
+
+}