Skip to content
This repository was archived by the owner on Mar 25, 2018. It is now read-only.

DISCIPLES_OF_RNG_SERVICES_HOUR3 #27

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions authorization/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# OpenJDK Java 7 JRE Dockerfile
#
# https://github.com/dockerfile/java
# https://github.com/dockerfile/java/tree/master/openjdk-7-jre
#

# Pull base image.
FROM dockerfile/ubuntu

# Install Java.
RUN \
apt-get update && \
apt-get install -y openjdk-7-jre && \
rm -rf /var/lib/apt/lists/*

# Define working directory.
WORKDIR /data

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64

# Define default command.
CMD ["bash"]
4 changes: 4 additions & 0 deletions authorization/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ dependencies {
testCompile 'org.springframework.boot:spring-boot-starter-test'
compile 'org.springframework.cloud:spring-cloud-starter-config'
}

task buildDocker {

}
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ subprojects {
maven { url 'https://repo.spring.io/libs-snapshot'
}
}
}

task buildDocker {

}
28 changes: 28 additions & 0 deletions communication/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# Oracle Java 8 Dockerfile
#
# https://github.com/dockerfile/java
# https://github.com/dockerfile/java/tree/master/oracle-java8
#

# Pull base image.
FROM dockerfile/ubuntu

# Install Java.
RUN \
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
add-apt-repository -y ppa:webupd8team/java && \
apt-get update && \
apt-get install -y oracle-java8-installer && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/oracle-jdk8-installer


# Define working directory.
WORKDIR /data

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle

# Define default command.
CMD ["bash"]
4 changes: 4 additions & 0 deletions communication/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ dependencies {
testCompile 'org.springframework.boot:spring-boot-starter-test'
compile 'org.springframework.cloud:spring-cloud-starter-config'
}

task buildDocker {

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;

import org.apache.commons.lang3.ArrayUtils;

import javax.servlet.http.HttpSession;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

Expand All @@ -32,10 +35,19 @@ public class MessageController {
@Autowired
private MessageRepository messageRepository;

private Logger logger = Logger.getLogger(MyClass.class.getName());

@RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
public Message sendMessage(@RequestBody Message message, @CookieValue("SESSION") String cookie) {
if (check_rank(message.getSender(), message.getRecipient()) {
logger.info("message " +
messager.getSender() + " -> " + message.getRecipient() + ": " +
message.getTitle() + " - " + message.getContent());

checkAccess(new ActionDto(message.getRecipient()), cookie);
return messageRepository.save(message);
}
return null;
}

@RequestMapping(value = "/messages", method = RequestMethod.GET)
Expand Down Expand Up @@ -63,4 +75,10 @@ private void checkAccess(ActionDto actionDto, String session) {
restTemplate.postForObject(url, entity, String.class);
}

private boolean check_rank(String send_rank, String recipient_rank) {
String[] ranks = {"CREWMAN", "ENSIGN", "LIEUTENANT", "COMMANDER", "CAPTAIN", "VICE_ADMIRAL", "ADMIRAL"};
int rank = ArrayUtils.indexOf(ranks, send_rank.toLowerCase());
return ArrayUtils.indexOf(ranks, send_rank) <= ArrayUtils.indexOf(ranks, recipient_rank.toLowerCase()) + 1;
}

}
24 changes: 24 additions & 0 deletions config-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# OpenJDK Java 7 JRE Dockerfile
#
# https://github.com/dockerfile/java
# https://github.com/dockerfile/java/tree/master/openjdk-7-jre
#

# Pull base image.
FROM dockerfile/ubuntu

# Install Java.
RUN \
apt-get update && \
apt-get install -y openjdk-7-jre && \
rm -rf /var/lib/apt/lists/*

# Define working directory.
WORKDIR /data

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64

# Define default command.
CMD ["bash"]
4 changes: 4 additions & 0 deletions config-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ dependencies {
compile 'org.springframework.boot:spring-boot-starter-security'
testCompile 'org.springframework.boot:spring-boot-starter-test'
}

task buildDocker {

}
2 changes: 1 addition & 1 deletion config-server/config/zuul-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spring:
application.name: zuul-server

server:
port: ${PORT:9090}
port: ${PORT:3000}

eureka.client.region: default
eureka.client.registryFetchIntervalSeconds: 5
Expand Down
2 changes: 1 addition & 1 deletion config-server/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ security.user:
---
spring:
profiles: native
cloud.config.server.native.search-locations: file:///${user.home}/Documents/wilau2/cs-games-2018-relay-cloud/config-server/config
cloud.config.server.native.search-locations: file:///Users/abdulwahaabahmed/dev/csgames/relay/cs-games-2018-relay-cloud/config-server/config

eureka:
client:
Expand Down
24 changes: 24 additions & 0 deletions eureka-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# OpenJDK Java 7 JRE Dockerfile
#
# https://github.com/dockerfile/java
# https://github.com/dockerfile/java/tree/master/openjdk-7-jre
#

# Pull base image.
FROM dockerfile/ubuntu

# Install Java.
RUN \
apt-get update && \
apt-get install -y openjdk-7-jre && \
rm -rf /var/lib/apt/lists/*

# Define working directory.
WORKDIR /data

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64

# Define default command.
CMD ["bash"]
4 changes: 4 additions & 0 deletions eureka-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter-data-redis')
compile('org.springframework.session:spring-session')
testCompile 'org.springframework.boot:spring-boot-starter-test'
}

task buildDocker {

}
24 changes: 24 additions & 0 deletions zuul-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# OpenJDK Java 7 JRE Dockerfile
#
# https://github.com/dockerfile/java
# https://github.com/dockerfile/java/tree/master/openjdk-7-jre
#

# Pull base image.
FROM dockerfile/ubuntu

# Install Java.
RUN \
apt-get update && \
apt-get install -y openjdk-7-jre && \
rm -rf /var/lib/apt/lists/*

# Define working directory.
WORKDIR /data

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64

# Define default command.
CMD ["bash"]
4 changes: 4 additions & 0 deletions zuul-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ dependencies {
compile 'org.springframework.cloud:spring-cloud-starter-eureka'
testCompile 'org.springframework.boot:spring-boot-starter-test'
}

task buildDocker {

}