rhllor 0.0.2 → 1.13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf93f21531391899be204429d3a27aaaa95c8f6c
-  data.tar.gz: b0e11713343ef67394ca0afedcde8736be8ae139
+  metadata.gz: 5aaee94cbd799b26593b9dc537b59af5394dc6b5
+  data.tar.gz: 2bb9f3946e1c40df65095883b800938353d28129
 SHA512:
-  metadata.gz: ef8526d578a637a1fab37700554b2f942549a6eaa717b80ecff5820e40a78f686fb565ba5d2d46970b89eb16e2e8f5a7cfbe2317df442be2a09cb35fc4641737
-  data.tar.gz: ac05c19f6a0e7ad81eb82ba0c112b25419b36cb240e1358aafffd13844c41d4a7e7ff3c9670f1b7bea688f9c80bd9ebdfda76b9eb5e78b51267cdcd7b50e9617
+  metadata.gz: 86a15123f717a93fd2463bc0a2b7fea1b20a4bfe9c013a13bf8098c6f51d566f7a5509bf7095ffe270518b7f1ba9236e46b1686793d866c651414c3c2cc88ddb
+  data.tar.gz: 27fcf38dfb3fd391d91620a4eeadc346f54851c329bc81288223a50227e30c273086118846d205b490c09db9917982ca2581f1955077019a00cd1b640a9c321a

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem
+bin/console
+bin/setup

data/README.md

@@ -10,5 +10,5 @@ gem install rhllor
 
 依赖：
 
-`tty-prompt`：超级好用的命令行输入提示库，我要去做GAL Game了！
-`liquid`：超难用的模板引擎
+- `tty-prompt`：超级好用的命令行输入提示库，我要去做Gal Game了！
+- `liquid`：超难用的模板引擎

data/bin/rhllor

@@ -14,15 +14,15 @@ config = prompt.collect do
     key(:jersey) do
       puts '开始配置Jersey'
       key(:port).ask('输入端口号', default: 8080, convert: :int)
-      key(:application_path).ask('输入Application Path', default: '')
+      key(:application_path).ask('输入Application Path', default: 'v1')
     end
   end
 
   if selected_components.include?('jdbc')
     key(:jdbc) do
       puts '开始配置MySQL'
-      key(:name).ask('输入数据源名称', required: true)
-      key(:url).ask('输入URL', required: true)
+      key(:name).ask('输入数据源名称', default: 'base')
+      key(:url).ask('输入URL', default: '127.0.0.1:3306')
       key(:username).ask('输入用户名', required: true)
       key(:password).ask('输入密码', required: true)
     end
@@ -31,6 +31,7 @@ config = prompt.collect do
   if selected_components.include?('redis')
     key(:redis) do
       puts '开始配置Redis'
+      key(:name).ask('输入数据源名称', default: 'base')
       key(:url).ask('输入URL', default: 'test.redis.ricebook.net:8881')
     end
   end

data/lib/rhllor/version.rb

@@ -1,3 +1,3 @@
 module Rhllor
-  VERSION = '0.0.2'
+  VERSION = '1.13.1.0'
 end

data/project/__artifactId__/.gitlab-ci.yml

@@ -1,13 +1,9 @@
-image: "hub.ricebook.net/base/ubuntu:Java-2016.04.20"
+image: "hub.ricebook.net/base/alpine:java-2016.11.10"
 test_job:
     stage: "test"
     script:
         - "echo 'start building'"
-        {%- if thrift_server %}
-        - "mvn --quiet clean package -Dmaven.test.skip=true -rf {{ name }}-core"
-        {%- else %}
         - "mvn --quiet clean package -Dmaven.test.skip=true"
-        {%- endif %}
         - "cp {{ name }}-core/target/{{ name }}-core-1.0-SNAPSHOT.jar {{ name }}.jar"
         - "echo 'build done'"
     artifacts:

data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml

@@ -0,0 +1,92 @@
+spring:
+  profiles: development
+  application:
+    name: {{ name }}
+  cloud:
+    config:
+      uri: http://config-centre.test.rhllor.cn/
+      password: J2f(8J!onz
+      label: master
+
+{{ '' }}
+{%- if jersey -%}
+server:
+  port: {{ jersey.port }}
+
+{% endif -%}
+
+{%- if jdbc -%}
+mysql:
+  {{ jdbc.name }}:
+    userName: {{ jdbc.username }}
+    passWord: {{ jdbc.password }}
+    decrypt: false
+    masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+    slaveUrl:
+      - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+      - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+
+{% endif -%}
+
+{%- if redis -%}
+redis:
+  {{ redis.name }}:
+    timeout: 5000
+    connection: {{ redis.url }}
+    pool:
+      maxTotal: 1024
+      maxIdle: 200
+      minIdle: 20
+      maxWaitMillis: 1000
+      testOnBorrow: true
+
+{% endif -%}
+
+{%- if hbase -%}
+hbase:
+  quorum: {{ hbase.quorum }}
+  port: {{ hbase.port }}
+
+{% endif -%}
+
+{%- if thrift_server -%}
+thrift:
+  server:
+    {{ thrift_server.name }}:
+      port: {{ thrift_server.port }}
+      skip: true
+
+{% endif -%}
+
+{%- if kafka_consumer or kafka_producer -%}
+kafka:
+  {% if kafka_consumer -%}
+  consumer:
+    bootstrap-servers: {{ kafka_consumer.url }}
+    groupId: {{ name }}-test
+    concurrency: 1
+    offset: latest
+    poll-time: 10
+  {% endif -%}
+  {% if kafka_producer -%}
+  producer:
+    bootstrapServers: {{ kafka_producer.url }}
+  {% endif -%}
+{{ '' }}
+{% endif -%}
+
+rhllor:
+{%- if elastic_job %}
+  elasticjob:
+    zookeeper_server_list: {{ elastic_job.url }}
+    namespace: {{ name }}
+    max_retries: 1
+    session_timeout_ms: 60000
+    connection_timeout_ms: 15000
+    base_sleep_time_ms: 1000
+    max_sleep_time_ms: 3000
+{%- endif %}
+  agent:
+    enable: true
+  metrics:
+    enable: true

data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml

@@ -17,32 +17,28 @@ server:
 
 {%- if jdbc -%}
 mysql:
-  more:
-    {{ jdbc.name }}:
-      userName: {{ jdbc.username }}
-      passWord: {{ jdbc.password }}
-      decrypt: false
-      masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
-      slaveUrl:
-        - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
-        - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+  {{ jdbc.name }}:
+    userName: {{ jdbc.username }}
+    passWord: {{ jdbc.password }}
+    decrypt: false
+    masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+    slaveUrl:
+      - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
+      - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
 
 {% endif -%}
 
 {%- if redis -%}
 redis:
-  timeout: 5000
-  connection: {{ redis.url }}
-  cluster:
-    soTimeout: 2000
-    connTimeout: 2000
-    maxRedirection: 5
-  pool:
-    maxTotal: 1024
-    maxIdle: 200
-    minIdle: 20
-    maxWaitMillis: 1000
-    testOnBorrow: true
+  {{ redis.name }}:
+    timeout: 5000
+    connection: {{ redis.url }}
+    pool:
+      maxTotal: 1024
+      maxIdle: 200
+      minIdle: 20
+      maxWaitMillis: 1000
+      testOnBorrow: true
 
 {% endif -%}
 

data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: test
+    active: development

data/project/__artifactId__/app.yaml

@@ -1,7 +1,7 @@
 appname: "{{ name }}"
 entrypoints:
   prod:
-    cmd: "/opt/jdk/bin/java -jar {{ name }}.jar --spring.profiles.active=production"
+    cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=production"
     {%- if jersey -%}
     {{ '' }}
     ports:
@@ -9,7 +9,7 @@ entrypoints:
     {%- endif %}
     network_mode: bridge
   test:
-    cmd: "/opt/jdk/bin/java -jar {{ name }}.jar --spring.profiles.active=test"
+    cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=test"
     {%- if jersey -%}
     {{ '' }}
     ports:
@@ -17,4 +17,4 @@ entrypoints:
     {%- endif %}
     network_mode: bridge
 build: "echo 'already done in CI'"
-base: "hub.ricebook.net/base/alpine:Java-2016.04.20"
+base: "hub.ricebook.net/base/alpine:java-2016.11.10"

data/project/__artifactId__/pom.xml

@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>com.ricebook.rhllor</groupId>
                 <artifactId>spring-boot-starter-dependencies</artifactId>
-                <version>1.13.0-SNAPSHOT</version>
+                <version>1.13.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: rhllor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.13.1.0
 platform: ruby
 authors:
 - xieenlong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0.rc3
-description: 「懒」才是第一生产力！Rhllor项目生成脚手架
+description: "「懒」才是第一生产力！Rhllor项目生成脚手架"
 email:
 - xieenlong@ricebok.com
 executables:
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -87,6 +87,7 @@ files:
 - project/__artifactId__/__artifactId__-api/pom.xml
 - project/__artifactId__/__artifactId__-core/pom.xml
 - project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java
+- project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml
 - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml
 - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml
 - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml
@@ -104,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rhllor Cli