some service and encryption

master
dizda13 2017-04-01 14:00:40 +02:00
parent 6bcdddab6b
commit be0e2347e5
14 changed files with 54 additions and 9 deletions

2
config

@ -1 +1 @@
Subproject commit 6a4ab461b1a268817b4ba0683707e22e5c941ac8 Subproject commit cd84d77e5aa3d21c7bb360a35d3de960faffc537

View File

@ -29,6 +29,8 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter') compile('org.springframework.boot:spring-boot-starter')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
compile('org.springframework.cloud:spring-cloud-config-server') compile('org.springframework.cloud:spring-cloud-config-server')
compile('org.springframework.boot:spring-boot-starter-security')
compile('org.springframework.boot:spring-boot-starter-web')
} }

View File

@ -1,5 +1,6 @@
#Tue Mar 28 22:05:15 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

View File

@ -1,3 +1,9 @@
server.port=8888 server.port=8888
spring.cloud.config.server.git.uri=https://github.com/esensar/steleks_config
spring.cloud.config.server.git.uri=${HOME}/NWT/steleks_web_app/config spring.cloud.config.server.git.clone-on-start=true
security.user.name=root
security.user.password=skorpion
encrypt.key-store.location=classpath:config-server.jks
encrypt.key-store.password=my-s70r3-s3cr3t
encrypt.key-store.alias=config-server-key
encrypt.key-store.secret=my-k34-s3cr3t

View File

@ -31,6 +31,7 @@ dependencies {
compile('org.springframework.cloud:spring-cloud-starter-config') compile('org.springframework.cloud:spring-cloud-starter-config')
compile('org.springframework.boot:spring-boot-starter-actuator') compile('org.springframework.boot:spring-boot-starter-actuator')
compile('org.springframework.boot:spring-boot-starter-web') compile('org.springframework.boot:spring-boot-starter-web')
compile('mysql:mysql-connector-java')
} }
dependencyManagement { dependencyManagement {

View File

@ -4,7 +4,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@SpringBootApplication @SpringBootApplication
@ -22,8 +24,24 @@ class MessageRestController {
@Value("${message:Hello default}") @Value("${message:Hello default}")
private String message; private String message;
@Value("${user.password}")
private String password;
@RequestMapping("/message") @RequestMapping("/message")
String getMessage() { String getMessage() {
return this.message; return this.message;
} }
}
//@RequestMapping(path ="/temp", value = "/{id}", method = RequestMethod.GET)
//String getTemp(@PathVariable("id") Long id){
// return "temp " + Long.toString(id);
//}
@RequestMapping(value = "/whoami/{user}", method = RequestMethod.GET)
public String whoami(@PathVariable("username") String username) {
return String.format("Hello! You're %s and you'll become a(n) root, " +
"but only if your password is '%s'!\n",
username, password);
}
}

View File

@ -0,0 +1 @@
user.password={"description":"No key was installed for encryption service","status":"NO_KEY"}

View File

@ -1,4 +1,9 @@
server.port = 9020 server.port = 9020
spring.datasource.url = jdbc:mysql://localhost:3306/events
spring.datasource.username = root
spring.datasource.password = skorpion
spring.jpa.generate-ddl=true
# #
#spring.datasource.url = jdbc:mysql://localhost:3306/events #spring.datasource.url = jdbc:mysql://localhost:3306/events
#spring.datasource.username = root #spring.datasource.username = root

View File

@ -1,4 +1,5 @@
spring.application.name=a-bootiful-client spring.application.name=steleks
# N.B. this is the default: # N.B. this is the default:
spring.cloud.config.uri=http://localhost:8888 spring.cloud.config.uri=http://localhost:8888
management.security.enabled=false spring.cloud.config.username=root
spring.cloud.config.password=skorpion

View File

@ -27,4 +27,5 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter-data-rest') compile('org.springframework.boot:spring-boot-starter-data-rest')
runtime('com.h2database:h2') runtime('com.h2database:h2')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
compile('mysql:mysql-connector-java')
} }

View File

@ -1 +1,5 @@
server.port=9010 server.port=9010
spring.datasource.url = jdbc:mysql://localhost:3306/teams
spring.datasource.username = root
spring.datasource.password = skorpion
spring.jpa.generate-ddl=true

View File

@ -27,4 +27,5 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter-data-rest') compile('org.springframework.boot:spring-boot-starter-data-rest')
runtime('com.h2database:h2') runtime('com.h2database:h2')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
compile('mysql:mysql-connector-java')
} }

View File

@ -1 +1,5 @@
server.port = 8090 server.port = 8090
spring.datasource.url = jdbc:mysql://localhost:3306/users
spring.datasource.username = root
spring.datasource.password = skorpion
spring.jpa.generate-ddl=true