rhllor 1.13.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b3238decab4bd443945028f03f4e4a087705d7b
-  data.tar.gz: c55792ed47767810f00ec95b06dbd1bac74aa2bf
+  metadata.gz: 132a0392fb5a7fdbcbf340bca55d3c7ea0bf43d7
+  data.tar.gz: 26555970076f098c3020684ec63da6a55b90e213
 SHA512:
-  metadata.gz: 0e01273a499cf61d80daab44466420f0e647c2747caff978c4aa1e7ea5b2c42c20e18df9439903980fd573629fc9619221def784473dfc592dd04193121f0aed
-  data.tar.gz: 229c0f3b3113d4b9812c8ca54bcc7a91056c628be2a6ce71b1ae4504443f4a4f818e36512b8a5f40055a64ece647e36881768c66b4595696366db48cd4b575a6
+  metadata.gz: a02ddad089cfd00da3d9515d7940a998ae776ec522ac8ceaaf180dc3198e22f57b11682442ae105c2fde1c9f272a5ce818a490c8308a551dd0b8e97baa46acac
+  data.tar.gz: 4c0ebcb442e3bb315997d441d6963b7e548296ab885b2869e0b0ec8e6da1a4b233ba98c3fa7f5558fd0d995db04ad68d54300fda5ab0ededbc8f0c39b9dc1696

data/bin/rhllor

@@ -22,7 +22,6 @@ config = prompt.collect do
   if selected_components.include?('jdbc')
     key(:jdbc) do
       puts '开始配置MySQL'
-      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)
@@ -32,7 +31,6 @@ 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.rb

@@ -36,4 +36,6 @@ class Hash
       end
     result
   end
+  # shit...
+  # Hash[map{ |k, v| [k.to_s, v.is_a?(Hash) ? v.deep_stringify_keys() : v] }]
 end

data/lib/rhllor/version.rb

@@ -1,3 +1,3 @@
 module Rhllor
-  VERSION = '1.13.2.1'
+  VERSION = '2.0.0'
 end

data/project/__artifactId__/__artifactId__-core/pom.xml

@@ -36,6 +36,11 @@
             <artifactId>spring-boot-starter-jersey</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ricebook.rhllor</groupId>
+            <artifactId>spring-boot-starter-zuul-client</artifactId>
+        </dependency>
+
         {% endif -%}
 
         {%- if jdbc -%}

data/project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java

@@ -22,10 +22,6 @@ import org.springframework.kafka.annotation.EnableKafka;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 
 
 /**

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

@@ -7,4 +7,16 @@ spring:
       uri: http://config-centre.intra.ricebook.net/
       username: admin
       password: $fu&Yfs5]2
-      label: master
+      label: master
+{%- if jersey %}
+  hostname: {{ name }}.rhllor.net,apollo.rhllor.net/{{ name }},open.seriousapps.cn/{{ name }}
+  jersey:
+    application-path: {{ jersey.application_path }}
+
+server:
+  port: {{ jersey.port }}
+
+{% else %}
+
+{{ '' }}
+{%- endif %}

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

@@ -8,6 +8,7 @@ spring:
       password: J2f(8J!onz
       label: master
 {%- if jersey %}
+  hostname: {{ name }}.test.rhllor.net,apollo.test.rhllor.net/{{ name }},opentest.seriousapps.cn/{{ name }}
   jersey:
     application-path: {{ jersey.application_path }}
 
@@ -21,28 +22,19 @@ server:
 
 {%- if jdbc -%}
 mysql:
-  {{ jdbc.name }}:
+  {{ 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 }}:
+  {{ 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: development
+    active: test

data/project/__artifactId__/app.yaml

@@ -2,7 +2,7 @@ appname: "{{ name }}"
 subscribers: "#deploy"
 entrypoints:
   prod:
-    cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=production"
+    cmd: "/opt/jdk/bin/java -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -Xms1000m -Xmx2000m -Xmn1000m -jar {{ name }}.jar --spring.profiles.active=production"
     {%- if jersey -%}
     {{ '' }}
     ports:
@@ -10,13 +10,13 @@ entrypoints:
     healthcheck_url: "{{ jersey.application_path }}/health_check"
     {%- endif %}
     network_mode: "bridge"
+    restart: "always"
   test:
     cmd: "/opt/jdk/bin/java -Xms400m -Xmx800m -Xmn400m -jar {{ name }}.jar --spring.profiles.active=test"
     {%- if jersey -%}
     {{ '' }}
     ports:
       - "{{ jersey.port }}/tcp"
-    healthcheck_url: "{{ jersey.application_path }}/health_check"
     {%- endif %}
     network_mode: "bridge"
 build:
@@ -28,7 +28,7 @@ permitted_users:
 combos:
   prod:
     cpu: 3
-    memory: "3GB"
+    memory: "4GB"
     podname: "release"
     entrypoint: "prod"
     networks:
@@ -36,8 +36,13 @@ combos:
     permitted_users:
       - "zhuxuehan"
       - "{{ author }}"
+    {%- if jersey -%}
+    {{ '' }}
     elb:
       - "internal {{ name }}.rhllor.net"
+      - "internal apollo.rhllor.net/{{ name }}"
+      - "internal open.seriousapps.cn/{{ name }}"
+    {%- endif %}
   test:
     cpu: 1
     memory: "1GB"
@@ -49,5 +54,10 @@ combos:
     permitted_users:
       - "zhuxuehan"
       - "{{ author }}"
+    {%- if jersey -%}
+    {{ '' }}
     elb:
       - "develop {{ name }}.test.rhllor.net"
+      - "develop apollo.test.rhllor.net/{{ name }}"
+      - "develop opentest.seriousapps.cn/{{ name }}"
+    {%- endif %}

data/project/__artifactId__/pom.xml

@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>com.ricebook.rhllor</groupId>
                 <artifactId>spring-boot-starter-dependencies</artifactId>
-                <version>1.13.2-SNAPSHOT</version>
+                <version>2.0.0-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: 1.13.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - xieenlong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-06 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: 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
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
-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,7 +87,6 @@ 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
@@ -105,17 +104,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

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

@@ -1,92 +0,0 @@
-spring:
-  profiles: development
-  application:
-    name: {{ name }}
-  cloud:
-    config:
-      uri: http://config-centre.test.ricebook.net/
-      password: J2f(8J!onz
-      label: master
-{%- if jersey %}
-  jersey:
-    application-path: {{ jersey.application_path }}
-
-server:
-  port: {{ jersey.port }}
-
-{% else %}
-
-{{ '' }}
-{%- 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 %}