env key

Author: dzdx

Makefile

@@ -10,4 +10,4 @@ image_push:
 app_run:
 	docker run -e REGISTRY_APP_NAME=integration -d  --net=host --name=sofa-registry --rm  -v /Users/dzdx/Desktop/registry-all/conf/application.properties:/registry-distribution/registry-all/conf/application.properties   dzdx/sofa-registry-test:latest
 mysql_run:
-	docker run --rm -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --name=mysql -v /Users/dzdx/Desktop/registry-all:/registry-distribution/registry-all -d  --net=host mariadb:10.7
+	docker run --rm -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --name=mysql -v /Users/dzdx/Desktop/registry-all:/registry-distribution/registry-all -d  mariadb:10.7

docker/kube/integration.yaml

@@ -47,7 +47,7 @@ data:
     nodes.localRegion=DEFAULT_ZONE
     jdbc.url=jdbc:mysql://mysql.default.svc.cluster.local:3306/registrymetadb
     jdbc.username=root
-    jdbc.password=
+    jdbc.password=root
 ---
 apiVersion: v1
 kind: Secret

server/common/util/src/main/java/com/alipay/sofa/registry/util/SystemUtils.java

@@ -24,23 +24,23 @@ private SystemUtils() {}
   public static int getSystemInteger(String name, int def) {
     String v = System.getProperty(name);
     if (v == null) {
-      v = System.getenv(name);
+      v = System.getenv(convertEnvKey(name));
     }
     return v == null ? def : Integer.parseInt(v);
   }
 
   public static long getSystemLong(String name, long def) {
     String v = System.getProperty(name);
     if (v == null) {
-      v = System.getenv(name);
+      v = System.getenv(convertEnvKey(name));
     }
     return v == null ? def : Long.parseLong(v);
   }
 
   public static String getSystem(String name, String def) {
     String v = System.getProperty(name);
     if (v == null) {
-      v = System.getenv(name);
+      v = System.getenv(convertEnvKey(name));
     }
     return v == null ? def : v;
   }
@@ -49,7 +49,7 @@ public static String getSystem(String name) {
     return getSystem(name, null);
   }
 
-  public static String convertEnvKey(String key) {
+  private static String convertEnvKey(String key) {
     return StringUtils.replace(key, ".", "_").toUpperCase();
   }
 }

server/distribution/all/bin/base/start_base.sh

@@ -9,12 +9,18 @@ if [[ -z "$REGISTRY_APP_NAME" ]]; then
 fi
 BASE_DIR=`cd $(dirname $0)/../..; pwd`
 APP_JAR="${BASE_DIR}/registry-${REGISTRY_APP_NAME}.jar"
+# set user.home
+JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR}"
+
 if [[ -z "$SPRING_CONFIG_LOCATION" ]]; then
-  SPRING_CONFIG_LOCATION=${BASE_DIR}/conf/application.properties
+  SPRING_CONFIG_LOCATION=${BASE_DIR}/conf/
+fi
+JAVA_OPTS="$JAVA_OPTS -Dspring.config.additional-location=${SPRING_CONFIG_LOCATION}"
+
+if [[ -n "$SPRING_PROFILES_ACTIVE" ]]; then
+  JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}"
 fi
 
-# set user.home
-JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR} -Dspring.config.location=${SPRING_CONFIG_LOCATION}"
 
 # springboot conf
 SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"

server/distribution/all/bin/integration/start.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
 BASE_DIR=`cd $(dirname $0)/../..; pwd`
+export SPRING_PROFILES_ACTIVE="prod"
 REGISTRY_APP_NAME=integration exec ${BASE_DIR}/bin/base/start_base.sh

server/distribution/all/bin/integration/start_dev.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 BASE_DIR=`cd $(dirname $0)/../..; pwd`
-export SPRING_CONFIG_LOCATION=${BASE_DIR}/conf/application-h2.properties
+export SPRING_PROFILES_ACTIVE="dev"
 REGISTRY_APP_NAME=integration exec ${BASE_DIR}/bin/base/start_base.sh

…ution/all/conf/application-h2.properties …tion/all/conf/application-dev.propertiesserver/distribution/all/conf/application-h2.properties renamed to server/distribution/all/conf/application-dev.properties server/distribution/all/conf/application-h2.properties renamed to server/distribution/all/conf/application-dev.properties

@@ -1,6 +1,7 @@
 nodes.localDataCenter=DefaultDataCenter
 nodes.localRegion=DEFAULT_ZONE
 ## connect db
+jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/registrymetadb
 jdbc.username=root
-jdbc.password=
+jdbc.password=root

server/distribution/all/conf/application.properties

@@ -321,6 +321,7 @@ private void gracefulShutdown() {
             }
             return true;
           });
+      LOGGER.info("add data self to blacklist successfully");
     } catch (Throwable e) {
       LOGGER.error("add blacklist failed:", e);
     }

server/server/data/src/main/java/com/alipay/sofa/registry/server/data/bootstrap/DataServerBootstrap.java

@@ -1,6 +1,8 @@
 nodes.localDataCenter=DefaultDataCenter
 nodes.localRegion=DEFAULT_ZONE
 ## connect db
-jdbc.url=jdbc:mysql://127.0.0.1:2883/registrymetadb?useUnicode=true&characterEncoding=utf8
-jdbc.username=username
-jdbc.password=password
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://127.0.0.1:3306/registrymetadb?useUnicode=true&characterEncoding=utf8
+jdbc.username=root
+jdbc.password=root
+data.server.gracefulShutdown=true