fix: springboot starter isv app startup fail

xionghan.00 · xionghan.00 · commit 3527077e4e2e · 2019-12-20T15:14:28.000+08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # appframework-java
 
-Appframework-java is a java Software Development Kit which provide java style api for lark bot development. 
+Appframework-java is a java Software Development Kit which provide java api for lark app development. 
 It's also a lightweight framework for lark open platform callback event processing, 
 developers need to only register event handlers to deal with callback event without caring about the data format or safety verification.
 
@@ -18,8 +18,8 @@ developers need to only register event handlers to deal with callback event with
 
 
 ### 1.2 Configuration
-Every lark app has a appId and appSecret. AppId is a unique identity from a app, but it's a random string generated by lark open platform which not friendly to remember or human identification.
-Developer could name the apps and interact with frame work api using the short name.
+Every lark app has an appId and appSecret. AppId is an unique identity from an app, but it's a random string generated by lark open platform which is not friendly to remember or human identify.
+Developer could name the apps and interact with framework api using the short name.
 
 Firstly, wo prepare app configuration in advance to build a AppConfiguration object.
 
@@ -44,11 +44,11 @@ Server configuration properties example,
 ```properties
 
 # larksuite.appframework.${appShortName}.appId
-larksuite.appframework.test-app1-isv.appId=cli_xxxxxxxxxx
-larksuite.appframework.test-app1-isv.appSecret=xxxxxxxxxxxxxxxx
-larksuite.appframework.test-app1-isv.encryptKey=xxxxxxxxxxxx
-larksuite.appframework.test-app1-isv.verificationToken=xxxxxxxxxxxx
-larksuite.appframework.test-app1-isv.isIsv=true
+larksuite.appframework.test-app-isv.appId=cli_xxxxxxxxxx
+larksuite.appframework.test-app-isv.appSecret=xxxxxxxxxxxxxxxx
+larksuite.appframework.test-app-isv.encryptKey=xxxxxxxxxxxx
+larksuite.appframework.test-app-isv.verificationToken=xxxxxxxxxxxx
+larksuite.appframework.test-app-isv.isIsv=true
 ```
 
 ### 1.3 Create LarkAppInstance
@@ -57,7 +57,7 @@ LarkAppInstance is a app instance, all the operations of a app are provided by a
 Usually, we create a LarkAppInstance with a LarkAppInstanceFactory as follow.
 
 ```java
-AppConfiguration appConfiguration = AppConfiguration.loadFromProperties("test-app1-isv", properties); //test-app1-isv is a app short name
+AppConfiguration appConfiguration = AppConfiguration.loadFromProperties("test-app-isv", properties); //test-app-isv is a app short name
 
 LarkAppInstanceFactory.AppEventListener myTestAppListener1 = LarkAppInstanceFactory
         .createAppEventCallbackListener()
@@ -74,12 +74,12 @@ LarkAppInstance ins = LarkAppInstanceFactory
 AppTicketStorage is a storage interface should be implemented by developer which used to persist app ticket. 
 App ticket is a necessary token for ISV app when fetching app access token. 
 If you are building a ISV app, you should implement the storage with Redis or Mysql.
-For internal app, just ignoring the configuration item is ok.
+For custom app, just ignore the configuration item.
 
 
 ### 1.4 Register your event handlers to AppEventListener
 
-BotAppsServerFactory.AppEventListener is a registry for event handlers for a specific app which provide almost all lark event
+AppEventListener is a registry for event handlers for a specific app which provide almost all lark event
 handling registration, and all those event types that you didn't listen on will be ignored silently.
 
 
@@ -221,7 +221,7 @@ Message msg = new CardMessage(card.toObjectForJson());
 # 3. SpringBoot support
 
 Spring boot is a very common used framework for Java application development. 
-For more easier integrated into project Constructed with SpringBoot framework,
+For more easier integrated into project constructed with springBoot framework,
 we provide a springboot start tool which may reduce duplicated work when building a lark app.
 
 ### 3.1 Maven Dependency
diff --git a/appframework-sdk/pom.xml b/appframework-sdk/pom.xml
@@ -12,11 +12,11 @@
     <parent>
         <groupId>com.larksuite.appframework</groupId>
         <artifactId>appframework-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>appframework-sdk</artifactId>
-    <version>1.0.0</version>
+    <version>${appframework.version}</version>
 
     <dependencies>
         <dependency>
diff --git a/appframework-spring-boot-starter/pom.xml b/appframework-spring-boot-starter/pom.xml
@@ -11,14 +11,13 @@
     <parent>
         <groupId>com.larksuite.appframework</groupId>
         <artifactId>appframework-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>appframework-spring-boot-starter</artifactId>
-
+    <version>${appframework.version}</version>
     <properties>
-        <appframework.sdk.version>1.0.0</appframework.sdk.version>
         <spring.boot.version>2.1.9.RELEASE</spring.boot.version>
     </properties>
 
@@ -39,7 +38,7 @@
         <dependency>
             <groupId>com.larksuite.appframework</groupId>
             <artifactId>appframework-sdk</artifactId>
-            <version>${appframework.sdk.version}</version>
+            <version>${appframework.version}</version>
         </dependency>
 
         <dependency>
diff --git a/appframework-spring-boot-starter/src/main/java/com/larksuite/appframework/spring/boot/AppframeworkAutoConfiguration.java b/appframework-spring-boot-starter/src/main/java/com/larksuite/appframework/spring/boot/AppframeworkAutoConfiguration.java
@@ -10,10 +10,13 @@
 import com.larksuite.appframework.sdk.AppConfiguration;
 import com.larksuite.appframework.sdk.AppEventListener;
 import com.larksuite.appframework.sdk.LarkAppInstance;
-import com.larksuite.appframework.sdk.LarkAppInstanceFactory;
 import com.larksuite.appframework.sdk.client.ImageKeyStorage;
 import com.larksuite.appframework.sdk.client.SessionManager;
+import com.larksuite.appframework.sdk.core.App;
+import com.larksuite.appframework.sdk.core.InstanceContext;
 import com.larksuite.appframework.sdk.core.auth.AppTicketStorage;
+import com.larksuite.appframework.sdk.core.protocol.OpenApiClient;
+import com.larksuite.appframework.sdk.utils.SimpleHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -141,14 +144,15 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
         }
 
         appframeworkProperties.getApps().forEach(AppConfiguration::checkConfiguration);
+
         p.getApps().forEach(c -> {
-            LarkAppInstanceFactory.LarkAppInstanceBuilder builder = LarkAppInstanceFactory.builder(c);
 
-            if (appframeworkProperties.getFeishu()) {
-                builder.feishu();
-            }
+            LarkAppInstance ins = new LarkAppInstance(
+                    new InstanceContext(
+                            new App(c),
+                            new OpenApiClient(new SimpleHttpClient(), Boolean.TRUE == appframeworkProperties.getFeishu()))
+            );
 
-            LarkAppInstance ins = builder.create();
             final String appName = ins.getAppShortName();
 
             DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) ((ConfigurableApplicationContext) applicationContext).getBeanFactory();
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.larksuite.appframework</groupId>
     <artifactId>appframework-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>larksuite-appframework-sdk-java</name>
     <url>https://open.larksuite.com/</url>
 
@@ -22,10 +22,11 @@
         <module>appframework-spring-boot-starter</module>
     </modules>
 
+
     <properties>
+        <appframework.version>1.0.1</appframework.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-
     </properties>
 
     <distributionManagement>
