👌 更新嵌入式Tomcat启动类

dunwu · dunwu · commit ec0bd459d258 · 2018-01-31T11:03:39.000+08:00
diff --git a/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/SimpleTomcatServer.java b/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/SimpleTomcatServer.java
diff --git a/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/TomcatServer.java b/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/TomcatServer.java
@@ -11,10 +11,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
-/**
- * 嵌入式 Tomcat 启动类 启动后可访问 http://localhost:8080/javatool-server/
- * @author Zhang Peng
- */
 public class TomcatServer {
 
     private static final Logger log = LoggerFactory.getLogger(TomcatServer.class);
@@ -29,9 +25,6 @@ public class TomcatServer {
     private static final String RELATIVE_DEV_DOCBASE_DIR = "src/main/webapp";
     private static final String RELATIVE_DOCBASE_DIR = "./";
 
-    /**
-     * 除了 spring.profiles.active，System.setProperty 设置的属性都是为了配置 server.xml
-     */
     public static void main(String[] args) throws Exception {
         // 设定Spring的profile
         if (StringUtils.isEmpty(System.getProperty("spring.profiles.active"))) {
@@ -48,7 +41,7 @@ public static void main(String[] args) throws Exception {
             System.setProperty("catalina.base", getAbsolutePath() + RELATIVE_BASE_DIR);
             System.setProperty("tomcat.context.docBase", RELATIVE_DOCBASE_DIR);
             if ("develop".equalsIgnoreCase(System.getProperty("spring.profiles.active"))
-                    || "test".equalsIgnoreCase("spring.profiles.active")) {
+                || "test".equalsIgnoreCase("spring.profiles.active")) {
                 System.setProperty("dubbo.resolve.file", getAbsolutePath() + RELATIVE_DUBBO_RESOVE_FILE);
             }
         }
@@ -58,7 +51,7 @@ public static void main(String[] args) throws Exception {
         }
         if (StringUtils.isEmpty(System.getProperty("tomcat.server.shutdownPort"))) {
             System.setProperty("tomcat.server.shutdownPort",
-                    String.valueOf(Integer.valueOf(System.getProperty("tomcat.connector.port")) + 10000));
+                String.valueOf(Integer.valueOf(System.getProperty("tomcat.connector.port")) + 10000));
         }
 
         log.info("====================ENV setting====================");
@@ -70,14 +63,16 @@ public static void main(String[] args) throws Exception {
         log.info("tomcat.connector.port:" + System.getProperty("tomcat.connector.port"));
         log.info("tomcat.server.shutdownPort:" + System.getProperty("tomcat.server.shutdownPort"));
 
+
         ExtendedTomcat tomcat = new ExtendedTomcat();
         tomcat.start();
         tomcat.getServer().await();
     }
 
     private static String getAbsolutePath() {
         String path = null;
-        String folderPath = TomcatServer.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        String folderPath = TomcatServer.class.getProtectionDomain().getCodeSource().getLocation()
+            .getPath();
         if (folderPath.indexOf("WEB-INF") > 0) {
             path = folderPath.substring(0, folderPath.indexOf("WEB-INF"));
         } else if (folderPath.indexOf("target") > 0) {
@@ -87,9 +82,6 @@ private static String getAbsolutePath() {
     }
 }
 
-/**
- * Tomcat 扩展类，添加功能是启动时，加载 src/main/resources/tomcat/conf/server.xml 文件中配置，而非默认配置。
- */
 class ExtendedTomcat extends Tomcat {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -112,22 +104,22 @@ public Server getServer() {
         System.setProperty("catalina.useNaming", "false");
         ExtendedCatalina extendedCatalina = new ExtendedCatalina();
 
-        // 覆盖默认的skip和scan jar包配置
-        System.setProperty(Constants.SKIP_JARS_PROPERTY, "");
-        System.setProperty(Constants.SCAN_JARS_PROPERTY, "");
+        //覆盖默认的skip和scan jar包配置
+        System.setProperty(Constants.SKIP_JARS_PROPERTY,"");
+        System.setProperty(Constants.SCAN_JARS_PROPERTY,"");
 
         Digester digester = extendedCatalina.createStartDigester();
         digester.push(extendedCatalina);
         try {
             server = ((ExtendedCatalina) digester
-                    .parse(new File(System.getProperty("catalina.base") + RELATIVE_SERVERXML_PATH))).getServer();
+                .parse(new File(System.getProperty("catalina.base") + RELATIVE_SERVERXML_PATH))).getServer();
             // 设置catalina.base和catalna.home
             this.initBaseDir();
             return server;
         } catch (Exception e) {
             log.error("Error while parsing server.xml", e);
             throw new RuntimeException("server未创建,请检查server.xml(路径:" + System.getProperty("catalina.base")
-                    + RELATIVE_SERVERXML_PATH + ")配置是否正确");
+                + RELATIVE_SERVERXML_PATH + ")配置是否正确");
         }
     }
 
diff --git a/codes/javatool/server/src/main/resources/properties/application-develop.properties b/codes/javatool/server/src/main/resources/properties/application-develop.properties
@@ -0,0 +1,12 @@
+# jdbc
+jdbc.driver=
+jdbc.url=
+jdbc.username=
+jdbc.password=
+
+# redis
+redis.name=
+redis.host=
+redis.port=
+redis.password=
+redis.database=
diff --git a/codes/javatool/server/src/main/resources/properties/application-test.properties b/codes/javatool/server/src/main/resources/properties/application-test.properties
@@ -0,0 +1,12 @@
+# jdbc
+jdbc.driver=
+jdbc.url=
+jdbc.username=
+jdbc.password=
+
+# redis
+redis.name=
+redis.host=
+redis.port=
+redis.password=
+redis.database=
