rhllor 1.13.2.1 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/rhllor +0 -2
- data/lib/rhllor.rb +2 -0
- data/lib/rhllor/version.rb +1 -1
- data/project/__artifactId__/__artifactId__-core/pom.xml +5 -0
- data/project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java +0 -4
- data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml +13 -1
- data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml +3 -11
- data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml +1 -1
- data/project/__artifactId__/app.yaml +13 -3
- data/project/__artifactId__/pom.xml +1 -1
- metadata +15 -16
- data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml +0 -92
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 132a0392fb5a7fdbcbf340bca55d3c7ea0bf43d7
|
4
|
+
data.tar.gz: 26555970076f098c3020684ec63da6a55b90e213
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a02ddad089cfd00da3d9515d7940a998ae776ec522ac8ceaaf180dc3198e22f57b11682442ae105c2fde1c9f272a5ce818a490c8308a551dd0b8e97baa46acac
|
7
|
+
data.tar.gz: 4c0ebcb442e3bb315997d441d6963b7e548296ab885b2869e0b0ec8e6da1a4b233ba98c3fa7f5558fd0d995db04ad68d54300fda5ab0ededbc8f0c39b9dc1696
|
data/bin/rhllor
CHANGED
@@ -22,7 +22,6 @@ config = prompt.collect do
|
|
22
22
|
if selected_components.include?('jdbc')
|
23
23
|
key(:jdbc) do
|
24
24
|
puts '开始配置MySQL'
|
25
|
-
key(:name).ask('输入数据源名称', default: 'base')
|
26
25
|
key(:url).ask('输入URL', default: '127.0.0.1:3306')
|
27
26
|
key(:username).ask('输入用户名', required: true)
|
28
27
|
key(:password).ask('输入密码', required: true)
|
@@ -32,7 +31,6 @@ config = prompt.collect do
|
|
32
31
|
if selected_components.include?('redis')
|
33
32
|
key(:redis) do
|
34
33
|
puts '开始配置Redis'
|
35
|
-
key(:name).ask('输入数据源名称', default: 'base')
|
36
34
|
key(:url).ask('输入URL', default: 'test.redis.ricebook.net:8881')
|
37
35
|
end
|
38
36
|
end
|
data/lib/rhllor.rb
CHANGED
data/lib/rhllor/version.rb
CHANGED
@@ -22,10 +22,6 @@ import org.springframework.kafka.annotation.EnableKafka;
|
|
22
22
|
|
23
23
|
import org.springframework.boot.SpringApplication;
|
24
24
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
25
|
-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
26
|
-
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
|
27
|
-
import org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration;
|
28
|
-
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
|
29
25
|
|
30
26
|
|
31
27
|
/**
|
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml
CHANGED
@@ -7,4 +7,16 @@ spring:
|
|
7
7
|
uri: http://config-centre.intra.ricebook.net/
|
8
8
|
username: admin
|
9
9
|
password: $fu&Yfs5]2
|
10
|
-
label: master
|
10
|
+
label: master
|
11
|
+
{%- if jersey %}
|
12
|
+
hostname: {{ name }}.rhllor.net,apollo.rhllor.net/{{ name }},open.seriousapps.cn/{{ name }}
|
13
|
+
jersey:
|
14
|
+
application-path: {{ jersey.application_path }}
|
15
|
+
|
16
|
+
server:
|
17
|
+
port: {{ jersey.port }}
|
18
|
+
|
19
|
+
{% else %}
|
20
|
+
|
21
|
+
{{ '' }}
|
22
|
+
{%- endif %}
|
@@ -8,6 +8,7 @@ spring:
|
|
8
8
|
password: J2f(8J!onz
|
9
9
|
label: master
|
10
10
|
{%- if jersey %}
|
11
|
+
hostname: {{ name }}.test.rhllor.net,apollo.test.rhllor.net/{{ name }},opentest.seriousapps.cn/{{ name }}
|
11
12
|
jersey:
|
12
13
|
application-path: {{ jersey.application_path }}
|
13
14
|
|
@@ -21,28 +22,19 @@ server:
|
|
21
22
|
|
22
23
|
{%- if jdbc -%}
|
23
24
|
mysql:
|
24
|
-
{{
|
25
|
+
{{ name }}:
|
25
26
|
userName: {{ jdbc.username }}
|
26
27
|
passWord: {{ jdbc.password }}
|
27
28
|
decrypt: false
|
28
29
|
masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
29
|
-
slaveUrl:
|
30
|
-
- jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
31
|
-
- jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
32
30
|
|
33
31
|
{% endif -%}
|
34
32
|
|
35
33
|
{%- if redis -%}
|
36
34
|
redis:
|
37
|
-
{{
|
35
|
+
{{ name }}:
|
38
36
|
timeout: 5000
|
39
37
|
connection: {{ redis.url }}
|
40
|
-
pool:
|
41
|
-
maxTotal: 1024
|
42
|
-
maxIdle: 200
|
43
|
-
minIdle: 20
|
44
|
-
maxWaitMillis: 1000
|
45
|
-
testOnBorrow: true
|
46
38
|
|
47
39
|
{% endif -%}
|
48
40
|
|
@@ -2,7 +2,7 @@ appname: "{{ name }}"
|
|
2
2
|
subscribers: "#deploy"
|
3
3
|
entrypoints:
|
4
4
|
prod:
|
5
|
-
cmd: "/opt/jdk/bin/java -
|
5
|
+
cmd: "/opt/jdk/bin/java -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -Xms1000m -Xmx2000m -Xmn1000m -jar {{ name }}.jar --spring.profiles.active=production"
|
6
6
|
{%- if jersey -%}
|
7
7
|
{{ '' }}
|
8
8
|
ports:
|
@@ -10,13 +10,13 @@ entrypoints:
|
|
10
10
|
healthcheck_url: "{{ jersey.application_path }}/health_check"
|
11
11
|
{%- endif %}
|
12
12
|
network_mode: "bridge"
|
13
|
+
restart: "always"
|
13
14
|
test:
|
14
15
|
cmd: "/opt/jdk/bin/java -Xms400m -Xmx800m -Xmn400m -jar {{ name }}.jar --spring.profiles.active=test"
|
15
16
|
{%- if jersey -%}
|
16
17
|
{{ '' }}
|
17
18
|
ports:
|
18
19
|
- "{{ jersey.port }}/tcp"
|
19
|
-
healthcheck_url: "{{ jersey.application_path }}/health_check"
|
20
20
|
{%- endif %}
|
21
21
|
network_mode: "bridge"
|
22
22
|
build:
|
@@ -28,7 +28,7 @@ permitted_users:
|
|
28
28
|
combos:
|
29
29
|
prod:
|
30
30
|
cpu: 3
|
31
|
-
memory: "
|
31
|
+
memory: "4GB"
|
32
32
|
podname: "release"
|
33
33
|
entrypoint: "prod"
|
34
34
|
networks:
|
@@ -36,8 +36,13 @@ combos:
|
|
36
36
|
permitted_users:
|
37
37
|
- "zhuxuehan"
|
38
38
|
- "{{ author }}"
|
39
|
+
{%- if jersey -%}
|
40
|
+
{{ '' }}
|
39
41
|
elb:
|
40
42
|
- "internal {{ name }}.rhllor.net"
|
43
|
+
- "internal apollo.rhllor.net/{{ name }}"
|
44
|
+
- "internal open.seriousapps.cn/{{ name }}"
|
45
|
+
{%- endif %}
|
41
46
|
test:
|
42
47
|
cpu: 1
|
43
48
|
memory: "1GB"
|
@@ -49,5 +54,10 @@ combos:
|
|
49
54
|
permitted_users:
|
50
55
|
- "zhuxuehan"
|
51
56
|
- "{{ author }}"
|
57
|
+
{%- if jersey -%}
|
58
|
+
{{ '' }}
|
52
59
|
elb:
|
53
60
|
- "develop {{ name }}.test.rhllor.net"
|
61
|
+
- "develop apollo.test.rhllor.net/{{ name }}"
|
62
|
+
- "develop opentest.seriousapps.cn/{{ name }}"
|
63
|
+
{%- endif %}
|
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:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- xieenlong
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-03-06 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: liquid
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - ~>
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: 4.0.0.rc3
|
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: 4.0.0.rc3
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: tty-prompt
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - ~>
|
59
|
+
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: 0.10.1
|
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: 0.10.1
|
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,7 +87,6 @@ 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
|
91
90
|
- project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml
|
92
91
|
- project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml
|
93
92
|
- project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap.yaml
|
@@ -105,17 +104,17 @@ require_paths:
|
|
105
104
|
- lib
|
106
105
|
required_ruby_version: !ruby/object:Gem::Requirement
|
107
106
|
requirements:
|
108
|
-
- -
|
107
|
+
- - ">="
|
109
108
|
- !ruby/object:Gem::Version
|
110
109
|
version: '0'
|
111
110
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
112
111
|
requirements:
|
113
|
-
- -
|
112
|
+
- - ">="
|
114
113
|
- !ruby/object:Gem::Version
|
115
114
|
version: '0'
|
116
115
|
requirements: []
|
117
116
|
rubyforge_project:
|
118
|
-
rubygems_version: 2.4.
|
117
|
+
rubygems_version: 2.4.8
|
119
118
|
signing_key:
|
120
119
|
specification_version: 4
|
121
120
|
summary: Rhllor Cli
|
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml
DELETED
@@ -1,92 +0,0 @@
|
|
1
|
-
spring:
|
2
|
-
profiles: development
|
3
|
-
application:
|
4
|
-
name: {{ name }}
|
5
|
-
cloud:
|
6
|
-
config:
|
7
|
-
uri: http://config-centre.test.ricebook.net/
|
8
|
-
password: J2f(8J!onz
|
9
|
-
label: master
|
10
|
-
{%- if jersey %}
|
11
|
-
jersey:
|
12
|
-
application-path: {{ jersey.application_path }}
|
13
|
-
|
14
|
-
server:
|
15
|
-
port: {{ jersey.port }}
|
16
|
-
|
17
|
-
{% else %}
|
18
|
-
|
19
|
-
{{ '' }}
|
20
|
-
{%- endif %}
|
21
|
-
|
22
|
-
{%- if jdbc -%}
|
23
|
-
mysql:
|
24
|
-
{{ jdbc.name }}:
|
25
|
-
userName: {{ jdbc.username }}
|
26
|
-
passWord: {{ jdbc.password }}
|
27
|
-
decrypt: false
|
28
|
-
masterUrl: jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
29
|
-
slaveUrl:
|
30
|
-
- jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
31
|
-
- jdbc:mysql://{{ jdbc.url }}/matrix?useUnicode=true&characterEncoding=utf8
|
32
|
-
|
33
|
-
{% endif -%}
|
34
|
-
|
35
|
-
{%- if redis -%}
|
36
|
-
redis:
|
37
|
-
{{ redis.name }}:
|
38
|
-
timeout: 5000
|
39
|
-
connection: {{ redis.url }}
|
40
|
-
pool:
|
41
|
-
maxTotal: 1024
|
42
|
-
maxIdle: 200
|
43
|
-
minIdle: 20
|
44
|
-
maxWaitMillis: 1000
|
45
|
-
testOnBorrow: true
|
46
|
-
|
47
|
-
{% endif -%}
|
48
|
-
|
49
|
-
{%- if hbase -%}
|
50
|
-
hbase:
|
51
|
-
quorum: {{ hbase.quorum }}
|
52
|
-
port: {{ hbase.port }}
|
53
|
-
|
54
|
-
{% endif -%}
|
55
|
-
|
56
|
-
{%- if thrift_server -%}
|
57
|
-
thrift:
|
58
|
-
server:
|
59
|
-
{{ thrift_server.name }}:
|
60
|
-
port: {{ thrift_server.port }}
|
61
|
-
skip: true
|
62
|
-
|
63
|
-
{% endif -%}
|
64
|
-
|
65
|
-
{%- if kafka_consumer or kafka_producer -%}
|
66
|
-
kafka:
|
67
|
-
{% if kafka_consumer -%}
|
68
|
-
consumer:
|
69
|
-
bootstrap-servers: {{ kafka_consumer.url }}
|
70
|
-
groupId: {{ name }}-test
|
71
|
-
concurrency: 1
|
72
|
-
offset: latest
|
73
|
-
poll-time: 10
|
74
|
-
{% endif -%}
|
75
|
-
{% if kafka_producer -%}
|
76
|
-
producer:
|
77
|
-
bootstrapServers: {{ kafka_producer.url }}
|
78
|
-
{% endif -%}
|
79
|
-
{{ '' }}
|
80
|
-
{% endif -%}
|
81
|
-
|
82
|
-
rhllor:
|
83
|
-
{%- if elastic_job %}
|
84
|
-
elasticjob:
|
85
|
-
zookeeper_server_list: {{ elastic_job.url }}
|
86
|
-
namespace: {{ name }}
|
87
|
-
max_retries: 1
|
88
|
-
session_timeout_ms: 60000
|
89
|
-
connection_timeout_ms: 15000
|
90
|
-
base_sleep_time_ms: 1000
|
91
|
-
max_sleep_time_ms: 3000
|
92
|
-
{%- endif %}
|