rhllor 1.13.1.0 → 1.13.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/bin/rhllor +1 -0
  4. data/lib/rhllor/version.rb +1 -1
  5. data/project/__artifactId__/.gitlab-ci.yml +22 -10
  6. data/project/__artifactId__/__artifactId__-api/pom.xml +4 -4
  7. data/project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java +3 -7
  8. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml +9 -9
  9. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml +2 -2
  10. data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml +8 -4
  11. data/project/__artifactId__/app.yaml +37 -4
  12. data/project/__artifactId__/pom.xml +1 -1
  13. data/rhllor.gemspec +2 -2
  14. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5aaee94cbd799b26593b9dc537b59af5394dc6b5
4
- data.tar.gz: 2bb9f3946e1c40df65095883b800938353d28129
3
+ metadata.gz: 6d667a74b635c67128f1351fe66302be192ad7c1
4
+ data.tar.gz: 912ba95b632a8b8c1017111ecd690258c7570a48
5
5
  SHA512:
6
- metadata.gz: 86a15123f717a93fd2463bc0a2b7fea1b20a4bfe9c013a13bf8098c6f51d566f7a5509bf7095ffe270518b7f1ba9236e46b1686793d866c651414c3c2cc88ddb
7
- data.tar.gz: 27fcf38dfb3fd391d91620a4eeadc346f54851c329bc81288223a50227e30c273086118846d205b490c09db9917982ca2581f1955077019a00cd1b640a9c321a
6
+ metadata.gz: de9f22323206866eabeb6c203555143d71cf8f12b1abdc73cf5e03fc767668718abbe889cb8e9cd1df56c24fe3790830510bf2c03798510e2b7758e45b9b4cb4
7
+ data.tar.gz: a12c418d9088f44f0d6949eb5c3ba57efac2c1ec4091483d9e80614959cfd72f112f2367f8a86aa5261279caccc5c01149074480fb6d0ca01d1837ccec2dc194
data/Gemfile CHANGED
@@ -4,4 +4,4 @@ source 'https://rubygems.org'
4
4
  gemspec
5
5
 
6
6
  gem 'tty-prompt'
7
- gem 'liquid', '~> 4.0.0.rc3'
7
+ gem 'liquid', '4.0.0'
data/bin/rhllor CHANGED
@@ -9,6 +9,7 @@ selected_components = prompt.multi_select("请选择需要的组件", components
9
9
 
10
10
  config = prompt.collect do
11
11
  key(:name).ask('给你的项目起个名字', required: true)
12
+ key(:author).ask('输入你的SSO名称，用于开放项目权限', required: true)
12
13
 
13
14
  if selected_components.include?('jersey')
14
15
  key(:jersey) do
data/lib/rhllor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rhllor
2
- VERSION = '1.13.1.0'
2
+ VERSION = '1.13.2.0'
3
3
  end
data/project/__artifactId__/.gitlab-ci.yml CHANGED
@@ -1,11 +1,23 @@
1
1
  image: "hub.ricebook.net/base/alpine:java-2016.11.10"
2
- test_job:
3
- stage: "test"
4
- script:
5
- - "echo 'start building'"
6
- - "mvn --quiet clean package -Dmaven.test.skip=true"
7
- - "cp {{ name }}-core/target/{{ name }}-core-1.0-SNAPSHOT.jar {{ name }}.jar"
8
- - "echo 'build done'"
9
- artifacts:
10
- paths:
11
- - "{{ name }}.jar"
2
+ variables:
3
+ CITADEL_AUTH_TOKEN: "D73YeuAMzZSkoDY4FAEGRAmMKMY0Rpfv06FQEbygtEkB6TrXceeWrWcqKWAMNekL"
4
+ CITADEL_URL: "http://citadel.ricebook.net"
5
+ MIMIRON_URL: "http://mimiron.ricebook.net"
6
+ SSO_URL: "http://sso.ricebook.net"
7
+ stages:
8
+ - "build"
9
+ - "core_build"
10
+ build_job:
11
+ stage: "build"
12
+ script:
13
+ - "mvn --quiet clean package -Dmaven.test.skip=true -U"
14
+ - "cp {{ name }}-core/target/{{ name }}-core-1.0-SNAPSHOT.jar {{ name }}.jar"
15
+ artifacts:
16
+ paths:
17
+ - "{{ name }}.jar"
18
+ expire_in: "1 week"
19
+ core_build_job:
20
+ stage: "core_build"
21
+ script:
22
+ - "corecli register"
23
+ - "corecli --debug build --with-artifacts"
data/project/__artifactId__/__artifactId__-api/pom.xml CHANGED
@@ -21,10 +21,10 @@
21
21
  {%- if thrift_server %}
22
22
 
23
23
  <dependencies>
24
- <dependency>
25
- <groupId>org.apache.thrift</groupId>
26
- <artifactId>libthrift</artifactId>
27
- </dependency>
24
+ <dependency>
25
+ <groupId>org.apache.thrift</groupId>
26
+ <artifactId>libthrift</artifactId>
27
+ </dependency>
28
28
  </dependencies>
29
29
  {%- endif %}
30
30
 
data/project/__artifactId__/__artifactId__-core/src/main/java/com/ricebook/rhllor/__artifactId__/Application.java CHANGED
@@ -9,6 +9,7 @@ import com.ricebook.rhllor.spring.boot.jersey.filter.DynamicFilterFactory;
9
9
  import com.ricebook.rhllor.spring.boot.jersey.provider.EnumParamConverterProvider;
10
10
  import org.glassfish.jersey.media.multipart.MultiPartFeature;
11
11
  import org.glassfish.jersey.server.spring.scope.RequestContextFilter;
12
+ import org.glassfish.jersey.fastjson.FastJsonFeature;
12
13
  {%- endif %}
13
14
 
14
15
  {%- if elastic_job %}
@@ -34,7 +35,6 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat
34
35
  {%- if jersey %}
35
36
  @EnableJerseyConfiguration(
36
37
  scanPackage = "com.ricebook.rhllor.{{ name }}.resource",
37
- applicationPath = "{{ jersey.application_path }}",
38
38
  componentClasses = {
39
39
  MultiPartFeature.class,
40
40
  RequestContextFilter.class,
@@ -42,6 +42,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat
42
42
  EnumParamConverterProvider.class,
43
43
  RhllorExceptionMapper.class,
44
44
  RhllorValidationExceptionMapper.class,
45
+ FastJsonFeature.class,
45
46
  RhllorValidationConfigurationContextResolver.class,
46
47
  })
47
48
  {%- endif %}
@@ -51,12 +52,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat
51
52
  {%- if kafka_consumer %}
52
53
  @EnableKafka
53
54
  {%- endif %}
54
- @SpringBootApplication(exclude = {
55
- DataSourceAutoConfiguration.class,
56
- DataSourceTransactionManagerAutoConfiguration.class,
57
- HibernateJpaAutoConfiguration.class,
58
- JooqAutoConfiguration.class,
59
- })
55
+ @SpringBootApplication
60
56
  public class Application {
61
57
 
62
58
  public static void main(String[] args) throws Exception {
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-development.yaml CHANGED
@@ -4,16 +4,20 @@ spring:
4
4
  name: {{ name }}
5
5
  cloud:
6
6
  config:
7
- uri: http://config-centre.test.rhllor.cn/
7
+ uri: http://config-centre.test.ricebook.net/
8
8
  password: J2f(8J!onz
9
9
  label: master
10
+ {%- if jersey %}
11
+ jersey:
12
+ application-path: {{ jersey.application_path }}
10
13
 
11
- {{ '' }}
12
- {%- if jersey -%}
13
14
  server:
14
15
  port: {{ jersey.port }}
15
16
 
16
- {% endif -%}
17
+ {% else %}
18
+
19
+ {{ '' }}
20
+ {%- endif %}
17
21
 
18
22
  {%- if jdbc -%}
19
23
  mysql:
@@ -85,8 +89,4 @@ rhllor:
85
89
  connection_timeout_ms: 15000
86
90
  base_sleep_time_ms: 1000
87
91
  max_sleep_time_ms: 3000
88
- {%- endif %}
89
- agent:
90
- enable: true
91
- metrics:
92
- enable: true
92
+ {%- endif %}
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-production.yaml CHANGED
@@ -4,7 +4,7 @@ spring:
4
4
  name: {{ name }}
5
5
  cloud:
6
6
  config:
7
- uri: http://config-centre.rhllor.cn/
7
+ uri: http://config-centre.intra.ricebook.net/
8
8
  username: admin
9
9
  password: $fu&Yfs5]2
10
- label: master
10
+ label: master
data/project/__artifactId__/__artifactId__-core/src/main/resources/bootstrap-test.yaml CHANGED
@@ -4,16 +4,20 @@ spring:
4
4
  name: {{ name }}
5
5
  cloud:
6
6
  config:
7
- uri: http://config-centre.test.rhllor.cn/
7
+ uri: http://config-centre.test.ricebook.net/
8
8
  password: J2f(8J!onz
9
9
  label: master
10
+ {%- if jersey %}
11
+ jersey:
12
+ application-path: {{ jersey.application_path }}
10
13
 
11
- {{ '' }}
12
- {%- if jersey -%}
13
14
  server:
14
15
  port: {{ jersey.port }}
15
16
 
16
- {% endif -%}
17
+ {% else %}
18
+
19
+ {{ '' }}
20
+ {%- endif %}
17
21
 
18
22
  {%- if jdbc -%}
19
23
  mysql:
data/project/__artifactId__/app.yaml CHANGED
@@ -1,4 +1,5 @@
1
1
  appname: "{{ name }}"
2
+ subscribers: "#deploy"
2
3
  entrypoints:
3
4
  prod:
4
5
  cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=production"
@@ -6,15 +7,47 @@ entrypoints:
6
7
  {{ '' }}
7
8
  ports:
8
9
  - "{{ jersey.port }}/tcp"
10
+ healthcheck_url: "{{ jersey.application_path }}/health_check"
9
11
  {%- endif %}
10
- network_mode: bridge
12
+ network_mode: "bridge"
11
13
  test:
12
- cmd: "/opt/jdk/bin/java -Xms1g -Xmx2g -Xmn1g -jar {{ name }}.jar --spring.profiles.active=test"
14
+ cmd: "/opt/jdk/bin/java -Xms400m -Xmx800m -Xmn400m -jar {{ name }}.jar --spring.profiles.active=test"
13
15
  {%- if jersey -%}
14
16
  {{ '' }}
15
17
  ports:
16
18
  - "{{ jersey.port }}/tcp"
19
+ healthcheck_url: "{{ jersey.application_path }}/health_check"
17
20
  {%- endif %}
18
- network_mode: bridge
19
- build: "echo 'already done in CI'"
21
+ network_mode: "bridge"
22
+ build:
23
+ - "echo 'already done in CI'"
20
24
  base: "hub.ricebook.net/base/alpine:java-2016.11.10"
25
+ permitted_users:
26
+ - "zhuxuehan"
27
+ - "{{ author }}"
28
+ combos:
29
+ prod:
30
+ cpu: 3
31
+ memory: "3GB"
32
+ podname: "release"
33
+ entrypoint: "prod"
34
+ networks:
35
+ - "release"
36
+ permitted_users:
37
+ - "zhuxuehan"
38
+ - "{{ author }}"
39
+ elb:
40
+ - "internal {{ name }}.rhllor.net"
41
+ test:
42
+ cpu: 1
43
+ memory: "1GB"
44
+ zone: "c1"
45
+ podname: "develop"
46
+ entrypoint: "test"
47
+ networks:
48
+ - "c1-test2"
49
+ permitted_users:
50
+ - "zhuxuehan"
51
+ - "{{ author }}"
52
+ elb:
53
+ - "develop {{ name }}.test.rhllor.net"
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.1-SNAPSHOT</version>
43
+ <version>1.13.2-SNAPSHOT</version>
44
44
  <type>pom</type>
45
45
  <scope>import</scope>
46
46
  </dependency>
data/rhllor.gemspec CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
29
29
 
30
30
  spec.add_development_dependency "bundler", "~> 1.10"
31
31
  spec.add_development_dependency "rake", "~> 10.0"
32
- spec.add_dependency "tty-prompt"
33
- spec.add_dependency "liquid", "~> 4.0.0.rc3"
32
+ spec.add_dependency 'liquid', '~> 4.0'
33
+ spec.add_dependency 'tty-prompt', '~> 0.10.0'
34
34
 
35
35
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhllor
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.1.0
4
+ version: 1.13.2.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-11-24 00:00:00.000000000 Z
11
+ date: 2017-01-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -39,33 +39,33 @@ dependencies:
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: tty-prompt
42
+ name: liquid
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '4.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
- version: '0'
54
+ version: '4.0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: liquid
56
+ name: tty-prompt
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 4.0.0.rc3
61
+ version: 0.10.0
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
- version: 4.0.0.rc3
68
+ version: 0.10.0
69
69
  description: "「懒」才是第一生产力！Rhllor项目生成脚手架"
70
70
  email:
71
71
  - xieenlong@ricebok.com