From 34e37471b8268a7fa6eebb449dda229a25b26c06 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 12 Mar 2018 21:50:17 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml |  6 ++++++
 src/org/redkale/net/Server.java       | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 824f0cc28..97274fa8e 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -126,6 +126,12 @@
     -->
     <server protocol="HTTP" host="127.0.0.1" port="6060" root="root" lib=""> 
         
+        <!-- 
+           【节点在<server>中唯一】
+           value: 创建SSLContext的实现类, 可自定义，必须是org.redkale.net.SSLCreator的子类
+        -->
+        <ssl creator="" p12="{APP_HOME}/conf/xxx.p12" jks="{APP_HOME}/conf/xxx.jks" pem="{APP_HOME}/conf/xxx.pem"/>
+        
         <!-- 
            加载所有的Service服务;
            在同一个进程中同一个name同一类型的Service将共用同一个实例
diff --git a/src/org/redkale/net/Server.java b/src/org/redkale/net/Server.java
index 509c78d72..f072a3099 100644
--- a/src/org/redkale/net/Server.java
+++ b/src/org/redkale/net/Server.java
@@ -127,15 +127,16 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         AnyValue sslConf = config.getAnyValue("ssl");
         if (sslConf != null) {
             String creatorClass = sslConf.getValue("creator", SSLCreator.class.getName());
+            SSLCreator creator = null;
             if (SSLCreator.class.getName().equals(creatorClass) || creatorClass.isEmpty()) {
-                this.sslContext = new SSLCreator() {
-                }.create(this, sslConf);
+                creator = new SSLCreator() {
+                };
             } else {
                 ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-                @SuppressWarnings("unchecked")
-                SSLCreator creator = ((SSLCreator) classLoader.loadClass(creatorClass).getDeclaredConstructor().newInstance());
-                this.sslContext = creator.create(this, sslConf);
+                creator = ((SSLCreator) classLoader.loadClass(creatorClass).getDeclaredConstructor().newInstance());
             }
+            this.resourceFactory.inject(creator);
+            this.sslContext = creator.create(this, sslConf);
         }
         final AtomicInteger counter = new AtomicInteger();
         final Format f = createFormat();