From 057d26473278c41b0acc2803c61463cbfb85dc68 Mon Sep 17 00:00:00 2001
From: yuye <631941527@qq.com>
Date: Wed, 10 Jun 2020 21:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=B8=B8=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mars/common/base/config/MarsConfig.java     | 9 ++++++++-
 .../java/com/mars/common/test/config/TestMarsConfig.java | 8 --------
 .../com/mars/common/test/util/MarsAddressUtilTest.java   | 2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/mars-common/src/main/java/com/mars/common/base/config/MarsConfig.java b/mars-common/src/main/java/com/mars/common/base/config/MarsConfig.java
index b3d1724..126a9dd 100644
--- a/mars-common/src/main/java/com/mars/common/base/config/MarsConfig.java
+++ b/mars-common/src/main/java/com/mars/common/base/config/MarsConfig.java
@@ -5,6 +5,7 @@ import com.mars.common.base.config.model.FileUploadConfig;
 import com.mars.common.base.config.model.JedisConfig;
 import com.mars.common.base.config.model.ThreadPoolConfig;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -58,7 +59,13 @@ public abstract class MarsConfig {
      * 连接池配置
      * @return 连接池配置
      */
-    public abstract List<Properties> jdbcProperties();
+    public List<Properties> jdbcProperties(){
+        List<Properties> propertiesList = new ArrayList<Properties>();
+        Properties properties = new Properties();
+        properties.setProperty("name","default");
+        propertiesList.add(properties);
+        return propertiesList;
+    }
 
     /**
      * jedis配置
diff --git a/mars-common/src/test/java/com/mars/common/test/config/TestMarsConfig.java b/mars-common/src/test/java/com/mars/common/test/config/TestMarsConfig.java
index 56647e9..4753fce 100644
--- a/mars-common/src/test/java/com/mars/common/test/config/TestMarsConfig.java
+++ b/mars-common/src/test/java/com/mars/common/test/config/TestMarsConfig.java
@@ -2,18 +2,10 @@ package com.mars.common.test.config;
 
 import com.mars.common.base.config.MarsConfig;
 
-import java.util.List;
-import java.util.Properties;
-
 public class TestMarsConfig extends MarsConfig {
 
     @Override
     public int port() {
         return 8080;
     }
-
-    @Override
-    public List<Properties> jdbcProperties() {
-        return null;
-    }
 }
diff --git a/mars-common/src/test/java/com/mars/common/test/util/MarsAddressUtilTest.java b/mars-common/src/test/java/com/mars/common/test/util/MarsAddressUtilTest.java
index 51e2feb..b091e76 100644
--- a/mars-common/src/test/java/com/mars/common/test/util/MarsAddressUtilTest.java
+++ b/mars-common/src/test/java/com/mars/common/test/util/MarsAddressUtilTest.java
@@ -18,7 +18,7 @@ public class MarsAddressUtilTest {
     public void testGetLocalIp(){
         try {
             String ipStr = MarsAddressUtil.getLocalIp();
-            Assert.assertEquals("192.168.0.104",ipStr);
+            Assert.assertEquals("172.20.10.5",ipStr);
         } catch (Exception e){
             Assert.fail();
         }