[DEBUG] correct the interface docker
This commit is contained in:
parent
71f8c0d548
commit
a757a580eb
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,8 +14,6 @@ config.env
|
|||||||
dataPush
|
dataPush
|
||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
package-lock.json
|
|
||||||
|
|
||||||
# IDEs and editors
|
# IDEs and editors
|
||||||
/.idea
|
/.idea
|
||||||
.project
|
.project
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM maven:3.6.3-openjdk-16 AS build
|
FROM maven:3-openjdk-18 AS build
|
||||||
|
|
||||||
COPY pom.xml /tmp/
|
COPY pom.xml /tmp/
|
||||||
COPY src /tmp/src/
|
COPY src /tmp/src/
|
||||||
|
@ -3,7 +3,7 @@ package org.kar.oauth.util;
|
|||||||
public class ConfigVariable {
|
public class ConfigVariable {
|
||||||
|
|
||||||
public static String getDBHost() {
|
public static String getDBHost() {
|
||||||
String out = System.getenv("org.kar.oauth.db.host");
|
String out = System.getenv("ORG_KARAUTH_DB_HOST");
|
||||||
if (out == null) {
|
if (out == null) {
|
||||||
return "localhost";
|
return "localhost";
|
||||||
}
|
}
|
||||||
@ -11,7 +11,7 @@ public class ConfigVariable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getDBPort() {
|
public static String getDBPort() {
|
||||||
String out = System.getenv("org.kar.oauth.db.port");
|
String out = System.getenv("ORG_KARAUTH_DB_PORT");
|
||||||
if (out == null) {
|
if (out == null) {
|
||||||
//return"3306";
|
//return"3306";
|
||||||
return "17036";
|
return "17036";
|
||||||
@ -20,7 +20,7 @@ public class ConfigVariable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getDBLogin() {
|
public static String getDBLogin() {
|
||||||
String out = System.getenv("org.kar.oauth.db.login");
|
String out = System.getenv("ORG_KARAUTH_DB_LOGIN");
|
||||||
if (out == null) {
|
if (out == null) {
|
||||||
return "root";
|
return "root";
|
||||||
}
|
}
|
||||||
@ -44,7 +44,7 @@ public class ConfigVariable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getlocalAddress() {
|
public static String getlocalAddress() {
|
||||||
String out = System.getenv("org.kar.oauth.address");
|
String out = System.getenv("ORG_KARAUTH_DB_ADDRESS");
|
||||||
if (out == null) {
|
if (out == null) {
|
||||||
return "http://0.0.0.0:17080/karauth/api/";
|
return "http://0.0.0.0:17080/karauth/api/";
|
||||||
}
|
}
|
||||||
@ -52,7 +52,7 @@ public class ConfigVariable {
|
|||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
public static String getSecretOfTheGod() {
|
public static String getSecretOfTheGod() {
|
||||||
String out = System.getenv("org.kar.oauth.secretOfTheGod");
|
String out = System.getenv("ORG_KARAUTH_DB_SECRET");
|
||||||
if (out == null) {
|
if (out == null) {
|
||||||
System.out.println("missing Secret !!!!");
|
System.out.println("missing Secret !!!!");
|
||||||
return null;
|
return null;
|
||||||
|
@ -21,8 +21,8 @@ services:
|
|||||||
image: adminer:latest
|
image: adminer:latest
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- karauth_db_service:
|
- karauth_db_service
|
||||||
condition: service_healthy
|
# # condition: service_healthy
|
||||||
ports:
|
ports:
|
||||||
- 17079:8080
|
- 17079:8080
|
||||||
links:
|
links:
|
||||||
@ -33,7 +33,7 @@ services:
|
|||||||
karauth_back_service:
|
karauth_back_service:
|
||||||
build: back/
|
build: back/
|
||||||
restart: always
|
restart: always
|
||||||
image: org.kar.oauth
|
image: org.kar.auth.back
|
||||||
depends_on:
|
depends_on:
|
||||||
- karauth_db_service
|
- karauth_db_service
|
||||||
ports:
|
ports:
|
||||||
|
27200
front/package-lock.json
generated
Normal file
27200
front/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -6,11 +6,14 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
// URL of development API
|
// URL of development API
|
||||||
applName: "karso",
|
applName: "karauth",
|
||||||
apiUrl: 'http://192.168.1.156/karideo/api',
|
defaultServer: "karauth",
|
||||||
apiOAuthUrl: 'http://192.168.1.156/karauth/api',
|
server: {
|
||||||
frontBaseUrl: 'karauth',
|
karauth: 'http://192.168.1.156/karauth/api',
|
||||||
apiMode: 'QUERRY',
|
},
|
||||||
// apiMode: "REWRITE",
|
ssoSignIn: 'http://192.168.1.156/karauth/signin/karauth-dev/',
|
||||||
localBdd: true
|
ssoSignUp: 'http://192.168.1.156/karauth/signup/karauth-dev/',
|
||||||
|
ssoSignOut: 'http://192.168.1.156/karauth/signout/karauth-dev/',
|
||||||
|
frontBaseUrl: '',
|
||||||
|
apiMode: 'REWRITE'
|
||||||
};
|
};
|
||||||
|
27206
sso/package-lock.json
generated
Normal file
27206
sso/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,10 +7,10 @@ export const environment = {
|
|||||||
production: true,
|
production: true,
|
||||||
// URL of development API
|
// URL of development API
|
||||||
applName: "karso",
|
applName: "karso",
|
||||||
apiUrl: 'http://192.168.1.156/karideo/api',
|
defaultServer: "karauth",
|
||||||
apiOAuthUrl: 'http://192.168.1.156/karauth/api',
|
server: {
|
||||||
frontBaseUrl: 'karso',
|
karauth: 'http://192.168.1.156/karauth/api',
|
||||||
apiMode: 'QUERRY',
|
},
|
||||||
// apiMode: "REWRITE",
|
frontBaseUrl: '',
|
||||||
localBdd: true
|
apiMode: 'REWRITE'
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user