Skip to content

Commit

Permalink
[FIX] ENV ระบบใช้ Spring Cloud Config Server
Browse files Browse the repository at this point in the history
  • Loading branch information
wdrdres3qew5ts21 committed Oct 3, 2019
1 parent b37ed46 commit cd2a813
Show file tree
Hide file tree
Showing 14 changed files with 137 additions and 170 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spring:
active: dev
data:
mongodb:
host: 13.229.138.243
host: localhost
port: 27017
authentication-database: admin
database: meetu
Expand Down
2 changes: 1 addition & 1 deletion Microservice/ConfigServer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ WORKDIR /app
ADD target/configserver-0.0.1-SNAPSHOT.jar .
#ENV elasticsearch.host=https://meetu-milktea.tk
#ENV spring_cloud_config=
EXPOSE 3002:3002
EXPOSE 8585:8585
CMD [ "java","-jar","configserver-0.0.1-SNAPSHOT.jar" ]
2 changes: 1 addition & 1 deletion Microservice/EventService/src/main/resources/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spring:
# mongodb:
## host: ${mongodb_host:localhost}
## port: 27017
# uri: mongodb+srv://meetuAdmin:[email protected]/test?retryWrites=true&w=majority
# uri:
# authentication-database: admin
# database: meetu
## username: meetuAdmin
Expand Down
8 changes: 4 additions & 4 deletions Microservice/UserService/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM openjdk:8u181-jdk-alpine3.8

FROM openjdk:alpine
WORKDIR /app
ENV spring.profiles.active=production
ADD target/userservice-0.0.1-Demo.jar .
ADD meetu-firebase-key.json .
EXPOSE 3001:3001

CMD ["java" "-jar" "userservice-0.0.1-Demo.jar"]
CMD [ "java", "-jar","userservice-0.0.1-Demo.jar" ]



# FROM maven:3.6.0-jdk-8-alpine
2 changes: 1 addition & 1 deletion Microservice/UserService/build.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn clean package &&docker build -t linxianer12/userservice . && docker push linxianer12/userservice
mvn clean package && docker build -t linxianer12/userservice:latest . && docker push linxianer12/userservice
4 changes: 2 additions & 2 deletions Microservice/UserService/src/main/resources/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ spring:
active: dev
# data:
# mongodb:
# uri: mongodb+srv://meetuAdmin:[email protected]/test?retryWrites=true&w=majority
# uri:
# authentication-database: admin
# database: meetu
# host: 13.229.138.243
# host: localhost
# port: 27017
# authentication-database: admin
# database: meetu
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added logo/android-icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added logo/meetu-alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added logo/meetu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions nuxt-firebase-auth-master/.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
USER_SERVICE=http://localhost:4000/userservice
EVENT_SERVICE=http://localhost:4000/eventservice
//USER_SERVICE=https://www.meetu-milktea.tk:4000/userservice
//EVENT_SERVICE=https://www.meetu-milktea.tk:4000/eventservice
//COMMUNITY_SERVICE=https://www.meetu-milktea.tk:4000/communityservice

//USER_SERVICE=http://localhost:3001
//EVENT_SERVICE=http://localhost:3002
USER_SERVICE=http://localhost:4000/userservice
EVENT_SERVICE=http://localhost:4000/eventservice
//COMMUNITY_SERVICE=http://localhost:3002
228 changes: 114 additions & 114 deletions nuxt-firebase-auth-master/.firebase/hosting.ZGlzdA.cache

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions nuxt-firebase-auth-master/pages/ticket/_ticketId.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,15 @@
<!-- <qrcode-stream :camera="camera" @init="onCameraChange"></qrcode-stream> -->

<div align="left">
<h3>Event</h3>
<!-- <h3>Event</h3> -->
<br />
Event name : {{eventName}}
<br />
<br />
<h3>Price</h3>
<h3>Event : {{ticketEvent.ticketDetail[0].eventName}}</h3>
<!-- <h3>Price</h3>
<br />Free
<br /> -->
<br />
<br />
<h3>Owner</h3>
<br />Username
<h3>Organize</h3>
<br /><h3>{{ticketEvent.ticketDetail[0].organize.organizeName}}</h3>
<br />Email
<br />Mobile phone
<br />
Expand All @@ -62,7 +60,7 @@
</v-avatar>
<br />
<br />
<h3>Organize Name</h3>
<h3>{{ticketEvent.ticketDetail[0].organize.organizeName}}</h3>
</div>
</div>
</v-container>
Expand All @@ -81,7 +79,7 @@ export default {
return {
isCameraOpen: false,
ticketEvent: {
ticketDetail: [{ eventName: "E-Ticket" }]
ticketDetail: [{ eventName: "E-Ticket", organize: {organizeName:""} }]
},
qrCodeSrc: {}
};
Expand Down
33 changes: 1 addition & 32 deletions nuxt-firebase-auth-master/static/sw.js
Original file line number Diff line number Diff line change
@@ -1,32 +1 @@
importScripts('https://cdn.jsdelivr.net/npm/[email protected]/workbox/workbox-sw.js')

// --------------------------------------------------
// Configure
// --------------------------------------------------

// Set workbox config
workbox.setConfig({
"debug": false
})

// Start controlling any existing clients as soon as it activates
workbox.core.clientsClaim()

// Skip over the SW waiting lifecycle stage
workbox.core.skipWaiting()

workbox.precaching.cleanupOutdatedCaches()

// --------------------------------------------------
// Precaches
// --------------------------------------------------

// Precache assets

// --------------------------------------------------
// Runtime Caching
// --------------------------------------------------

// Register route handlers for runtimeCaching
workbox.routing.registerRoute(new RegExp('/_nuxt/'), new workbox.strategies.CacheFirst ({}), 'GET')
workbox.routing.registerRoute(new RegExp('/'), new workbox.strategies.NetworkFirst ({}), 'GET')
// THIS FILE SHOULD NOT BE VERSION CONTROLLED

0 comments on commit cd2a813

Please sign in to comment.