File tree Expand file tree Collapse file tree 7 files changed +82
-3
lines changed
java/lol/maki/dev/account Expand file tree Collapse file tree 7 files changed +82
-3
lines changed Original file line number Diff line number Diff line change @@ -23,4 +23,29 @@ curl -s localhost:8082/todos/${TODO_ID} -H "Authorization: Bearer ${ACCESS_TOKEN
23
23
curl -s -X PUT localhost:8082/todos/${TODO_ID} -H "Authorization: Bearer ${ACCESS_TOKEN}" -H "Content-Type: application/json" -d '{"finished": "true"}'
24
24
curl -s -X DELETE localhost:8082/todos/${TODO_ID} -H "Authorization: Bearer ${ACCESS_TOKEN}"
25
25
curl -s localhost:8082/todos -H "Authorization: Bearer ${ACCESS_TOKEN}"
26
+ ```
27
+
28
+ ## Build
29
+
30
+ ```
31
+ ./mvnw clean package -f authorization/pom.xml -DskipTests
32
+ ./mvnw clean package -f todo-api/pom.xml -DskipTests
33
+ ./mvnw clean package -f todo-frontend/pom.xml -DskipTests
34
+ ```
35
+
36
+ ## Deploy to Cloud Foundry
37
+
38
+ ```
39
+ ## Fix name and OAUTH_CLIENTS_0_ADDITIONALINFORMATION_url for your env
40
+ cf push -f authorization/manifest.yml
41
+ ```
42
+
43
+ ```
44
+ ## Fix name and SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI for your env
45
+ cf push -f todo-api/manifest.yml
46
+ ```
47
+
48
+ ```
49
+ ## Fix name, SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_DEMO_ISSUER_URI and SPRING_CLOUD_GATEWAY_ROUTES_0_URI for your env
50
+ cf push -f todo-frontend/manifest.yml
26
51
```
Original file line number Diff line number Diff line change
1
+ applications :
2
+ - name : authorization
3
+ instances : 1
4
+ memory : 256M
5
+ path : target/authorization-0.0.1-SNAPSHOT.jar
6
+ env :
7
+ OAUTH_CLIENTS_0_CLIENTID : todo
8
+ OAUTH_CLIENTS_0_CLIENTSECRET : ' {noop}todo'
9
+ OAUTH_CLIENTS_0_AUTHORIZEDGRANTTYPES : authorization_code,password,refresh_token
10
+ OAUTH_CLIENTS_0_SCOPE : openid,todo:read,todo:write
11
+ OAUTH_CLIENTS_0_REGISTEREDREDIRECTURI : ${OAUTH_CLIENTS_0_ADDITIONALINFORMATION_url}/login/oauth2/code/demo
12
+ OAUTH_CLIENTS_0_AUTOAPPROVESCOPES : ${OAUTH_CLIENTS_0_SCOPE}
13
+ OAUTH_CLIENTS_0_ACCESSTOKENVALIDITYSECONDS : 86400
14
+ OAUTH_CLIENTS_0_REFRESHTOKENVALIDITYSECONDS : 604800
15
+ OAUTH_CLIENTS_0_ADDITIONALINFORMATION_NAME : Todo List
16
+ OAUTH_CLIENTS_0_ADDITIONALINFORMATION_URL : https://todo.apps.pcfone.io
17
+ SERVER_TOMCAT_MAX_THREADS : 4
18
+ JAVA_OPTS : -XX:ReservedCodeCacheSize=32M -Xss512k -Duser.timezone=Asia/Tokyo
19
+ JBP_CONFIG_OPEN_JDK_JRE : ' {memory_calculator: {stack_threads: 20}, jre: {version: 11.+}}'
20
+ MANAGEMENT_METRICS_TAGS_ORGANIZATION : ${vcap.application.organization_name}
21
+ MANAGEMENT_METRICS_TAGS_SPACE : ${vcap.application.space_name}
22
+ MANAGEMENT_METRICS_TAGS_APPLICATION : ${vcap.application.application_name}
23
+ MANAGEMENT_METRICS_TAGS_INSTANCE_ID : ${management.metrics.tags.application}:${vcap.application.instance_index}
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ public class AccountController {
17
17
public AccountController (OauthProperties oauthProperties ) {
18
18
this .clientDetails = oauthProperties .getClients ().values ()
19
19
.stream ()
20
- .filter (c -> c .getAdditionalInformation ().containsKey ("displayName " ))
20
+ .filter (c -> c .getAdditionalInformation ().containsKey ("name " ))
21
21
.collect (Collectors .toList ());
22
22
}
23
23
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ jwt.public-key=classpath:public_key.pem
10
10
11
11
oauth.clients[0].client-id =todo
12
12
oauth.clients[0].client-secret ={noop}todo
13
- oauth.clients[0].additional-information.displayName =Todo List
13
+ oauth.clients[0].additional-information.name =Todo List
14
14
oauth.clients[0].additional-information.url =http://localhost:8080
15
15
oauth.clients[0].authorized-grant-types =authorization_code,password,refresh_token
16
16
oauth.clients[0].scope =openid,todo:read,todo:write
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ <h1>Welcome, [[${account.fullName}]]!</h1>
41
41
< h2 > Apps</ h2 >
42
42
< ul >
43
43
< li data-th-each ="clientDetail : ${clientDetails} ">
44
- < a data-th-href ="${clientDetail.additionalInformation.url} "> [[${clientDetail.additionalInformation.displayName }]]</ a >
44
+ < a data-th-href ="${clientDetail.additionalInformation.url} "> [[${clientDetail.additionalInformation.name }]]</ a >
45
45
</ li >
46
46
</ ul >
47
47
</ body >
Original file line number Diff line number Diff line change
1
+ applications :
2
+ - name : todo-api
3
+ instances : 1
4
+ memory : 256M
5
+ path : target/todo-api-0.0.1-SNAPSHOT.jar
6
+ env :
7
+ SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI : https://authorization.apps.pcfone.io/oauth/token
8
+ SERVER_TOMCAT_MAX_THREADS : 4
9
+ JAVA_OPTS : -XX:ReservedCodeCacheSize=32M -Xss512k -Duser.timezone=Asia/Tokyo
10
+ JBP_CONFIG_OPEN_JDK_JRE : ' {memory_calculator: {stack_threads: 20}, jre: {version: 11.+}}'
11
+ MANAGEMENT_METRICS_TAGS_ORGANIZATION : ${vcap.application.organization_name}
12
+ MANAGEMENT_METRICS_TAGS_SPACE : ${vcap.application.space_name}
13
+ MANAGEMENT_METRICS_TAGS_APPLICATION : ${vcap.application.application_name}
14
+ MANAGEMENT_METRICS_TAGS_INSTANCE_ID : ${management.metrics.tags.application}:${vcap.application.instance_index}
Original file line number Diff line number Diff line change
1
+ applications :
2
+ - name : todo
3
+ instances : 1
4
+ memory : 256M
5
+ path : todo-frontend-server/target/todo-frontend-server-0.0.1-SNAPSHOT.jar
6
+ env :
7
+ SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_DEMO_ISSUER_URI : https://authorization.apps.pcfone.io/oauth/token
8
+ SPRING_CLOUD_GATEWAY_ROUTES_0_ID : todo-api
9
+ SPRING_CLOUD_GATEWAY_ROUTES_0_URI : https://todo-api.apps.pcfone.io
10
+ SPRING_CLOUD_GATEWAY_ROUTES_0_PREDICATES_0 : Path=/todos/**
11
+ SPRING_CLOUD_GATEWAY_ROUTES_0_FILTERS_0 : TokenRelay=
12
+ JAVA_OPTS : -XX:ReservedCodeCacheSize=32M -Xss512k -Duser.timezone=Asia/Tokyo
13
+ JBP_CONFIG_OPEN_JDK_JRE : ' {memory_calculator: {stack_threads: 20}, jre: {version: 11.+}}'
14
+ MANAGEMENT_METRICS_TAGS_ORGANIZATION : ${vcap.application.organization_name}
15
+ MANAGEMENT_METRICS_TAGS_SPACE : ${vcap.application.space_name}
16
+ MANAGEMENT_METRICS_TAGS_APPLICATION : ${vcap.application.application_name}
17
+ MANAGEMENT_METRICS_TAGS_INSTANCE_ID : ${management.metrics.tags.application}:${vcap.application.instance_index}
You can’t perform that action at this time.
0 commit comments