Merge branch 'fix-cli' into '4.1.0-SNAPSHOT'

修复一些小bug

See merge request laf/journalQ!254

Author: liyue25

joyqueue-client/joyqueue-client-all-shaded/pom.xml

@@ -60,6 +60,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <minimizeJar>false</minimizeJar>
                             <artifactSet>
                                 <excludes>

joyqueue-client/joyqueue-client-core-shaded/pom.xml

@@ -56,6 +56,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <minimizeJar>false</minimizeJar>
                             <artifactSet>
                                 <excludes>

joyqueue-console/joyqueue-web/joyqueue-web-application/src/main/java/com/jd/joyqueue/application/WebApplication.java

@@ -21,12 +21,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
 
 /**
  * Created by chenyanying3 on 19-3-3.
  */
 @SpringBootApplication
-//@PropertySource({"classpath:application.properties"})
+@PropertySource({"classpath:application.properties"})
 @Import(H2DBServerAutoConfiguration.class)
 public class WebApplication implements ApplicationRunner {
     private static final Logger logger = LoggerFactory.getLogger(WebApplication.class);

joyqueue-distribution/joyqueue-distribution-web/conf/application.properties

@@ -13,8 +13,38 @@
 #
 
 
+# Hikari will use the above plus the following to setup connection pooling
+spring.main.banner-mode=off
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=5
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=hikari
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+# h2 datasource
+spring.datasource.driver=h2
+spring.datasource.url=jdbc:h2:file:~/.joyqueue_web/h2/code-generator;AUTO_SERVER=TRUE;INIT=RUNSCRIPT FROM 'classpath:/schema/schema.sql'
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=
+spring.datasource.password=
+
+# vertx
 ## Web服务端口，默认10031
-# vertx.http.port=10031
+vertx.http.port=10031
+vertx.routing.worker=true
+vertx.routing.instances=6
+vertx.routing.maxWorkerExecuteTime=6000000000
+vertx.routing.workerPoolName=routing
+vertx.routing.workerPoolSize=30
+vertx.routing.multiThreads=true
+
+# mybatis
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.config-location=classpath:mybatis-config.xml
+
 
 ## 提供元数据服务的JoyQueue Server地址和端口。支持配置多个地址，用逗号分开，默认端口为50091。例如：192.168.1.1,192.168.1.2:8888
-# joyqueue.servers=127.0.0.1:50091
+joyqueue.servers=127.0.0.1:50091

joyqueue-server/joyqueue-server-runtime/src/main/java/com/jd/joyqueue/tools/config/ConsoleConsumerConfig.java

@@ -27,7 +27,7 @@
  */
 public class ConsoleConsumerConfig {
 
-    @Parameter(names = {"-b", "--bootstrap"}, description = "server bootstrap")
+    @Parameter(names = {"-s", "--server"}, description = "server bootstrap")
     private String bootstrap = "localhost:50088";
 
     @Parameter(names = {"-t", "--topic"}, description = "consumer topic", required = true)
@@ -42,7 +42,7 @@ public class ConsoleConsumerConfig {
     @Parameter(names = {"-a", "--app"}, description = "consumer app", required = true)
     private String app;
 
-    @Parameter(names = {"-T", "-token"}, description = "app token", required = true)
+    @Parameter(names = {"-T", "--token"}, description = "app token", required = true)
     private String token;
 
     @DynamicParameter(names = {"-p", "--params"}, description = "consumer params")

joyqueue-server/joyqueue-server-runtime/src/main/java/com/jd/joyqueue/tools/config/ConsoleProducerConfig.java

@@ -27,7 +27,7 @@
  */
 public class ConsoleProducerConfig {
 
-    @Parameter(names = {"-b", "--bootstrap"}, description = "server bootstrap")
+    @Parameter(names = {"-s", "--server"}, description = "server bootstrap")
     private String bootstrap = "localhost:50088";
 
     @Parameter(names = {"-t", "--topic"}, description = "producer topic", required = true)
@@ -42,7 +42,7 @@ public class ConsoleProducerConfig {
     @Parameter(names ={"-a", "--app"}, description = "producer app", required = true)
     private String app;
 
-    @Parameter(names ={"-T", "-token"}, description = "app token", required = true)
+    @Parameter(names ={"-T", "--token"}, description = "app token", required = true)
     private String token;
 
     @DynamicParameter(names = {"-p", "-params"}, description = "producer params")

pom.xml

@@ -87,7 +87,7 @@
         <openmessaging-spring.version>0.0.1-SNAPSHOT</openmessaging-spring.version>
         <openmessaging-api.version>1.0.0-alpha</openmessaging-api.version>
         <asm.version>6.2.1</asm.version>
-        <jackson-dataformat.version>2.7.8</jackson-dataformat.version>
+        <jackson-dataformat.version>RELEASE</jackson-dataformat.version>
         <metrics.version>4.0.0</metrics.version>
         <commons-lang.version>2.6</commons-lang.version>
         <guice.version>4.2.2</guice.version>