Merge pull request #53 from dayoungMM/main

workflow yml 수정 후 다시 pull request

.gitignore

@@ -0,0 +1,5 @@
+devsta-users/src/main/resources/application-mongodb.properties
+devsta-users/src/main/resources/application-users.properties
+devsta-gateway/src/main/resources/application-gateway.properties
+devsta-meetup/src/main/resources/application-meetup.properties
+devsta-posts/src/main/resources/application-posts.properties

devsta-gateway/Dockerfile

@@ -0,0 +1,7 @@
+FROM adoptopenjdk:11-jre-openj9
+ADD target/devsta-gateway-0.0.1-SNAPSHOT.jar devsta-gateway-0.0.1-SNAPSHOT.jar
+ADD application.yml application.yml
+ENV JAVA_OPTS=""
+#ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","/simple-svc.jar", "--spring.profiles.active=default"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","devsta-gateway-0.0.1-SNAPSHOT.jar"]
+EXPOSE 9999 9090 9091 9092

devsta-gateway/src/main/resources/application.yml

@@ -1,14 +1,11 @@
-uri:
-  user-service: "http://localhost:9090"
-  post-service: "http://localhost:9091"
-  meetup-service: "http://localhost:9092"
 server:
   port: 9999
 spring:
   application:
     name: gatewayservice
   profiles:
     active: default
+    include: gateway
   config:
     import: "optional:configserver:"
     #use-legacy-processing: true #unable to laod config data 오류 발생 시 사용
@@ -53,13 +50,7 @@ spring:
             - RewritePath=/api/meetup/(?<path>.*),/$\{path}
 
 jwt:
-  secret: moondysmellwebapplicationsecret
   expiration-second: 172800  #48시간
 #  expiration-second: 259200  #72시간
 #  expiration-second: 10  #10초
 
-#### cloud 용
-#  user-service: http://198.19.142.213:9090
-#  post-service: http://198.19.239.141:9091
-#  meetup-service: http://198.19.196.12:9092
-

devsta-meetup/Dockerfile

@@ -0,0 +1,8 @@
+FROM adoptopenjdk:11-jre-openj9
+ADD target/devsta-meetup-0.0.1-SNAPSHOT.jar devsta-meetup-0.0.1-SNAPSHOT.jar
+ADD application.yml application.yml
+ADD application-db.properties application-db.properties
+ENV JAVA_OPTS=""
+#ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","/simple-svc.jar", "--spring.profiles.active=default"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","devsta-meetup-0.0.1-SNAPSHOT.jar"]
+EXPOSE 9092 17017

devsta-meetup/src/main/resources/application-meetup.properties

@@ -0,0 +1,2 @@
+url.gateway = http://175.45.195.94:9999/api/meetup
+spring.data.mongodb.uri= mongodb://moondy:[email protected]:17017/devstagram

devsta-meetup/src/main/resources/application.yml

@@ -6,8 +6,6 @@ spring:
     name: meetupservice
   profiles:
     active: default
-    include: db
+    include: meetup
   config:
-    import: "optional:configserver:"
-url:
-  gateway: "http://localhost:9999/api/meetup"
+    import: "optional:configserver:"

devsta-posts/Dockerfile

@@ -0,0 +1,8 @@
+FROM adoptopenjdk:11-jre-openj9
+ADD devsta-posts-0.0.1-SNAPSHOT.jar devsta-posts-0.0.1-SNAPSHOT.jar
+ADD application.yml application.yml
+ADD application-db.properties application-db.properties
+ENV JAVA_OPTS=""
+#ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","/simple-svc.jar", "--spring.profiles.active=default"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","devsta-posts-0.0.1-SNAPSHOT.jar"]
+EXPOSE 9091 17017

devsta-posts/src/main/resources/application.yml

@@ -3,19 +3,10 @@ server:
 
 spring:
   profiles:
-    include: db
+    include: posts
   application:
     name: postservice
-#  profiles:
-#    active: default
-#  config:
-#    import: "configserver:http://localhost:8888"
-#  data:
-#    mongodb:
-#      uri: mongodb://localhost:27017/devstagram
 
 logging:
   level:
-    org.springframework.data.mongodb: DEBUG
-url:
-  gateway: "http://localhost:9999/posts"
+    org.springframework.data.mongodb: DEBUG

devsta-users/Dockerfile

@@ -0,0 +1,9 @@
+FROM adoptopenjdk:11-jre-openj9
+ADD devsta-users-0.0.1-SNAPSHOT.jar devsta-users-0.0.1-SNAPSHOT.jar
+ADD application.yml application.yml
+#ADD application-db.properties application-db.properties
+ENV JAVA_OPTS=""
+#ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","/simple-svc.jar", "--spring.profiles.active=default"]
+ENTRYPOINT ["java","-jar","-Duser.timezone=Asia/Seoul","devsta-users-0.0.1-SNAPSHOT.jar"]
+EXPOSE 9090
+EXPOSE 17017

devsta-users/pom.xml

@@ -75,7 +75,14 @@
 			<artifactId>jjwt</artifactId>
 			<version>0.9.1</version>
 		</dependency>
-<!--		<dependency>-->
+		<dependency>
+			<groupId>de.flapdoodle.embed</groupId>
+			<artifactId>de.flapdoodle.embed.mongo</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+
+		<!--		<dependency>-->
 <!--			<groupId>junit</groupId>-->
 <!--			<artifactId>junit</artifactId>-->
 <!--			<scope>test</scope>-->

devsta-users/src/main/resources/application.yml

@@ -2,25 +2,10 @@ server:
   port: 9090
 spring:
   profiles:
-    include: db
+    include: users
   application:
     name: userservice
-#  data:
-#    mongodb:
-#      uri: mongodb://localhost:17017/devstagram #mongodb://localhost:17017/devstagram
-#      #authentication-database: admin
-
-
-
 logging:
   level:
     org.springframework.data.mongodb: DEBUG
 
-
-
-
-
-      #  profiles:
-      #    active: default
-      #  config:
-      #    import: "optional:configserver:http://localhost:8888"