Merge branch 'master' of http://120.77.221.199:3000/public/JingTieXueTang

pom.xml

@@ -50,6 +50,12 @@
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.0</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>30.0-jre</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/resources/application.properties

@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 spring.data.mongodb.host=localhost
+=======
+server.port=7000
+spring.data.mongodb.host=7000
+>>>>>>> 9fa8a09ccce1205b18c6c76f226fd09b4120cabb
 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
@@ -8,4 +13,4 @@ app.jwt.secret=SomethingSecureEnough
 #1 day
 app.jwt.expiration-in-ms=86400000
 app.jwt.token.prefix=China
-app.jwt.header.string=Authorization
+app.jwt.header.string=Authorization

target/classes/application.properties

@@ -1,7 +1,7 @@
-spring.data.mongodb.host=120.77.221.199
+spring.data.mongodb.host=7000
 spring.data.mongodb.database=jtxt-dev
 spring.data.mongodb.port=27017
-spring.data.mongodb.uri=mongodb://jtxt-admin:jtxt-admin@120.77.221.199:27017/?authSource=jtxt-dev
+spring.data.mongodb.uri=mongodb://jtxt-admin:jtxt-admin@localhost:27017/?authSource=jtxt-dev
 
 #jwt
 app.jwt.secret=SomethingSecureEnough

target/classes/mongoConfig.xml

@@ -10,7 +10,7 @@
        http://www.springframework.org/schema/context/spring-context.xsd">
     <context:annotation-config />
 
-    <mongo:mongo-client id="mongoClient" host="120.77.221.199" />
+    <mongo:mongo-client id="mongoClient" host="localhost" />
 
     <mongo:db-factory id="mongoDbFactory" dbname="jtxt-dev" mongo-client-ref="mongoClient" />