From 6a7131ff8570c65468686d8e7ac05117b3444bc1 Mon Sep 17 00:00:00 2001
From: Shaun Chyxion <chyxion@163.com>
Date: Thu, 22 Nov 2018 23:13:20 +0800
Subject: [PATCH] code cleanup

---
 .gitmodules                                   |    3 +
 server/crm/pom.xml                            |   40 +-
 .../pudonghot/ambition/crm/AmbitionCRM.java   |    9 +-
 .../crm/auth/AuthCallbackSupport.java         |    2 +-
 .../crm/controller/FileController.java        |    3 +-
 .../support/ApplicationServiceSupport.java    |    5 +-
 .../support/CustomerIssueServiceSupport.java  |    2 +-
 .../support/HomePageServiceSupport.java       |    2 +-
 .../service/support/UserServiceSupport.java   |    4 +-
 .../crm}/util/HttpServletRequestUtils.java    |    2 +-
 .../ambition/crm}/util/Sha512Utils.java       |    2 +-
 server/file-api/pom.xml                       |    2 +-
 server/lib/pom.xml                            |   23 +
 server/lib/tigon                              |    1 +
 server/mapper/pom.xml                         |   11 +-
 server/model/pom.xml                          |    5 +-
 .../ambition/crm/model/Application.java       |    2 +
 server/pinyin-util/README.md                  |    1 -
 server/pinyin-util/pom.xml                    |   55 -
 .../pudonghot/ambition/pinyin/PinyinUtil.java |  154 --
 .../resources/pinyin/cn-family-names.json     | 1946 -----------------
 .../resources/pinyin/cn-family-names.list     |  Bin 15832 -> 0 bytes
 .../cn/com/flaginfo/utils/NameUtilsTest.java  |   60 -
 server/pom.xml                                |  411 +---
 server/svg-util/README.md                     |    1 -
 server/svg-util/pom.xml                       |   63 -
 server/svg-util/run                           |    9 -
 .../com/pudonghot/ambition/svg/SvgUtil.java   |  167 --
 server/svg-util/src/main/resources/.gitkeep   |    0
 .../test/resources/spring/config.properties   |   11 -
 server/util/README.md                         |    1 -
 server/util/pom.xml                           |   51 -
 server/util/run                               |    9 -
 server/util/src/main/resources/.gitkeep       |    0
 server/util/src/test/resources/.gitkeep       |    0
 server/web-common/README.md                   |    1 -
 server/web-common/pom.xml                     |   36 -
 .../DefaultHttpRequestInterceptor.java        |   51 -
 .../spring/spring-ambition-web-common.xml     |    7 -
 server/web-parent/README.md                   |    1 -
 server/web-parent/pom.xml                     |   61 -
 .../customer-application/preview-btn.hbs      |    2 +-
 42 files changed, 108 insertions(+), 3108 deletions(-)
 create mode 100644 .gitmodules
 rename server/{util/src/main/java/com/pudonghot/ambition => crm/src/main/java/com/pudonghot/ambition/crm}/util/HttpServletRequestUtils.java (96%)
 rename server/{util/src/main/java/com/pudonghot/ambition => crm/src/main/java/com/pudonghot/ambition/crm}/util/Sha512Utils.java (93%)
 create mode 100644 server/lib/pom.xml
 create mode 160000 server/lib/tigon
 delete mode 100644 server/pinyin-util/README.md
 delete mode 100644 server/pinyin-util/pom.xml
 delete mode 100644 server/pinyin-util/src/main/java/com/pudonghot/ambition/pinyin/PinyinUtil.java
 delete mode 100644 server/pinyin-util/src/main/resources/pinyin/cn-family-names.json
 delete mode 100644 server/pinyin-util/src/main/resources/pinyin/cn-family-names.list
 delete mode 100644 server/pinyin-util/src/test/java/cn/com/flaginfo/utils/NameUtilsTest.java
 delete mode 100644 server/svg-util/README.md
 delete mode 100644 server/svg-util/pom.xml
 delete mode 100755 server/svg-util/run
 delete mode 100644 server/svg-util/src/main/java/com/pudonghot/ambition/svg/SvgUtil.java
 delete mode 100644 server/svg-util/src/main/resources/.gitkeep
 delete mode 100644 server/svg-util/src/test/resources/spring/config.properties
 delete mode 100644 server/util/README.md
 delete mode 100644 server/util/pom.xml
 delete mode 100755 server/util/run
 delete mode 100644 server/util/src/main/resources/.gitkeep
 delete mode 100644 server/util/src/test/resources/.gitkeep
 delete mode 100644 server/web-common/README.md
 delete mode 100644 server/web-common/pom.xml
 delete mode 100644 server/web-common/src/main/java/com/pudonghot/ambition/web/interceptor/DefaultHttpRequestInterceptor.java
 delete mode 100644 server/web-common/src/main/resources/spring/spring-ambition-web-common.xml
 delete mode 100644 server/web-parent/README.md
 delete mode 100644 server/web-parent/pom.xml

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8c90c6d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "server/lib/tigon"]
+	path = server/lib/tigon
+	url = git@git.pudong-hot.com:donghuang/tigon.git
diff --git a/server/crm/pom.xml b/server/crm/pom.xml
index 027e235..ab3935d 100644
--- a/server/crm/pom.xml
+++ b/server/crm/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>web-parent</artifactId>
+        <artifactId>ambition-crm</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../web-parent</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <properties>
@@ -22,8 +22,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.pudonghot.ambition</groupId>
-            <artifactId>util</artifactId>
+            <groupId>me.chyxion.tigon</groupId>
+            <artifactId>tigon-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Log -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
             <groupId>com.pudonghot.ambition</groupId>
@@ -39,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>me.chyxion.tigon</groupId>
-            <artifactId>tigon-shiro-spring-boot</artifactId>
+            <artifactId>tigon-shiro</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -55,6 +70,11 @@
             <artifactId>joda-time</artifactId>
             <version>2.9.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -73,6 +93,16 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>${project.build.finalName}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>dev</id>
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java
index d6797a7..32b8941 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java
@@ -1,20 +1,15 @@
 package com.pudonghot.ambition.crm;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 
 /**
  * @author Shaun Chyxion <br>
  * chyxion@163.com <br>
  * Mar 05, 2017 14:40:30
  */
-@EnableAutoConfiguration(exclude = {
-    RedisAutoConfiguration.class,
-    DataSourceAutoConfiguration.class})
-@ComponentScan("com.pudonghot.ambition.crm")
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class AmbitionCRM {
 
     /**
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/auth/AuthCallbackSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/auth/AuthCallbackSupport.java
index ef32fca..e3c4602 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/auth/AuthCallbackSupport.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/auth/AuthCallbackSupport.java
@@ -15,7 +15,7 @@ import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.AuthenticationException;
 import com.pudonghot.ambition.crm.service.AuthLogService;
-import com.pudonghot.ambition.util.HttpServletRequestUtils;
+import com.pudonghot.ambition.crm.util.HttpServletRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.pudonghot.ambition.crm.service.AuthFailedLogService;
 import com.pudonghot.ambition.crm.form.create.AuthLogFormForCreate;
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java
index c36552a..ac960db 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/controller/FileController.java
@@ -39,8 +39,7 @@ public class FileController {
 			final File file = fileApi.getFile(fileInfo);
 			if (file.exists()) {
 				rm = new ResourceModel(file,
-					fileInfo.getContentType(), null);
-				rm.setName(fileInfo.getDownloadName());
+					fileInfo.getContentType(), fileInfo.getDownloadName());
 			}
 		}
 		return rm != null ?
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java
index c47562f..2334c0c 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ApplicationServiceSupport.java
@@ -208,7 +208,7 @@ public class ApplicationServiceSupport
      */
     @Override
     @Transactional(rollbackFor = Throwable.class)
-    public int delete(final String id) {
+    public Application delete(final String id) {
         log.info("Delete application [{}].", id);
         final Application app = find(id);
         Assert.state(app != null, "No application [" + id + "] found");
@@ -224,7 +224,8 @@ public class ApplicationServiceSupport
         attachmentMapper.list(appFileSearch).forEach(
             attachment -> fileApi.deleteById(attachment.getFileId()));
         attachmentMapper.delete(appFileSearch);
-        return mapper.delete(id);
+        mapper.delete(id);
+        return app;
     }
 
     private <T extends ApplicationFile> List<T> uploadFiles(
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerIssueServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerIssueServiceSupport.java
index 7df3c75..7669d37 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerIssueServiceSupport.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerIssueServiceSupport.java
@@ -40,7 +40,7 @@ public class CustomerIssueServiceSupport
         final CustomerIssue issue = find(id);
         Assert.state(issue != null, "No issue [" + id + "] found");
         if (!issue.getIssue().equals(form.getIssue()) ||
-                !form.getEnabled().equals(issue.isEnabled())) {
+                form.isEnabled() != issue.isEnabled()) {
             return super.update(form);
         }
         log.info("Issue [{}] not changed", issue);
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/HomePageServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/HomePageServiceSupport.java
index 0b0e88c..41b1f9b 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/HomePageServiceSupport.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/HomePageServiceSupport.java
@@ -60,7 +60,7 @@ public class HomePageServiceSupport
      * {@inheritDoc}
      */
     @Override
-    public int delete(final String id) {
+    public HomePage delete(final String id) {
         final HomePage homePage = find(id);
         Assert.state(homePage != null, "No home page [" + id + "] found");
         Assert.state(!homePage.isEnabled(), "Home page [" + id + "] is enabled");
diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/UserServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/UserServiceSupport.java
index 398b11d..f9200f0 100644
--- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/UserServiceSupport.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/UserServiceSupport.java
@@ -7,7 +7,7 @@ import me.chyxion.tigon.model.ViewModel;
 import org.apache.commons.lang3.StringUtils;
 import com.pudonghot.ambition.crm.model.User;
 import org.springframework.stereotype.Service;
-import com.pudonghot.ambition.util.Sha512Utils;
+import com.pudonghot.ambition.crm.util.Sha512Utils;
 import org.hibernate.validator.constraints.NotBlank;
 import com.pudonghot.ambition.crm.mapper.UserMapper;
 import com.pudonghot.ambition.crm.service.UserService;
@@ -46,7 +46,7 @@ public class UserServiceSupport
      * {@inheritDoc}
      */
     @Override
-    public int delete(final String id) {
+    public User delete(final String id) {
         User user = find(id);
         Assert.state(user != null, "No user [" + id + "] found");
         Assert.state(!user.isEnabled(), "User [" + id + "] is enabled");
diff --git a/server/util/src/main/java/com/pudonghot/ambition/util/HttpServletRequestUtils.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/util/HttpServletRequestUtils.java
similarity index 96%
rename from server/util/src/main/java/com/pudonghot/ambition/util/HttpServletRequestUtils.java
rename to server/crm/src/main/java/com/pudonghot/ambition/crm/util/HttpServletRequestUtils.java
index 7f10f13..94714c6 100644
--- a/server/util/src/main/java/com/pudonghot/ambition/util/HttpServletRequestUtils.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/util/HttpServletRequestUtils.java
@@ -1,4 +1,4 @@
-package com.pudonghot.ambition.util;
+package com.pudonghot.ambition.crm.util;
 
 import org.apache.commons.lang3.StringUtils;
 import javax.servlet.http.HttpServletRequest;
diff --git a/server/util/src/main/java/com/pudonghot/ambition/util/Sha512Utils.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/util/Sha512Utils.java
similarity index 93%
rename from server/util/src/main/java/com/pudonghot/ambition/util/Sha512Utils.java
rename to server/crm/src/main/java/com/pudonghot/ambition/crm/util/Sha512Utils.java
index bc90d1a..f2d8d02 100644
--- a/server/util/src/main/java/com/pudonghot/ambition/util/Sha512Utils.java
+++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/util/Sha512Utils.java
@@ -1,4 +1,4 @@
-package com.pudonghot.ambition.util;
+package com.pudonghot.ambition.crm.util;
 
 import java.security.MessageDigest;
 import org.apache.commons.codec.binary.Hex;
diff --git a/server/file-api/pom.xml b/server/file-api/pom.xml
index cde17ae..ee60c89 100644
--- a/server/file-api/pom.xml
+++ b/server/file-api/pom.xml
@@ -17,7 +17,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
         <dependency>
diff --git a/server/lib/pom.xml b/server/lib/pom.xml
new file mode 100644
index 0000000..4e7c32e
--- /dev/null
+++ b/server/lib/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+        http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ambition-lib</artifactId>
+    <packaging>pom</packaging>
+    <name>Ambition Library</name>
+    <description>Ambition Library</description>
+
+    <parent>
+        <groupId>com.pudonghot.ambition</groupId>
+        <artifactId>ambition-crm</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>tigon</module>
+    </modules>
+
+</project>
diff --git a/server/lib/tigon b/server/lib/tigon
new file mode 160000
index 0000000..7a0c14b
--- /dev/null
+++ b/server/lib/tigon
@@ -0,0 +1 @@
+Subproject commit 7a0c14ba3f821049872595609dbf278cf410cbd5
diff --git a/server/mapper/pom.xml b/server/mapper/pom.xml
index 4ba0e15..6320587 100644
--- a/server/mapper/pom.xml
+++ b/server/mapper/pom.xml
@@ -33,10 +33,6 @@
             <groupId>me.chyxion.tigon</groupId>
             <artifactId>tigon-mybatis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -51,6 +47,11 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test And Optional Dependencies -->
         <dependency>
@@ -145,7 +146,7 @@
                 </dependency>
                 <dependency>
                     <groupId>me.chyxion.tigon</groupId>
-                    <artifactId>tigon-webmvc-war</artifactId>
+                    <artifactId>tigon-web</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.logging.log4j</groupId>
diff --git a/server/model/pom.xml b/server/model/pom.xml
index f2320b6..2080bba 100644
--- a/server/model/pom.xml
+++ b/server/model/pom.xml
@@ -26,7 +26,7 @@
             <artifactId>tigon-model</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
         <dependency>
@@ -35,12 +35,13 @@
         </dependency>
         <dependency>
             <groupId>me.chyxion.tigon</groupId>
-            <artifactId>tigon-webmvc-war</artifactId>
+            <artifactId>tigon-web</artifactId>
             <scope>${tigon.webmvc.scrope}</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Test Dependencies -->
         <dependency>
diff --git a/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java b/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java
index 7671a59..1d8b446 100644
--- a/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java
+++ b/server/model/src/main/java/com/pudonghot/ambition/crm/model/Application.java
@@ -19,11 +19,13 @@ public class Application extends M3<String, String> {
 
     // Column Names
     public static final String NAME = "name";
+    public static final String NAME_PREFIX = "name_prefix";
     public static final String CONTENT = "content";
     public static final String OWNER = "owner";
 
     // Properties
 	private String name;
+    private String namePrefix;
     private String content;
     private String owner;
 
diff --git a/server/pinyin-util/README.md b/server/pinyin-util/README.md
deleted file mode 100644
index 5cd132f..0000000
--- a/server/pinyin-util/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# name-pinyin
diff --git a/server/pinyin-util/pom.xml b/server/pinyin-util/pom.xml
deleted file mode 100644
index fc0dae0..0000000
--- a/server/pinyin-util/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>pinyin-util</artifactId>
-    <name>Pinyin Util</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>ambition-crm</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.belerweb</groupId>
-            <artifactId>pinyin4j</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>pinyin/*</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>pinyin/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-            </testResource>
-        </testResources>
-    </build>
-</project>
diff --git a/server/pinyin-util/src/main/java/com/pudonghot/ambition/pinyin/PinyinUtil.java b/server/pinyin-util/src/main/java/com/pudonghot/ambition/pinyin/PinyinUtil.java
deleted file mode 100644
index 1bb177f..0000000
--- a/server/pinyin-util/src/main/java/com/pudonghot/ambition/pinyin/PinyinUtil.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.pudonghot.ambition.pinyin;
-
-import java.util.List;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-
-/**
- * @version 0.0.1
- * @since 0.0.1
- * @author Shaun Chyxion <br>
- * chyxion@163.com <br>
- * Apr 23, 2015 1:30:51 PM
- */
-@SuppressWarnings("unchecked")
-public class PinyinUtil {
-	static final List<String[]> CN_FAMILY_NAMES;
-	static HanyuPinyinOutputFormat PINYIN_FORMAT =
-		new HanyuPinyinOutputFormat();
-
-	static {
-        PINYIN_FORMAT.setCaseType(HanyuPinyinCaseType.LOWERCASE);  
-        PINYIN_FORMAT.setToneType(HanyuPinyinToneType.WITH_TONE_NUMBER);
-        PINYIN_FORMAT.setVCharType(HanyuPinyinVCharType.WITH_V); 
-		InputStream fin = null;
-		ObjectInputStream oin = null;
-		try {
-			// load names data
-			fin = PinyinUtil.class.getResourceAsStream("/pinyin/cn-family-names.list");
-			oin = new ObjectInputStream(fin);
-			CN_FAMILY_NAMES = (List<String[]>) oin.readObject();
-		}
-		catch (Exception e) {
-			throw new IllegalStateException(
-				"Init Name Tool Error Caused", e);
-		}
-		finally {
-			close(oin);
-			close(fin);
-		}
-	}
-
-	/**
-	 * get name pinyin
-	 * @param name
-	 * @return
-	 */
-	public static String getNamePinyin(String name) {
-		return getNamePinyin(name, null, true);
-	}
-
-	/**
-	 * get name pinyin
-	 * @param name
-	 * @param withTone
-	 * @return
-	 */
-	public static String getNamePinyin(String name, String splitter, boolean withTone) {
-		String pyRtn = null;
-		boolean hasSplitter = splitter != null && !splitter.isEmpty();
-		for (String[] it : CN_FAMILY_NAMES) {
-			String fName = it[0];
-			if (name.startsWith(fName)) {
-				// family name pinyin
-				StringBuilder sbRtn = new StringBuilder();
-				String fNamePy = it[2];
-				if (!withTone) {
-					fNamePy = fNamePy.replaceAll("\\d", "");
-				}
-				// replace splitter
-				fNamePy = fNamePy.replace(" ", hasSplitter ? splitter : "");
-				sbRtn.append(fNamePy);
-				// name pinyin
-				String shortName = name.substring(fName.length());
-				if (shortName != null && !shortName.isEmpty()) {
-					if (hasSplitter) {
-						sbRtn.append(splitter);
-					}
-					sbRtn.append(getDefaultPinyin(shortName, splitter, withTone));
-				}
-				pyRtn = sbRtn.toString();
-				break;
-			}
-		}
-		if (pyRtn == null) {
-			pyRtn = getDefaultPinyin(name, splitter, withTone);
-		}
-		return pyRtn;
-	}
-
-	/**
-	 * get default pinyin
-	 * @param input
-	 * @param withTone
-	 * @return
-	 */
-	public static String getDefaultPinyin(String input, String splitter, boolean withTone) {
-        StringBuilder sbRtn = new StringBuilder();  
-        try {
-        	if (input != null && !input.isEmpty()) {
-        		boolean hasSplitter = splitter != null && !splitter.isEmpty();
-        		for (char ch : input.toCharArray()) { 
-        			String sc = Character.toString(ch);
-        			if (sc.matches("^[\u4E00-\u9FA5]$")) {  
-        				String pinyin = 
-        					PinyinHelper.toHanyuPinyinStringArray(
-        						ch, PINYIN_FORMAT)[0];
-        				if (!withTone) {
-        					pinyin = pinyin.substring(0, pinyin.length() - 1);
-        				}
-        				sbRtn.append(pinyin);
-        				if (hasSplitter) {
-        					sbRtn.append(splitter); 
-        				}
-        			} 
-        			else {
-        				sbRtn.append(sc);  
-        			}
-        		}
-        		// remove last splitter
-        		if (hasSplitter) {
-        			sbRtn.deleteCharAt(sbRtn.length() - 1);
-        		}
-        	}
-        } 
-        catch (BadHanyuPinyinOutputFormatCombination e) {  
-        	throw new IllegalStateException(
-				"Get Pinyin Error Caused", e);
-        }
-        return sbRtn.toString().trim();
-	}
-
-	/**
-	 * close closeable
-	 * @param c
-	 */
-	private static void close(Closeable c) {
-		if (c != null) {
-			try {
-				c.close();
-			}
-			catch (IOException e) { 
-				// ignore
-			}
-		}
-	}
-}
diff --git a/server/pinyin-util/src/main/resources/pinyin/cn-family-names.json b/server/pinyin-util/src/main/resources/pinyin/cn-family-names.json
deleted file mode 100644
index 9da0dd8..0000000
--- a/server/pinyin-util/src/main/resources/pinyin/cn-family-names.json
+++ /dev/null
@@ -1,1946 +0,0 @@
-{
-	"赵":[
-		"zhào",
-		"zhao4"
-	],
-	"钱":[
-		"qián",
-		"qian2"
-	],
-	"孙":[
-		"sūn",
-		"sun1"
-	],
-	"李":[
-		"lĭ",
-		"li3"
-	],
-	"周":[
-		"zhōu",
-		"zhou1"
-	],
-	"吴":[
-		"wú",
-		"wu2"
-	],
-	"郑":[
-		"zhèng",
-		"zheng4"
-	],
-	"王":[
-		"wáng",
-		"wang2"
-	],
-	"冯":[
-		"féng",
-		"feng2"
-	],
-	"陈":[
-		"chén",
-		"chen2"
-	],
-	"褚":[
-		"chŭ",
-		"chu3"
-	],
-	"卫":[
-		"wèi",
-		"wei4"
-	],
-	"蒋":[
-		"jiăng",
-		"jiang3"
-	],
-	"沈":[
-		"shĕn",
-		"shen3"
-	],
-	"韩":[
-		"hán",
-		"han2"
-	],
-	"杨":[
-		"yáng",
-		"yang2"
-	],
-	"朱":[
-		"zhū",
-		"zhu1"
-	],
-	"秦":[
-		"qín",
-		"qin2"
-	],
-	"尤":[
-		"yóu",
-		"you2"
-	],
-	"许":[
-		"xŭ",
-		"xu3"
-	],
-	"何":[
-		"hé",
-		"he2"
-	],
-	"吕":[
-		"lǚ",
-		"lv3"
-	],
-	"施":[
-		"shī",
-		"shi1"
-	],
-	"张":[
-		"zhāng",
-		"zhang1"
-	],
-	"孔":[
-		"kŏng",
-		"kong3"
-	],
-	"曹":[
-		"cáo",
-		"cao2"
-	],
-	"严":[
-		"yán",
-		"yan2"
-	],
-	"华":[
-		"huà",
-		"hua4"
-	],
-	"金":[
-		"jīn",
-		"jin1"
-	],
-	"魏":[
-		"wèi",
-		"wei4"
-	],
-	"陶":[
-		"táo",
-		"tao2"
-	],
-	"姜":[
-		"jiāng",
-		"jiang1"
-	],
-	"戚":[
-		"qī",
-		"qi1"
-	],
-	"谢":[
-		"xiè",
-		"xie4"
-	],
-	"邹":[
-		"zōu",
-		"zou1"
-	],
-	"喻":[
-		"yù",
-		"yu4"
-	],
-	"柏":[
-		"băi",
-		"bai3"
-	],
-	"水":[
-		"shuĭ",
-		"shui3"
-	],
-	"窦":[
-		"dòu",
-		"dou4"
-	],
-	"章":[
-		"zhāng",
-		"zhang1"
-	],
-	"云":[
-		"yún",
-		"yun2"
-	],
-	"苏":[
-		"sū",
-		"su1"
-	],
-	"潘":[
-		"pān",
-		"pan1"
-	],
-	"葛":[
-		"gĕ",
-		"ge3"
-	],
-	"奚":[
-		"xī",
-		"xi1"
-	],
-	"范":[
-		"fàn",
-		"fan4"
-	],
-	"彭":[
-		"péng",
-		"peng2"
-	],
-	"郎":[
-		"láng",
-		"lang2"
-	],
-	"鲁":[
-		"lŭ",
-		"lu3"
-	],
-	"韦":[
-		"wéi",
-		"wei2"
-	],
-	"昌":[
-		"chāng",
-		"chang1"
-	],
-	"马":[
-		"mă",
-		"ma3"
-	],
-	"苗":[
-		"miáo",
-		"miao2"
-	],
-	"凤":[
-		"fèng",
-		"feng4"
-	],
-	"花":[
-		"huā",
-		"hua1"
-	],
-	"方":[
-		"fāng",
-		"fang1"
-	],
-	"俞":[
-		"yú",
-		"yu2"
-	],
-	"任":[
-		"rèn",
-		"ren4"
-	],
-	"袁":[
-		"yuán",
-		"yuan2"
-	],
-	"柳":[
-		"liŭ",
-		"liu3"
-	],
-	"酆":[
-		"fēng",
-		"feng1"
-	],
-	"鲍":[
-		"bào",
-		"bao4"
-	],
-	"史":[
-		"shĭ",
-		"shi3"
-	],
-	"唐":[
-		"táng",
-		"tang2"
-	],
-	"费":[
-		"fèi",
-		"fei4"
-	],
-	"廉":[
-		"lián",
-		"lian2"
-	],
-	"岑":[
-		"cén",
-		"cen2"
-	],
-	"薛":[
-		"xuē",
-		"xue1"
-	],
-	"雷":[
-		"léi",
-		"lei2"
-	],
-	"贺":[
-		"hè",
-		"he4"
-	],
-	"倪":[
-		"ní",
-		"ni2"
-	],
-	"汤":[
-		"tāng",
-		"tang1"
-	],
-	"滕":[
-		"téng",
-		"teng2"
-	],
-	"殷":[
-		"yīn",
-		"yin1"
-	],
-	"罗":[
-		"luó",
-		"luo2"
-	],
-	"毕":[
-		"bì",
-		"bi4"
-	],
-	"郝":[
-		"hăo",
-		"hao3"
-	],
-	"邬":[
-		"wū",
-		"wu1"
-	],
-	"安":[
-		"ān",
-		"an1"
-	],
-	"常":[
-		"cháng",
-		"chang2"
-	],
-	"乐":[
-		"yuè",
-		"yue4"
-	],
-	"于":[
-		"yú",
-		"yu2"
-	],
-	"时":[
-		"shí",
-		"shi2"
-	],
-	"傅":[
-		"fù",
-		"fu4"
-	],
-	"皮":[
-		"pí",
-		"pi2"
-	],
-	"卞":[
-		"biàn",
-		"bian4"
-	],
-	"齐":[
-		"qí",
-		"qi2"
-	],
-	"康":[
-		"kāng",
-		"kang1"
-	],
-	"伍":[
-		"wŭ",
-		"wu3"
-	],
-	"余":[
-		"yú",
-		"yu2"
-	],
-	"元":[
-		"yuán",
-		"yuan2"
-	],
-	"卜":[
-		"bŭ",
-		"bu3"
-	],
-	"顾":[
-		"gù",
-		"gu4"
-	],
-	"孟":[
-		"mèng",
-		"meng4"
-	],
-	"平":[
-		"píng",
-		"ping2"
-	],
-	"黄":[
-		"huáng",
-		"huang2"
-	],
-	"和":[
-		"hé",
-		"he2"
-	],
-	"穆":[
-		"mù",
-		"mu4"
-	],
-	"萧":[
-		"xiāo",
-		"xiao1"
-	],
-	"尹":[
-		"yĭn",
-		"yin3"
-	],
-	"姚":[
-		"yáo",
-		"yao2"
-	],
-	"邵":[
-		"shào",
-		"shao4"
-	],
-	"湛":[
-		"zhàn",
-		"zhan4"
-	],
-	"汪":[
-		"wāng",
-		"wang1"
-	],
-	"祁":[
-		"qí",
-		"qi2"
-	],
-	"毛":[
-		"máo",
-		"mao2"
-	],
-	"禹":[
-		"yŭ",
-		"yu3"
-	],
-	"狄":[
-		"dí",
-		"di2"
-	],
-	"米":[
-		"mĭ",
-		"mi3"
-	],
-	"贝":[
-		"bèi",
-		"bei4"
-	],
-	"明":[
-		"míng",
-		"ming2"
-	],
-	"臧":[
-		"zāng",
-		"zang1"
-	],
-	"计":[
-		"jì",
-		"ji4"
-	],
-	"伏":[
-		"fú",
-		"fu2"
-	],
-	"成":[
-		"chéng",
-		"cheng2"
-	],
-	"戴":[
-		"dài",
-		"dai4"
-	],
-	"谈":[
-		"tán",
-		"tan2"
-	],
-	"宋":[
-		"sòng",
-		"song4"
-	],
-	"茅":[
-		"máo",
-		"mao2"
-	],
-	"庞":[
-		"páng",
-		"pang2"
-	],
-	"熊":[
-		"xióng",
-		"xiong2"
-	],
-	"纪":[
-		"jì",
-		"ji4"
-	],
-	"舒":[
-		"shū",
-		"shu1"
-	],
-	"屈":[
-		"qū",
-		"qu1"
-	],
-	"项":[
-		"xiàng",
-		"xiang4"
-	],
-	"祝":[
-		"zhù",
-		"zhu4"
-	],
-	"董":[
-		"dŏng",
-		"dong3"
-	],
-	"梁":[
-		"liáng",
-		"liang2"
-	],
-	"杜":[
-		"dù",
-		"du4"
-	],
-	"阮":[
-		"ruăn",
-		"ruan3"
-	],
-	"蓝":[
-		"lán",
-		"lan2"
-	],
-	"闵":[
-		"mĭn",
-		"min3"
-	],
-	"席":[
-		"xí",
-		"xi2"
-	],
-	"季":[
-		"jì",
-		"ji4"
-	],
-	"麻":[
-		"má",
-		"ma2"
-	],
-	"强":[
-		"qiáng",
-		"qiang2"
-	],
-	"贾":[
-		"jiă",
-		"jia3"
-	],
-	"路":[
-		"lù",
-		"lu4"
-	],
-	"娄":[
-		"lóu",
-		"lou2"
-	],
-	"危":[
-		"wēi",
-		"wei1"
-	],
-	"江":[
-		"jiāng",
-		"jiang1"
-	],
-	"童":[
-		"tóng",
-		"tong2"
-	],
-	"颜":[
-		"yán",
-		"yan2"
-	],
-	"郭":[
-		"guō",
-		"guo1"
-	],
-	"梅":[
-		"méi",
-		"mei2"
-	],
-	"盛":[
-		"shèng",
-		"sheng4"
-	],
-	"林":[
-		"lín",
-		"lin2"
-	],
-	"刁":[
-		"diāo",
-		"diao1"
-	],
-	"钟":[
-		"zhōng",
-		"zhong1"
-	],
-	"徐":[
-		"xú",
-		"xu2"
-	],
-	"邱":[
-		"qiū",
-		"qiu1"
-	],
-	"骆":[
-		"luò",
-		"luo4"
-	],
-	"高":[
-		"gāo",
-		"gao1"
-	],
-	"夏":[
-		"xià",
-		"xia4"
-	],
-	"蔡":[
-		"cài",
-		"cai4"
-	],
-	"田":[
-		"tián",
-		"tian2"
-	],
-	"樊":[
-		"fán",
-		"fan2"
-	],
-	"胡":[
-		"hú",
-		"hu2"
-	],
-	"凌":[
-		"líng",
-		"ling2"
-	],
-	"霍":[
-		"huò",
-		"huo4"
-	],
-	"虞":[
-		"yú",
-		"yu2"
-	],
-	"万":[
-		"wàn",
-		"wan4"
-	],
-	"支":[
-		"zhī",
-		"zhi1"
-	],
-	"柯":[
-		"kē",
-		"ke1"
-	],
-	"昝":[
-		"zăn",
-		"zan3"
-	],
-	"管":[
-		"guăn",
-		"guan3"
-	],
-	"卢":[
-		"lú",
-		"lu2"
-	],
-	"莫":[
-		"mò",
-		"mo4"
-	],
-	"经":[
-		"jīng",
-		"jing1"
-	],
-	"房":[
-		"fáng",
-		"fang2"
-	],
-	"裘":[
-		"qiú",
-		"qiu2"
-	],
-	"缪":[
-		"miào",
-		"miao4"
-	],
-	"干":[
-		"gān",
-		"gan1"
-	],
-	"解":[
-		"xiè",
-		"xie4"
-	],
-	"应":[
-		"yīng",
-		"ying1"
-	],
-	"宗":[
-		"zōng",
-		"zong1"
-	],
-	"丁":[
-		"dīng",
-		"ding1"
-	],
-	"宣":[
-		"xuān",
-		"xuan1"
-	],
-	"贲":[
-		"bēn",
-		"ben1"
-	],
-	"邓":[
-		"dèng",
-		"deng4"
-	],
-	"郁":[
-		"yù",
-		"yu4"
-	],
-	"单":[
-		"shàn",
-		"shan4"
-	],
-	"杭":[
-		"háng",
-		"hang2"
-	],
-	"洪":[
-		"hóng",
-		"hong2"
-	],
-	"包":[
-		"bāo",
-		"bao1"
-	],
-	"诸":[
-		"zhū",
-		"zhu1"
-	],
-	"左":[
-		"zuŏ",
-		"zuo3"
-	],
-	"石":[
-		"shí",
-		"shi2"
-	],
-	"崔":[
-		"cuī",
-		"cui1"
-	],
-	"吉":[
-		"jí",
-		"ji2"
-	],
-	"钮":[
-		"niŭ",
-		"niu3"
-	],
-	"龚":[
-		"gōng",
-		"gong1"
-	],
-	"程":[
-		"chéng",
-		"cheng2"
-	],
-	"嵇":[
-		"jī",
-		"ji1"
-	],
-	"邢":[
-		"xíng",
-		"xing2"
-	],
-	"滑":[
-		"huá",
-		"hua2"
-	],
-	"裴":[
-		"péi",
-		"pei2"
-	],
-	"陆":[
-		"lù",
-		"lu4"
-	],
-	"荣":[
-		"róng",
-		"rong2"
-	],
-	"翁":[
-		"wēng",
-		"weng1"
-	],
-	"荀":[
-		"xún",
-		"xun2"
-	],
-	"羊":[
-		"yáng",
-		"yang2"
-	],
-	"於":[
-		"yū",
-		"yu1"
-	],
-	"惠":[
-		"huì",
-		"hui4"
-	],
-	"甄":[
-		"zhēn",
-		"zhen1"
-	],
-	"曲":[
-		"qū",
-		"qu1"
-	],
-	"家":[
-		"jiā",
-		"jia1"
-	],
-	"封":[
-		"fēng",
-		"feng1"
-	],
-	"芮":[
-		"ruì",
-		"rui4"
-	],
-	"羿":[
-		"yì",
-		"yi4"
-	],
-	"储":[
-		"chŭ",
-		"chu3"
-	],
-	"靳":[
-		"jìn",
-		"jin4"
-	],
-	"汲":[
-		"jí",
-		"ji2"
-	],
-	"邴":[
-		"bĭng",
-		"bing3"
-	],
-	"糜":[
-		"mí",
-		"mi2"
-	],
-	"松":[
-		"sōng",
-		"song1"
-	],
-	"井":[
-		"jĭng",
-		"jing3"
-	],
-	"段":[
-		"duàn",
-		"duan4"
-	],
-	"富":[
-		"fù",
-		"fu4"
-	],
-	"巫":[
-		"wū",
-		"wu1"
-	],
-	"乌":[
-		"wū",
-		"wu1"
-	],
-	"焦":[
-		"jiāo",
-		"jiao1"
-	],
-	"巴":[
-		"bā",
-		"ba1"
-	],
-	"弓":[
-		"gōng",
-		"gong1"
-	],
-	"牧":[
-		"mù",
-		"mu4"
-	],
-	"隗":[
-		"kuí",
-		"kui2"
-	],
-	"山":[
-		"shān",
-		"shan1"
-	],
-	"谷":[
-		"gŭ",
-		"gu3"
-	],
-	"车":[
-		"chē",
-		"che1"
-	],
-	"侯":[
-		"hóu",
-		"hou2"
-	],
-	"宓":[
-		"mì",
-		"mi4"
-	],
-	"蓬":[
-		"péng",
-		"peng2"
-	],
-	"全":[
-		"quán",
-		"quan2"
-	],
-	"郗":[
-		"xī",
-		"xi1"
-	],
-	"班":[
-		"bān",
-		"ban1"
-	],
-	"仰":[
-		"yăng",
-		"yang3"
-	],
-	"秋":[
-		"qiū",
-		"qiu1"
-	],
-	"仲":[
-		"zhòng",
-		"zhong4"
-	],
-	"伊":[
-		"yī",
-		"yi1"
-	],
-	"宫":[
-		"gōng",
-		"gong1"
-	],
-	"宁":[
-		"nìng",
-		"ning4"
-	],
-	"仇":[
-		"qiú",
-		"qiu2"
-	],
-	"栾":[
-		"luán",
-		"luan2"
-	],
-	"暴":[
-		"bào",
-		"bao4"
-	],
-	"甘":[
-		"gān",
-		"gan1"
-	],
-	"钭":[
-		"tŏu",
-		"tou3"
-	],
-	"厉":[
-		"lì",
-		"li4"
-	],
-	"戎":[
-		"róng",
-		"rong2"
-	],
-	"祖":[
-		"zŭ",
-		"zu3"
-	],
-	"武":[
-		"wŭ",
-		"wu3"
-	],
-	"符":[
-		"fú",
-		"fu2"
-	],
-	"刘":[
-		"liú",
-		"liu2"
-	],
-	"景":[
-		"jĭng",
-		"jing3"
-	],
-	"詹":[
-		"zhān",
-		"zhan1"
-	],
-	"束":[
-		"shù",
-		"shu4"
-	],
-	"龙":[
-		"lóng",
-		"long2"
-	],
-	"叶":[
-		"yè",
-		"ye4"
-	],
-	"幸":[
-		"xìng",
-		"xing4"
-	],
-	"司":[
-		"sī",
-		"si1"
-	],
-	"韶":[
-		"sháo",
-		"shao2"
-	],
-	"郜":[
-		"gào",
-		"gao4"
-	],
-	"黎":[
-		"lí",
-		"li2"
-	],
-	"蓟":[
-		"jì",
-		"ji4"
-	],
-	"薄":[
-		"bó",
-		"bo2"
-	],
-	"印":[
-		"yìn",
-		"yin4"
-	],
-	"宿":[
-		"sù",
-		"su4"
-	],
-	"白":[
-		"bái",
-		"bai2"
-	],
-	"怀":[
-		"huái",
-		"huai2"
-	],
-	"蒲":[
-		"pú",
-		"pu2"
-	],
-	"邰":[
-		"tái",
-		"tai2"
-	],
-	"从":[
-		"cóng",
-		"cong2"
-	],
-	"鄂":[
-		"è",
-		"e4"
-	],
-	"索":[
-		"suŏ",
-		"suo3"
-	],
-	"咸":[
-		"xián",
-		"xian2"
-	],
-	"籍":[
-		"jí",
-		"ji2"
-	],
-	"赖":[
-		"lài",
-		"lai4"
-	],
-	"卓":[
-		"zhuó",
-		"zhuo2"
-	],
-	"蔺":[
-		"lìn",
-		"lin4"
-	],
-	"屠":[
-		"tú",
-		"tu2"
-	],
-	"蒙":[
-		"méng",
-		"meng2"
-	],
-	"池":[
-		"chí",
-		"chi2"
-	],
-	"乔":[
-		"qiáo",
-		"qiao2"
-	],
-	"阴":[
-		"yīn",
-		"yin1"
-	],
-	"鬱":[
-		"yù",
-		"yu4"
-	],
-	"胥":[
-		"xū",
-		"xu1"
-	],
-	"能":[
-		"néng",
-		"neng2"
-	],
-	"苍":[
-		"cāng",
-		"cang1"
-	],
-	"双":[
-		"shuāng",
-		"shuang1"
-	],
-	"闻":[
-		"wén",
-		"wen2"
-	],
-	"莘":[
-		"shēn",
-		"shen1"
-	],
-	"党":[
-		"dăng",
-		"dang3"
-	],
-	"翟":[
-		"zhái",
-		"zhai2"
-	],
-	"谭":[
-		"tán",
-		"tan2"
-	],
-	"贡":[
-		"gòng",
-		"gong4"
-	],
-	"劳":[
-		"láo",
-		"lao2"
-	],
-	"逄":[
-		"páng",
-		"pang2"
-	],
-	"姬":[
-		"jī",
-		"ji1"
-	],
-	"申":[
-		"shēn",
-		"shen1"
-	],
-	"扶":[
-		"fú",
-		"fu2"
-	],
-	"堵":[
-		"dŭ",
-		"du3"
-	],
-	"冉":[
-		"răn",
-		"ran3"
-	],
-	"宰":[
-		"zăi",
-		"zai3"
-	],
-	"郦":[
-		"lì",
-		"li4"
-	],
-	"雍":[
-		"yōng",
-		"yong1"
-	],
-	"郤":[
-		"xì",
-		"xi4"
-	],
-	"璩":[
-		"qú",
-		"qu2"
-	],
-	"桑":[
-		"sāng",
-		"sang1"
-	],
-	"桂":[
-		"guì",
-		"gui4"
-	],
-	"濮":[
-		"pú",
-		"pu2"
-	],
-	"牛":[
-		"niú",
-		"niu2"
-	],
-	"寿":[
-		"shòu",
-		"shou4"
-	],
-	"通":[
-		"tōng",
-		"tong1"
-	],
-	"边":[
-		"biān",
-		"bian1"
-	],
-	"扈":[
-		"hù",
-		"hu4"
-	],
-	"燕":[
-		"yān",
-		"yan1"
-	],
-	"冀":[
-		"jì",
-		"ji4"
-	],
-	"郏":[
-		"jiá",
-		"jia2"
-	],
-	"浦":[
-		"pŭ",
-		"pu3"
-	],
-	"尚":[
-		"shàng",
-		"shang4"
-	],
-	"农":[
-		"nóng",
-		"nong2"
-	],
-	"温":[
-		"wēn",
-		"wen1"
-	],
-	"别":[
-		"bié",
-		"bie2"
-	],
-	"庄":[
-		"zhuāng",
-		"zhuang1"
-	],
-	"晏":[
-		"yàn",
-		"yan4"
-	],
-	"柴":[
-		"chái",
-		"chai2"
-	],
-	"瞿":[
-		"qú",
-		"qu2"
-	],
-	"阎":[
-		"yán",
-		"yan2"
-	],
-	"充":[
-		"chōng",
-		"chong1"
-	],
-	"慕":[
-		"mù",
-		"mu4"
-	],
-	"连":[
-		"lián",
-		"lian2"
-	],
-	"茹":[
-		"rú",
-		"ru2"
-	],
-	"习":[
-		"xí",
-		"xi2"
-	],
-	"宦":[
-		"huàn",
-		"huan4"
-	],
-	"艾":[
-		"ài",
-		"ai4"
-	],
-	"鱼":[
-		"yú",
-		"yu2"
-	],
-	"容":[
-		"róng",
-		"rong2"
-	],
-	"向":[
-		"xiàng",
-		"xiang4"
-	],
-	"古":[
-		"gŭ",
-		"gu3"
-	],
-	"易":[
-		"yì",
-		"yi4"
-	],
-	"慎":[
-		"shèn",
-		"shen4"
-	],
-	"戈":[
-		"gē",
-		"ge1"
-	],
-	"廖":[
-		"liào",
-		"liao4"
-	],
-	"庾":[
-		"yŭ",
-		"yu3"
-	],
-	"终":[
-		"zhōng",
-		"zhong1"
-	],
-	"暨":[
-		"jì",
-		"ji4"
-	],
-	"居":[
-		"jū",
-		"ju1"
-	],
-	"衡":[
-		"héng",
-		"heng2"
-	],
-	"步":[
-		"bù",
-		"bu4"
-	],
-	"都":[
-		"dū",
-		"du1"
-	],
-	"耿":[
-		"gĕng",
-		"geng3"
-	],
-	"满":[
-		"măn",
-		"man3"
-	],
-	"弘":[
-		"hóng",
-		"hong2"
-	],
-	"匡":[
-		"kuāng",
-		"kuang1"
-	],
-	"国":[
-		"guó",
-		"guo2"
-	],
-	"文":[
-		"wén",
-		"wen2"
-	],
-	"寇":[
-		"kòu",
-		"kou4"
-	],
-	"广":[
-		"guăng",
-		"guang3"
-	],
-	"禄":[
-		"lù",
-		"lu4"
-	],
-	"阙":[
-		"quē",
-		"que1"
-	],
-	"东":[
-		"dōng",
-		"dong1"
-	],
-	"欧":[
-		"ōu",
-		"ou1"
-	],
-	"殳":[
-		"shū",
-		"shu1"
-	],
-	"沃":[
-		"wò",
-		"wo4"
-	],
-	"利":[
-		"lì",
-		"li4"
-	],
-	"蔚":[
-		"wèi",
-		"wei4"
-	],
-	"越":[
-		"yuè",
-		"yue4"
-	],
-	"夔":[
-		"kuí",
-		"kui2"
-	],
-	"隆":[
-		"lóng",
-		"long2"
-	],
-	"师":[
-		"shī",
-		"shi1"
-	],
-	"巩":[
-		"gŏng",
-		"gong3"
-	],
-	"厍":[
-		"shè",
-		"she4"
-	],
-	"聂":[
-		"niè",
-		"nie4"
-	],
-	"晁":[
-		"cháo",
-		"chao2"
-	],
-	"勾":[
-		"gōu",
-		"gou1"
-	],
-	"敖":[
-		"áo",
-		"ao2"
-	],
-	"融":[
-		"róng",
-		"rong2"
-	],
-	"冷":[
-		"lĕng",
-		"leng3"
-	],
-	"訾":[
-		"zĭ",
-		"zi3"
-	],
-	"辛":[
-		"xīn",
-		"xin1"
-	],
-	"阚":[
-		"kàn",
-		"kan4"
-	],
-	"那":[
-		"nā",
-		"na1"
-	],
-	"简":[
-		"jiăn",
-		"jian3"
-	],
-	"饶":[
-		"ráo",
-		"rao2"
-	],
-	"空":[
-		"kōng",
-		"kong1"
-	],
-	"曾":[
-		"zēng",
-		"zeng1"
-	],
-	"母":[
-		"mŭ",
-		"mu3"
-	],
-	"沙":[
-		"shā",
-		"sha1"
-	],
-	"乜":[
-		"niè",
-		"nie4"
-	],
-	"养":[
-		"yăng",
-		"yang3"
-	],
-	"鞠":[
-		"jū",
-		"ju1"
-	],
-	"须":[
-		"xū",
-		"xu1"
-	],
-	"丰":[
-		"fēng",
-		"feng1"
-	],
-	"巢":[
-		"cháo",
-		"chao2"
-	],
-	"关":[
-		"guān",
-		"guan1"
-	],
-	"蒯":[
-		"kuăi",
-		"kuai3"
-	],
-	"相":[
-		"xiàng",
-		"xiang4"
-	],
-	"查":[
-		"zhā",
-		"zha1"
-	],
-	"后":[
-		"hòu",
-		"hou4"
-	],
-	"荆":[
-		"jīng",
-		"jing1"
-	],
-	"红":[
-		"hóng",
-		"hong2"
-	],
-	"游":[
-		"yóu",
-		"you2"
-	],
-	"竺":[
-		"zhú",
-		"zhu2"
-	],
-	"权":[
-		"quán",
-		"quan2"
-	],
-	"逯":[
-		"lù",
-		"lu4"
-	],
-	"盖":[
-		"gài",
-		"gai4"
-	],
-	"益":[
-		"yì",
-		"yi4"
-	],
-	"桓":[
-		"huán",
-		"huan2"
-	],
-	"公":[
-		"gōng",
-		"gong1"
-	],
-	"万俟":[
-		"mò qí",
-		"mo4 qi2"
-	],
-	"司马":[
-		"sī mă",
-		"si1 ma3"
-	],
-	"上官":[
-		"shàng guān",
-		"shang4 guan1"
-	],
-	"欧阳":[
-		"ōu yáng",
-		"ou1 yang2"
-	],
-	"夏侯":[
-		"xià hóu",
-		"xia4 hou2"
-	],
-	"诸葛":[
-		"zhū gĕ",
-		"zhu1 ge3"
-	],
-	"闻人":[
-		"wén rén",
-		"wen2 ren2"
-	],
-	"东方":[
-		"dōng fāng",
-		"dong1 fang1"
-	],
-	"赫连":[
-		"hè lián",
-		"he4 lian2"
-	],
-	"皇甫":[
-		"huáng fŭ",
-		"huang2 fu3"
-	],
-	"尉迟":[
-		"yù chí",
-		"yu4 chi2"
-	],
-	"公羊":[
-		"gōng yáng",
-		"gong1 yang2"
-	],
-	"澹台":[
-		"tán tái",
-		"tan2 tai2"
-	],
-	"公冶":[
-		"gōng yĕ",
-		"gong1 ye3"
-	],
-	"宗政":[
-		"zōng zhèng",
-		"zong1 zheng4"
-	],
-	"濮阳":[
-		"pú yáng",
-		"pu2 yang2"
-	],
-	"淳于":[
-		"chún yú",
-		"chun2 yu2"
-	],
-	"单于":[
-		"chán yú",
-		"chan2 yu2"
-	],
-	"太叔":[
-		"tài shū",
-		"tai4 shu1"
-	],
-	"申屠":[
-		"shēn tú",
-		"shen1 tu2"
-	],
-	"公孙":[
-		"gōng sūn",
-		"gong1 sun1"
-	],
-	"仲孙":[
-		"zhòng sūn",
-		"zhong4 sun1"
-	],
-	"轩辕":[
-		"xuān yuán",
-		"xuan1 yuan2"
-	],
-	"令狐":[
-		"lìng hú",
-		"ling4 hu2"
-	],
-	"钟离":[
-		"zhōng lí",
-		"zhong1 li2"
-	],
-	"宇文":[
-		"yŭ wén",
-		"yu3 wen2"
-	],
-	"长孙":[
-		"zhăng",
-		"zhang3 sun1"
-	],
-	"慕容":[
-		"mù róng",
-		"mu4 rong2"
-	],
-	"鲜于":[
-		"xiān yú",
-		"xian1 yu2"
-	],
-	"闾丘":[
-		"lǘ qiū",
-		"lv2 qiu1"
-	],
-	"司徒":[
-		"sī tú",
-		"si1 tu2"
-	],
-	"司空":[
-		"sī kōng",
-		"si1 kong1"
-	],
-	"亓官":[
-		"qí guān",
-		"qi2 guan1"
-	],
-	"司寇":[
-		"sī kòu",
-		"si1 kou4"
-	],
-	"仉督":[
-		"zhăng dū",
-		"zhang3 du1"
-	],
-	"子车":[
-		"zĭ jū",
-		"zi3 ju1"
-	],
-	"颛孙":[
-		"zhuān sūn",
-		"zhuan1 sun1"
-	],
-	"端木":[
-		"duān mù",
-		"duan1 mu4"
-	],
-	"巫马":[
-		"wū mă",
-		"wu1 ma3"
-	],
-	"公西":[
-		"gōng xī",
-		"gong1 xi1"
-	],
-	"漆雕":[
-		"qī diāo",
-		"qi1 diao1"
-	],
-	"乐正":[
-		"yuè zhèng",
-		"yue4 zheng4"
-	],
-	"壤驷":[
-		"răng sì",
-		"rang3 si4"
-	],
-	"公良":[
-		"gōng liáng",
-		"gong1 liang2"
-	],
-	"拓跋":[
-		"tuò bá",
-		"tuo4 ba2"
-	],
-	"夹谷":[
-		"jiá gŭ",
-		"jia2 gu3"
-	],
-	"宰父":[
-		"zăi fŭ",
-		"zai3 fu3"
-	],
-	"榖梁":[
-		"gŭ liáng",
-		"gu3 liang2"
-	],
-	"晋楚":[
-		"jìn chŭ",
-		"jin4 chu3"
-	],
-	"闫法":[
-		"yán fă",
-		"yan2 fa3"
-	],
-	"汝鄢":[
-		"rŭ yān",
-		"ru3 yan1"
-	],
-	"涂钦":[
-		"tú qīn",
-		"tu2 qin1"
-	],
-	"段干":[
-		"duàn gān",
-		"duan4 gan1"
-	],
-	"百里":[
-		"băi lĭ",
-		"bai3 li3"
-	],
-	"东郭":[
-		"dōng guō",
-		"dong1 guo1"
-	],
-	"南门":[
-		"nán mén",
-		"nan2 men2"
-	],
-	"呼延":[
-		"hū yán",
-		"hu1 yan2"
-	],
-	"归海 ":[
-		"guī hăi",
-		"gui1 hai3"
-	],
-	"羊舌":[
-		"yáng shé",
-		"yang2 she2"
-	],
-	"微生":[
-		"wēi shēng",
-		"wei1 sheng1"
-	],
-	"岳帅":[
-		"yuè shuài",
-		"yue4 shuai4"
-	],
-	"缑亢":[
-		"gōu kàng",
-		"gou1 kang4"
-	],
-	"况后":[
-		"kuàng hòu",
-		"kuang4 hou4"
-	],
-	"有琴":[
-		"yŏu qín",
-		"you3 qin2"
-	],
-	"梁丘":[
-		"liáng qiū",
-		"liang2 qiu1"
-	],
-	"左丘":[
-		"zuŏ qiū",
-		"zuo3 qiu1"
-	],
-	"东门":[
-		"dōng mén",
-		"dong1 men2"
-	],
-	"西门":[
-		"xī mén",
-		"xi1 men2"
-	],
-	"商牟":[
-		"shāng móu",
-		"shang1 mou2"
-	],
-	"佘佴":[
-		"shé nài",
-		"she2 nai4"
-	],
-	"伯赏":[
-		"bó shăng",
-		"bo2 shang3"
-	],
-	"南宫":[
-		"nán gōng",
-		"nan2 gong1"
-	],
-	"墨哈":[
-		"mò hă",
-		"mo4 ha3"
-	],
-	"谯笪":[
-		"qiáo dá",
-		"qiao2 da2"
-	],
-	"年爱":[
-		"nián ài",
-		"nian2 ai4"
-	],
-	"阳佟":[
-		"yáng tóng",
-		"yang2 tong2"
-	],
-	"第五":[
-		"dì wŭ",
-		"di4 wu3"
-	],
-	"言福":[
-		"yán fú",
-		"yan2 fu2"
-	]
-}
diff --git a/server/pinyin-util/src/main/resources/pinyin/cn-family-names.list b/server/pinyin-util/src/main/resources/pinyin/cn-family-names.list
deleted file mode 100644
index 7f461e9f315a62de28a72399ffab6977dc77bde5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15832
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

diff --git a/server/pinyin-util/src/test/java/cn/com/flaginfo/utils/NameUtilsTest.java b/server/pinyin-util/src/test/java/cn/com/flaginfo/utils/NameUtilsTest.java
deleted file mode 100644
index 8db42ce..0000000
--- a/server/pinyin-util/src/test/java/cn/com/flaginfo/utils/NameUtilsTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.com.flaginfo.utils;
-
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-
-import org.junit.Test;
-
-import com.pudonghot.ambition.pinyin.PinyinUtil;
-
-/**
- * @version 0.0.1
- * @since 0.0.1
- * @author Shaun Chyxion <br />
- * xiaoning.chen@flaginfo.com.cn <br />
- * Jan 4, 2015 11:24:35 AM
- */
-public class NameUtilsTest {
-
-	@Test
-	public void testPinyin() {
-		HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();  
-        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);  
-//        format.setToneType(HanyuPinyinToneType.WITH_TONE_MARK);
-        format.setToneType(HanyuPinyinToneType.WITH_TONE_NUMBER);
-        format.setVCharType(HanyuPinyinVCharType.WITH_U_UNICODE); 
-
-        char[] input = "陈晓宁".trim().toCharArray(); 
-        StringBuffer output = new StringBuffer();  
-        try {  
-            for (int i = 0; i < input.length; i++) {  
-                if (Character.toString(input[i]).matches("[\u4E00-\u9FA5]+")) {  
-                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(input[i], format);  
-                    for (String s : temp) {
-                    	System.err.println(s);
-					}
-                    output.append(temp[0]);  
-                    output.append(" "); 
-                } else  
-                    output.append(Character.toString(input[i]));  
-            }  
-        } 
-        catch (BadHanyuPinyinOutputFormatCombination e) {  
-            e.printStackTrace();  
-        }  
-        System.err.println(output);
-	}
-
-	@Test
-	public void testGetPy() {
-		System.err.println(PinyinUtil.getDefaultPinyin("陈晓宁", " ", true));
-		System.err.println(PinyinUtil.getNamePinyin("曾国藩", "", false));
-		System.err.println(PinyinUtil.getNamePinyin("东方不败", "", true));
-		System.err.println(PinyinUtil.getNamePinyin("东方不败", "_", false));
-		System.err.println(PinyinUtil.getDefaultPinyin("曾国藩", " ", true));
-	}
-}
diff --git a/server/pom.xml b/server/pom.xml
index cc11bc1..24cd92c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -17,22 +17,14 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
         <start-class></start-class>
-        <maven.tomcat.port>8080</maven.tomcat.port>
-        <maven.tomcat.path>/</maven.tomcat.path>
-        <web.resources.filtering>false</web.resources.filtering>
-        <slf4j.version>1.7.25</slf4j.version>
-        <log4j.version>2.8.2</log4j.version>
-        <mongodb.version>3.2.0</mongodb.version>
         <tigon.version>0.0.1-SNAPSHOT</tigon.version>
-        <spring.version>4.3.8.RELEASE</spring.version>
-        <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
-        <shiro.version>1.3.2</shiro.version>
+        <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
         <aspectj.version>1.8.10</aspectj.version>
     </properties>
 
     <organization>
         <name>PudongHot</name>
-        <url>http://www.pudonghot.com</url>
+        <url>http://www.pudong-hot.com</url>
     </organization>
 
     <developers>
@@ -42,7 +34,7 @@
             <email>chyxion@163.com</email>
             <url>http://chyxion.github.io</url>
             <organization>PudongHot</organization>
-            <organizationUrl>http://www.pudonghot.com</organizationUrl>
+            <organizationUrl>http://www.pudong-hot.com</organizationUrl>
             <roles>
                 <role>architect</role>
                 <role>developer</role>
@@ -52,11 +44,7 @@
     </developers>
 
     <modules>
-        <module>web-parent</module>
-        <module>web-common</module>
-        <module>util</module>
-        <module>svg-util</module>
-        <module>pinyin-util</module>
+        <module>lib</module>
         <module>model</module>
         <module>mapper</module>
         <module>file-api</module>
@@ -76,21 +64,6 @@
                 <artifactId>web-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.pudonghot.ambition</groupId>
-                <artifactId>util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.pudonghot.ambition</groupId>
-                <artifactId>svg-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.pudonghot.ambition</groupId>
-                <artifactId>pinyin-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.pudonghot.ambition</groupId>
                 <artifactId>crm-model</artifactId>
@@ -114,150 +87,18 @@
             <!--tigon-->
             <dependency>
                 <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-model</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-mybatis</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-sequence</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-webmvc-core</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-webmvc-spring-boot</artifactId>
-                <version>${tigon.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-starter-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-webmvc-war</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-redis</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-mybatis-redis-cache</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-shiro-redis-cache</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-shiro-core</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-shiro-war</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-shiro-spring-boot</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-service-api</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-service-support</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-extjs</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-freemarker-support</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-jsp-support</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-codegen</artifactId>
-                <version>${tigon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.chyxion.tigon</groupId>
-                <artifactId>tigon-props-config</artifactId>
+                <artifactId>tigon</artifactId>
                 <version>${tigon.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <!--/tigon-->
-            <dependency>
-                <groupId>com.caucho</groupId>
-                <artifactId>hessian</artifactId>
-                <version>4.0.38</version>
-            </dependency>
-            <dependency>
-                <groupId>com.googlecode.plist</groupId>
-                <artifactId>dd-plist</artifactId>
-                <version>1.16</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>core</artifactId>
-                <version>3.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>javase</artifactId>
-                <version>3.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.imgscalr</groupId>
-                <artifactId>imgscalr-lib</artifactId>
-                <version>4.2</version>
-            </dependency>
-            <!-- mybatis -->
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
 <!--                 <version>1.9.2</version> -->
                 <version>1.8.3</version>
             </dependency>
-            <!-- /mybatis -->
-            <dependency>
-                <artifactId>spring-core</artifactId>
-                <groupId>org.springframework</groupId>
-                <version>${spring.version}</version>
-                <exclusions>
-                    <exclusion>
-                          <groupId>commons-logging</groupId>
-                          <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.jdom</groupId>
                 <artifactId>jdom</artifactId>
@@ -273,76 +114,18 @@
                 <artifactId>commons-io</artifactId>
                 <version>2.4</version>
             </dependency>
-            <dependency>
-                <groupId>org.freemarker</groupId>
-                <artifactId>freemarker</artifactId>
-                <version>2.3.23</version>       
-            </dependency>
-            <!-- Slf4j -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <!-- /Slf4j -->
-            <!-- Log4j 2 -->
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-            <!-- Log4j API and Core implementation required for binding -->
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-            <!-- /Log4j 2 -->
             <dependency>
                 <artifactId>commons-codec</artifactId>
                 <groupId>commons-codec</groupId>
                 <version>1.10</version>
             </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>2.5.0</version>
-            </dependency>
             <!-- Database -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
                 <version>6.0.6</version>
-                 <!--<version>5.1.41</version>-->
-                <!--<version>5.1.6</version>-->
-            </dependency>
-            <!-- test -->
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-test</artifactId>
-                <version>${spring.version}</version>
             </dependency>
             <!-- javax -->
-            <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>persistence-api</artifactId>
-                <version>1.0.2</version>
-            </dependency>
             <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>javax.el-api</artifactId>
@@ -353,135 +136,16 @@
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.1.0</version>
             </dependency>
-            <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet.jsp.jstl</groupId>
-                <artifactId>jstl-api</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>1.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>5.4.0.Final</version>
-            </dependency>
-            <!-- mybatis -->
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>3.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <!-- /mybatis -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid</artifactId>
                 <version>1.1.2</version>
             </dependency>
-            <dependency>
-                <groupId>org.mongodb</groupId>
-                <artifactId>bson</artifactId>
-                <version>${mongodb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-redis</artifactId>
-                <version>1.6.6.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>redis.clients</groupId>
-                <artifactId>jedis</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core -->
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-core</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-web</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
             <dependency>
                 <artifactId>commons-fileupload</artifactId>
                 <groupId>commons-fileupload</groupId>
                 <version>1.3.2</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/cglib/cglib -->
-            <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib</artifactId>
-                <version>3.2.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjrt</artifactId>
-                <version>${aspectj.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjweaver</artifactId>
-                <version>${aspectj.version}</version>
-            </dependency>
-            <!-- Spring Boot -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-autoconfigure</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-web</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-test</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <!-- / Spring Boot -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>1.2.41</version>
-            </dependency>
-            <!-- test -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -604,6 +268,17 @@
                                 <destinationFile>src/main/resources/application.yaml</destinationFile>
                             </configuration>
                         </execution>
+                        <execution>
+                            <id>copy-application-yml-file</id>
+                            <phase>generate-resources</phase>
+                            <goals>
+                                <goal>copy</goal>
+                            </goals>
+                            <configuration>
+                                <sourceFile>src/main/resources/application_${project.activeProfiles[0].id}.yml</sourceFile>
+                                <destinationFile>src/main/resources/application.yml</destinationFile>
+                            </configuration>
+                        </execution>
                         <execution>
                             <id>copy-log4j2-xml-file</id>
                             <phase>generate-resources</phase>
@@ -685,54 +360,6 @@
                         </archive>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.3</version>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>shade</goal>
-                            </goals>
-                            <configuration>
-                                <finalName>${project.artifactId}</finalName>
-                                <shadedArtifactAttached>true</shadedArtifactAttached>
-                                <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
-                                <transformers>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                        <mainClass>${start-class}</mainClass>
-                                    </transformer>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                        <resource>META-INF/spring.handlers</resource>
-                                    </transformer>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                        <resource>META-INF/spring.schemas</resource>
-                                    </transformer>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                        <resource>META-INF/spring.tooling</resource>
-                                    </transformer>
-                                </transformers>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat7-maven-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <port>${maven.tomcat.port}</port>
-                        <path>${maven.tomcat.path}</path>
-                        <charset>utf-8</charset>
-                        <uriEncoding>utf-8</uriEncoding>
-                        <contextReloadable>false</contextReloadable>
-                        <systemProperties>
-                            <http.port>${maven.tomcat.port}</http.port>
-                            <project.basedir>${project.basedir}</project.basedir>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-help-plugin</artifactId>
@@ -775,6 +402,7 @@
                     <exclude>config_*.properties</exclude>
                     <exclude>application_*.properties</exclude>
                     <exclude>application_*.yaml</exclude>
+                    <exclude>application_*.yml</exclude>
                     <exclude>log4j2_*.xml</exclude>
                 </excludes>
             </resource>          
@@ -790,6 +418,7 @@
                     <exclude>config_*.properties</exclude>
                     <exclude>application_*.properties</exclude>
                     <exclude>application_*.yaml</exclude>
+                    <exclude>application_*.yml</exclude>
                     <exclude>log4j2_*.xml</exclude>
                 </excludes>
             </resource>          
diff --git a/server/svg-util/README.md b/server/svg-util/README.md
deleted file mode 100644
index a330497..0000000
--- a/server/svg-util/README.md
+++ /dev/null
@@ -1 +0,0 @@
-#umsapp-ota-data-model
diff --git a/server/svg-util/pom.xml b/server/svg-util/pom.xml
deleted file mode 100644
index b6a764c..0000000
--- a/server/svg-util/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>svg-util</artifactId>
-    <name>Ambition SVG Util</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>ambition-crm</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>commons-codec</artifactId>
-            <groupId>commons-codec</groupId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>xmlgraphics-commons</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-codec</artifactId>
-            <version>1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-transcoder</artifactId>
-            <version>1.8</version>
-        </dependency>
-        <!-- dom4j -->
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/server/svg-util/run b/server/svg-util/run
deleted file mode 100755
index 83c1664..0000000
--- a/server/svg-util/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-export MAVEN_OPTS="-noverify -agentpath:/usr/local/JRebel/6.3.2/lib/libjrebel64.dylib -Drebel.dirs=target -Drebel.disable_update=true -Ddev=true"
-set JAVA_OPTS=$MAVEN_OPTS
-mvn -Pdev clean tomcat7:run
-unset JAVA_OPTS
-unset MAVEN_OPTS
-
-
diff --git a/server/svg-util/src/main/java/com/pudonghot/ambition/svg/SvgUtil.java b/server/svg-util/src/main/java/com/pudonghot/ambition/svg/SvgUtil.java
deleted file mode 100644
index 4a4fe12..0000000
--- a/server/svg-util/src/main/java/com/pudonghot/ambition/svg/SvgUtil.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.pudonghot.ambition.svg;
-
-import org.dom4j.Element;
-import org.dom4j.Document;
-import java.util.Iterator;
-import java.io.IOException;
-import java.io.InputStream;
-import org.dom4j.io.SAXReader;
-import org.xml.sax.SAXException;
-import lombok.extern.slf4j.Slf4j;
-import org.dom4j.DocumentException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import org.apache.commons.io.IOUtils;
-import java.nio.charset.StandardCharsets;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.CharEncoding;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-import org.apache.batik.transcoder.TranscoderException;
-
-/**
- * @version 0.0.1
- * @since 0.0.1
- * @author Shaun Chyxion <br>
- * chyxion@163.com <br>
- * Aug 9, 2016 5:52:31 PM
- */
-@Slf4j
-public class SvgUtil {
-
-    /**
-     * @param bytesSvg
-     * @return
-     */
-    public static boolean isSvg(byte[] bytesSvg) {
-        return isSvg(new ByteArrayInputStream(bytesSvg));
-    }
-
-    /**
-     * @param insSvg
-     * @return
-     */
-    public static boolean isSvg(InputStream insSvg) {
-        try {
-            read(insSvg);
-            return true;
-        }
-        catch (Exception e) {
-            log.info("Input Stream Is Not Svg.", e);
-            return false;
-        }
-        finally {
-            IOUtils.closeQuietly(insSvg);
-        }
-    }
-
-    /**
-     * @param bytesSvg
-     * @param color
-     * @param width
-     * @param height
-     * @return
-     */
-    public static byte[] convertToPng(byte[] bytesSvg, String color, int width, int height) {
-        return convertToPng(bytesSvg,
-                color,
-                toPxOrNull(width),
-                toPxOrNull(height));
-    }
-
-    /**
-     * @param bytesSvg
-     * @param color
-     * @param width
-     * @param height
-     * @return
-     */
-    public static byte[] convertToPng(byte[] bytesSvg, String color, String width, String height) {
-        return convertToPng(new ByteArrayInputStream(bytesSvg), color, width, height);
-    }
-
-    public static byte[] convertToPng(InputStream insSvg, String color, int width, int height) {
-        return convertToPng(insSvg, color, toPxOrNull(width), toPxOrNull(height));
-    }
-
-    /**
-     * @param insSvg
-     * @param color
-     * @param width
-     * @param height
-     * @return
-     */
-    public static byte[] convertToPng(InputStream insSvg, String color, String width, String height) {
-        ByteArrayOutputStream baosPng = null;
-        try {
-            final byte[] bytesSvg = apply(insSvg, color, width, height);
-            baosPng = new ByteArrayOutputStream();
-            final PNGTranscoder transcoder = new PNGTranscoder();
-            transcoder.transcode(
-                    new TranscoderInput(new ByteArrayInputStream(bytesSvg)),
-                    new TranscoderOutput(baosPng));
-            baosPng.flush();
-            return baosPng.toByteArray();
-        }
-        catch (TranscoderException | IOException e) {
-            throw new IllegalStateException(
-                    "Convert SVG To PNG Error Caused", e);
-        }
-        finally {
-            IOUtils.closeQuietly(baosPng);
-            IOUtils.closeQuietly(insSvg);
-        }
-    }
-
-    protected static byte[] apply(InputStream insSvg, String color, String width, String height) {
-        return apply0(insSvg, color, width, height).asXML().getBytes(StandardCharsets.UTF_8);
-    }
-
-    protected static Document apply0(InputStream insSvg, String color, String width, String height) {
-        Document document = read(insSvg);
-        log.debug("Process SVG [{}] To Color [{}] Width [{}] Height [{}].", document, width, height);
-        Element rootEl = document.getRootElement();
-        if (StringUtils.isNotBlank(width)) {
-            rootEl.attribute("width").setValue(width);
-        }
-        if (StringUtils.isNotBlank(height)) {
-            rootEl.attribute("height").setValue(height);
-        }
-        @SuppressWarnings("unchecked")
-        Iterator<Element> paths = (Iterator<Element>) rootEl.elementIterator("path");
-        while (paths.hasNext()) {
-            paths.next().attribute("fill").setValue(color);
-        }
-        return document;
-    }
-
-    protected static String toPxOrNull(int size) {
-        return size > 0 ? size + "px" : null;
-    }
-
-    protected static Document read(InputStream insSvg) {
-        SAXReader reader = new SAXReader();
-        // disable validate
-        String feature = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
-        try {
-            reader.setFeature(feature, false);
-        }
-        catch (SAXException e) {
-            throw new IllegalStateException(
-                    "SAXReader Disable Feature [" +
-                    feature + "] Errro Caused", e);
-        }
-        reader.setEncoding(CharEncoding.UTF_8);
-        reader.setIncludeExternalDTDDeclarations(false);
-        reader.setIncludeInternalDTDDeclarations(false);
-        reader.setValidation(false);
-        try {
-            return reader.read(insSvg);
-        }
-        catch (DocumentException e) {
-            throw new IllegalStateException(
-                    "Read SVG Input Stream Error Caused", e);
-        }
-    }
-}
diff --git a/server/svg-util/src/main/resources/.gitkeep b/server/svg-util/src/main/resources/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/server/svg-util/src/test/resources/spring/config.properties b/server/svg-util/src/test/resources/spring/config.properties
deleted file mode 100644
index 3ded7d3..0000000
--- a/server/svg-util/src/test/resources/spring/config.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config Dev
-
-# Database
-db.url=jdbc:mysql://127.0.0.1:3307/echat_sit
-db.user=flaginfo_echat
-db.password=echat407
-
-# Redis
-redis.host=127.0.0.1
-redis.port=6379
-redis.password=0211
\ No newline at end of file
diff --git a/server/util/README.md b/server/util/README.md
deleted file mode 100644
index a330497..0000000
--- a/server/util/README.md
+++ /dev/null
@@ -1 +0,0 @@
-#umsapp-ota-data-model
diff --git a/server/util/pom.xml b/server/util/pom.xml
deleted file mode 100644
index 1003519..0000000
--- a/server/util/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>util</artifactId>
-    <name>Ambition Util</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>ambition-crm</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <artifactId>commons-codec</artifactId>
-            <groupId>commons-codec</groupId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/server/util/run b/server/util/run
deleted file mode 100755
index 83c1664..0000000
--- a/server/util/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-export MAVEN_OPTS="-noverify -agentpath:/usr/local/JRebel/6.3.2/lib/libjrebel64.dylib -Drebel.dirs=target -Drebel.disable_update=true -Ddev=true"
-set JAVA_OPTS=$MAVEN_OPTS
-mvn -Pdev clean tomcat7:run
-unset JAVA_OPTS
-unset MAVEN_OPTS
-
-
diff --git a/server/util/src/main/resources/.gitkeep b/server/util/src/main/resources/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/server/util/src/test/resources/.gitkeep b/server/util/src/test/resources/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/server/web-common/README.md b/server/web-common/README.md
deleted file mode 100644
index f9b99f3..0000000
--- a/server/web-common/README.md
+++ /dev/null
@@ -1 +0,0 @@
-#flaginfo-web-parent
diff --git a/server/web-common/pom.xml b/server/web-common/pom.xml
deleted file mode 100644
index d2b10ab..0000000
--- a/server/web-common/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>web-common</artifactId>
-    <packaging>jar</packaging>
-    <name>PudongHot Ambition Web Common</name>
-    <description>PudongHot Ambition Web Common</description>
-
-    <parent>
-        <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>ambition-crm</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>me.chyxion.tigon</groupId>
-            <artifactId>tigon-webmvc-core</artifactId>
-        </dependency>
-        <!-- Log -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/server/web-common/src/main/java/com/pudonghot/ambition/web/interceptor/DefaultHttpRequestInterceptor.java b/server/web-common/src/main/java/com/pudonghot/ambition/web/interceptor/DefaultHttpRequestInterceptor.java
deleted file mode 100644
index 2c4eef6..0000000
--- a/server/web-common/src/main/java/com/pudonghot/ambition/web/interceptor/DefaultHttpRequestInterceptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.pudonghot.ambition.web.interceptor;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.PathMatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-import me.chyxion.tigon.webmvc.TigonHandlerInterceptor;
-
-/**
- * @author Shaun Chyxion <br>
- * chyxion@163.com <br>
- * Mar 19, 2017 21:50:57
- */
-@Slf4j
-public class DefaultHttpRequestInterceptor implements TigonHandlerInterceptor {
-
-    @Override
-    public String[] includePathPatterns() {
-        return new String[] {"/**"};
-    }
-
-    @Override
-    public String[] excludePathPatterns() {
-        return null;
-    }
-
-    @Override
-    public PathMatcher pathMatcher() {
-        return null;
-    }
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        log.debug("Request [{}] With Params [{}].", request.getRequestURI(), request.getParameterMap());
-        request.setAttribute("startTime", System.currentTimeMillis());
-        return true;
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-        log.info("Request [{}] Took {} ms.",
-            request.getRequestURI(),
-            System.currentTimeMillis() - (Long) request.getAttribute("startTime"));
-    }
-}
diff --git a/server/web-common/src/main/resources/spring/spring-ambition-web-common.xml b/server/web-common/src/main/resources/spring/spring-ambition-web-common.xml
deleted file mode 100644
index 36f3bab..0000000
--- a/server/web-common/src/main/resources/spring/spring-ambition-web-common.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="com.pudonghot.ambition.web.interceptor.DefaultHttpRequestInterceptor" />
-</beans>
diff --git a/server/web-parent/README.md b/server/web-parent/README.md
deleted file mode 100644
index f9b99f3..0000000
--- a/server/web-parent/README.md
+++ /dev/null
@@ -1 +0,0 @@
-#flaginfo-web-parent
diff --git a/server/web-parent/pom.xml b/server/web-parent/pom.xml
deleted file mode 100644
index 09ee182..0000000
--- a/server/web-parent/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>web-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>PudongHot Ambition Web Parent</name>
-    <description>PudongHot Ambition Web Parent</description>
-
-    <parent>
-        <groupId>com.pudonghot.ambition</groupId>
-        <artifactId>ambition-crm</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.finalName>${project.artifactId}</project.build.finalName>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>me.chyxion.tigon</groupId>
-            <artifactId>tigon-webmvc-spring-boot</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Log -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.pudonghot.ambition</groupId>
-            <artifactId>web-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>${project.build.finalName}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/web/app/templates/components/customer-application/preview-btn.hbs b/web/app/templates/components/customer-application/preview-btn.hbs
index c67df79..366d338 100644
--- a/web/app/templates/components/customer-application/preview-btn.hbs
+++ b/web/app/templates/components/customer-application/preview-btn.hbs
@@ -30,7 +30,7 @@
                             image-height=null
                             image-style=(if (is-screen '<md')
                                 'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 90%;'
-                                'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 56%;')
+                                'border-radius: 2%; border: 1px solid #DCDCDC; max-width: 94%;')
                             previews=images
                             index=index}}
                     </div>