rhllor 0.0.2 → 1.13.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -0
  3. data/README.md +2 -2
  4. data/bin/rhllor +4 -3
  5. data/lib/rhllor/version.rb +1 -1
  6. data/project/__artifactId__/.gitlab-ci.yml +1 -5
  7. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml +92 -0
  8. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml +17 -21
  9. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml +1 -1
  10. data/project/__artifactId__/app.yaml +3 -3
  11. data/project/__artifactId__/pom.xml +1 -1
  12. metadata +16 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf93f21531391899be204429d3a27aaaa95c8f6c
4
- data.tar.gz: b0e11713343ef67394ca0afedcde8736be8ae139
3
+ metadata.gz: 5aaee94cbd799b26593b9dc537b59af5394dc6b5
4
+ data.tar.gz: 2bb9f3946e1c40df65095883b800938353d28129
5
5
  SHA512:
6
- metadata.gz: ef8526d578a637a1fab37700554b2f942549a6eaa717b80ecff5820e40a78f686fb565ba5d2d46970b89eb16e2e8f5a7cfbe2317df442be2a09cb35fc4641737
7
- data.tar.gz: ac05c19f6a0e7ad81eb82ba0c112b25419b36cb240e1358aafffd13844c41d4a7e7ff3c9670f1b7bea688f9c80bd9ebdfda76b9eb5e78b51267cdcd7b50e9617
6
+ metadata.gz: 86a15123f717a93fd2463bc0a2b7fea1b20a4bfe9c013a13bf8098c6f51d566f7a5509bf7095ffe270518b7f1ba9236e46b1686793d866c651414c3c2cc88ddb
7
+ data.tar.gz: 27fcf38dfb3fd391d91620a4eeadc346f54851c329bc81288223a50227e30c273086118846d205b490c09db9917982ca2581f1955077019a00cd1b640a9c321a
data/.gitignore CHANGED
@@ -7,3 +7,6 @@
7
7
  /pkg/
8
8
  /spec/reports/
9
9
  /tmp/
10
+ *.gem
11
+ bin/console
12
+ bin/setup
data/README.md CHANGED
@@ -10,5 +10,5 @@ gem install rhllor
10
10
 
11
11
  依赖：
12
12
 
13
- `tty-prompt`：超级好用的命令行输入提示库，我要去做GAL Game了！
14
- `liquid`：超难用的模板引擎
13
+ - `tty-prompt`：超级好用的命令行输入提示库，我要去做Gal Game了！
14
+ - `liquid`：超难用的模板引擎
data/bin/rhllor CHANGED
@@ -14,15 +14,15 @@ config = prompt.collect do
14
14
  key(:jersey) do
15
15
  puts '开始配置Jersey'
16
16
  key(:port).ask('输入端口号', default: 8080, convert: :int)
17
- key(:application_path).ask('输入Application Path', default: '')
17
+ key(:application_path).ask('输入Application Path', default: 'v1')
18
18
  end
19
19
  end
20
20
 
21
21
  if selected_components.include?('jdbc')
22
22
  key(:jdbc) do
23
23
  puts '开始配置MySQL'
24
- key(:name).ask('输入数据源名称', required: true)
25
- key(:url).ask('输入URL', required: true)
24
+ key(:name).ask('输入数据源名称', default: 'base')
25
+ key(:url).ask('输入URL', default: '127.0.0.1:3306')
26
26
  key(:username).ask('输入用户名', required: true)
27
27
  key(:password).ask('输入密码', required: true)
28
28
  end
@@ -31,6 +31,7 @@ config = prompt.collect do
31
31
  if selected_components.include?('redis')
32
32
  key(:redis) do
33
33
  puts '开始配置Redis'
34
+ key(:name).ask('输入数据源名称', default: 'base')
34
35
  key(:url).ask('输入URL', default: 'test.redis.ricebook.net:8881')
35
36
  end
36
37
  end
data/lib/rhllor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rhllor
2
- VERSION = '0.0.2'
2
+ VERSION = '1.13.1.0'
3
3
  end
data/project/__artifactId__/.gitlab-ci.yml CHANGED
@@ -1,13 +1,9 @@
1
- image: "hub.ricebook.net/base/ubuntu:Java-2016.04.20"
1
+ image: "hub.ricebook.net/base/alpine:java-2016.11.10"
2
2
  test_job:
3
3
  stage: "test"
4
4
  script:
5
5
  - "echo 'start building'"
6
- {%- if thrift_server %}
7
- - "mvn --quiet clean package -Dmaven.test.skip=true -rf {{ name }}-core"
8
- {%- else %}
9
6
  - "mvn --quiet clean package -Dmaven.test.skip=true"
10
- {%- endif %}
11
7
  - "cp {{ name }}-core/target/{{ name }}-core-1.0-SNAPSHOT.jar {{ name }}.jar"
12
8
  - "echo 'build done'"
13
9
  artifacts:
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml ADDED
@@ -0,0 +1,92 @@
1
+ spring:
2
+ profiles: development
3
+ application:
4
+ name: {{ name }}
5
+ cloud:
6
+ config:
7
+ uri: http://config-centre.test.rhllor.cn/
8
+ password: J2f(8J!onz
9
+ label: master
10
+
11
+ {{ '' }}
12
+ {%- if jersey -%}
13
+ server:
14
+ port: {{ jersey.port }}
15
+
16
+ {% endif -%}
17
+
18
+ {%- if jdbc -%}
19
+ mysql:
20
+ {{ jdbc.name }}:
21
+ userName: {{ jdbc.username }}
22
+ passWord: {{ jdbc.password }}
23
+ decrypt: false
24
+ masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
25
+ slaveUrl:
26
+ - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
27
+ - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
28
+
29
+ {% endif -%}
30
+
31
+ {%- if redis -%}
32
+ redis:
33
+ {{ redis.name }}:
34
+ timeout: 5000
35
+ connection: {{ redis.url }}
36
+ pool:
37
+ maxTotal: 1024
38
+ maxIdle: 200
39
+ minIdle: 20
40
+ maxWaitMillis: 1000
41
+ testOnBorrow: true
42
+
43
+ {% endif -%}
44
+
45
+ {%- if hbase -%}
46
+ hbase:
47
+ quorum: {{ hbase.quorum }}
48
+ port: {{ hbase.port }}
49
+
50
+ {% endif -%}
51
+
52
+ {%- if thrift_server -%}
53
+ thrift:
54
+ server:
55
+ {{ thrift_server.name }}:
56
+ port: {{ thrift_server.port }}
57
+ skip: true
58
+
59
+ {% endif -%}
60
+
61
+ {%- if kafka_consumer or kafka_producer -%}
62
+ kafka:
63
+ {% if kafka_consumer -%}
64
+ consumer:
65
+ bootstrap-servers: {{ kafka_consumer.url }}
66
+ groupId: {{ name }}-test
67
+ concurrency: 1
68
+ offset: latest
69
+ poll-time: 10
70
+ {% endif -%}
71
+ {% if kafka_producer -%}
72
+ producer:
73
+ bootstrapServers: {{ kafka_producer.url }}
74
+ {% endif -%}
75
+ {{ '' }}
76
+ {% endif -%}
77
+
78
+ rhllor:
79
+ {%- if elastic_job %}
80
+ elasticjob:
81
+ zookeeper_server_list: {{ elastic_job.url }}
82
+ namespace: {{ name }}
83
+ max_retries: 1
84
+ session_timeout_ms: 60000
85
+ connection_timeout_ms: 15000
86
+ base_sleep_time_ms: 1000
87
+ max_sleep_time_ms: 3000
88
+ {%- endif %}
89
+ agent:
90
+ enable: true
91
+ metrics:
92
+ enable: true
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml CHANGED
@@ -17,32 +17,28 @@ server:
17
17
 
18
18
  {%- if jdbc -%}
19
19
  mysql:
20
- more:
21
- {{ jdbc.name }}:
22
- userName: {{ jdbc.username }}
23
- passWord: {{ jdbc.password }}
24
- decrypt: false
25
- masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
26
- slaveUrl:
27
- - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
28
- - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
20
+ {{ jdbc.name }}:
21
+ userName: {{ jdbc.username }}
22
+ passWord: {{ jdbc.password }}
23
+ decrypt: false
24
+ masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
25
+ slaveUrl:
26
+ - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
27
+ - jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
29
28
 
30
29
  {% endif -%}
31
30
 
32
31
  {%- if redis -%}
33
32
  redis:
34
- timeout: 5000
35
- connection: {{ redis.url }}
36
- cluster:
37
- soTimeout: 2000
38
- connTimeout: 2000
39
- maxRedirection: 5
40
- pool:
41
- maxTotal: 1024
42
- maxIdle: 200
43
- minIdle: 20
44
- maxWaitMillis: 1000
45
- testOnBorrow: true
33
+ {{ redis.name }}:
34
+ timeout: 5000
35
+ connection: {{ redis.url }}
36
+ pool:
37
+ maxTotal: 1024
38
+ maxIdle: 200
39
+ minIdle: 20
40
+ maxWaitMillis: 1000
41
+ testOnBorrow: true
46
42
 
47
43
  {% endif -%}
48
44
 
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml CHANGED
@@ -1,3 +1,3 @@
1
1
  spring:
2
2
  profiles:
3
- active: test
3
+ active: development
data/project/__artifactId__/app.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  appname: "{{ name }}"
2
2
  entrypoints:
3
3
  prod:
4
- cmd: "/opt/jdk/bin/java -jar {{ name }}.jar --spring.profiles.active=production"
4
+ cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=production"
5
5
  {%- if jersey -%}
6
6
  {{ '' }}
7
7
  ports:
@@ -9,7 +9,7 @@ entrypoints:
9
9
  {%- endif %}
10
10
  network_mode: bridge
11
11
  test:
12
- cmd: "/opt/jdk/bin/java -jar {{ name }}.jar --spring.profiles.active=test"
12
+ cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=test"
13
13
  {%- if jersey -%}
14
14
  {{ '' }}
15
15
  ports:
@@ -17,4 +17,4 @@ entrypoints:
17
17
  {%- endif %}
18
18
  network_mode: bridge
19
19
  build: "echo 'already done in CI'"
20
- base: "hub.ricebook.net/base/alpine:Java-2016.04.20"
20
+ base: "hub.ricebook.net/base/alpine:java-2016.11.10"
data/project/__artifactId__/pom.xml CHANGED
@@ -40,7 +40,7 @@
40
40
  <dependency>
41
41
  <groupId>com.ricebook.rhllor</groupId>
42
42
  <artifactId>spring-boot-starter-dependencies</artifactId>
43
- <version>1.13.0-SNAPSHOT</version>
43
+ <version>1.13.1-SNAPSHOT</version>
44
44
  <type>pom</type>
45
45
  <scope>import</scope>
46
46
  </dependency>
metadata CHANGED
@@ -1,72 +1,72 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhllor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 1.13.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - xieenlong
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-02 00:00:00.000000000 Z
11
+ date: 2016-11-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.10'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.10'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: tty-prompt
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: liquid
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: 4.0.0.rc3
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 4.0.0.rc3
69
- description: 「懒」才是第一生产力！Rhllor项目生成脚手架
69
+ description: "「懒」才是第一生产力！Rhllor项目生成脚手架"
70
70
  email:
71
71
  - xieenlong@ricebok.com
72
72
  executables:
@@ -74,7 +74,7 @@ executables:
74
74
  extensions: []
75
75
  extra_rdoc_files: []
76
76
  files:
77
- - .gitignore
77
+ - ".gitignore"
78
78
  - CODE_OF_CONDUCT.md
79
79
  - Gemfile
80
80
  - LICENSE.txt
@@ -87,6 +87,7 @@ files:
87
87
  - project/__artifactId__/__artifactId__-api/pom.xml
88
88
  - project/__artifactId__/__artifactId__-core/pom.xml
89
89
  - project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java
90
+ - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml
90
91
  - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml
91
92
  - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml
92
93
  - project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml
@@ -104,17 +105,17 @@ require_paths:
104
105
  - lib
105
106
  required_ruby_version: !ruby/object:Gem::Requirement
106
107
  requirements:
107
- - - '>='
108
+ - - ">="
108
109
  - !ruby/object:Gem::Version
109
110
  version: '0'
110
111
  required_rubygems_version: !ruby/object:Gem::Requirement
111
112
  requirements:
112
- - - '>='
113
+ - - ">="
113
114
  - !ruby/object:Gem::Version
114
115
  version: '0'
115
116
  requirements: []
116
117
  rubyforge_project:
117
- rubygems_version: 2.4.6
118
+ rubygems_version: 2.4.8
118
119
  signing_key:
119
120
  specification_version: 4
120
121
  summary: Rhllor Cli