tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Timo Volkmann 2019-04-18 12:59:02 +02:00
parent 3611b49165
commit 621978e08d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/quasar.conf.js
View File

@ -5,7 +5,8 @@ module.exports = function (ctx) {
// app boot file (/src/boot) // app boot file (/src/boot)
// --> boot files are part of "main.js" // --> boot files are part of "main.js"
boot: [ boot: [
'axios' 'axios',
'qr-scanner'
], ],
css: [ css: [
@ -106,8 +107,8 @@ module.exports = function (ctx) {
API: JSON.stringify('http://localhost:8080') API: JSON.stringify('http://localhost:8080')
} }
: { // Base URL for API-Calls: PRODUCTION (build) : { // Base URL for API-Calls: PRODUCTION (build)
//API: JSON.stringify('http://localhost:8080') //API: JSON.stringify('http://se.hs-heilbronn.de:8090')
API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching') API: JSON.stringify('http://localhost:8080')
} }
}, },

2
src/main/java/hhn/labsw/bugageocaching/Application.java
View File

@ -15,7 +15,7 @@ public class Application extends SpringBootServletInitializer{
return application.sources(Application.class); return application.sources(Application.class);
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
} }