修改配置

src/main/java/com/jtxt/demo/config/MongoConfig.java

@@ -22,7 +22,7 @@ public class MongoConfig extends AbstractMongoClientConfiguration {
 
     @Override
     public MongoClient mongoClient() {
-        ConnectionString connectionString = new ConnectionString("mongodb://jtxt-admin:jtxt-admin@localhost:27017/?authSource=jtxt-dev");
+        ConnectionString connectionString = new ConnectionString("mongodb://jtxt-admin:jtxt-admin@120.77.221.199:27017/?authSource=jtxt-dev");
         MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
                 .applyConnectionString(connectionString)
                 .build();

src/main/resources/application.properties

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-spring.data.mongodb.host=localhost
-=======
 server.port=7000
-spring.data.mongodb.host=7000
->>>>>>> 9fa8a09ccce1205b18c6c76f226fd09b4120cabb
+spring.data.mongodb.host=localhost
 spring.data.mongodb.database=jtxt-dev
 spring.data.mongodb.port=27017
 spring.data.mongodb.uri=mongodb://jtxt-admin:jtxt-admin@localhost:27017/?authSource=jtxt-dev