ramq

houko · houko · commit cd1cc30dd952 · 2016-11-14T16:28:37.000+08:00
diff --git a/core/pom.xml b/core/pom.xml
@@ -31,18 +31,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/core/src/main/resources/config/application.properties b/core/src/main/resources/config/application.properties
diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml
@@ -17,6 +17,10 @@
             <artifactId>core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
     </dependencies>
 
 
diff --git a/rabbitmq/src/main/resources/config/application.properties b/rabbitmq/src/main/resources/config/application.properties
@@ -9,19 +9,14 @@ spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo
 spring.datasource.username=xiaomo
 spring.datasource.password=123456
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
-#jpa
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
-
-
 # rabbitmq
 spring.application.name=rabbitmq-xiaomo
 spring.rabbitmq.host=115.29.137.34
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xiaomo
-spring.rabbitmq.password=123456
+spring.rabbitmq.password=123456
diff --git a/website/src/main/java/info/xiaomo/website/dao/MongoDao.java b/website/src/main/java/info/xiaomo/website/dao/MongoDao.java
diff --git a/website/src/main/resources/config/application.properties b/website/src/main/resources/config/application.properties
@@ -53,14 +53,3 @@ spring.mail.password=Lm199301161127
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
-
-
-# rabbitmq
-spring.application.name=rabbitmq-xiaomo
-spring.rabbitmq.host=115.29.137.34
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=xiaomo
-spring.rabbitmq.password=123456
-
-# mongod
-spring.data.mongodb.uri=mongodb://xiaomo:xiaomo@115.29.137.34:27017/admin
diff --git a/website/src/test/resources/application.properties b/website/src/test/resources/application.properties
@@ -21,31 +21,6 @@ spring.jpa.show-sql=true
 #other
 banner.location=config/banner-girl.txt
 
-
-# \u591A\u73AF\u5883\u914D\u7F6E\u6587\u4EF6\u6FC0\u6D3B\u5C5E\u6027
-spring.profiles.active=dev
-
-
-# redis
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=localhost
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=6379
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.pool.max-wait=-1
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.pool.min-idle=0
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=0
-
 #\u90AE\u4EF6
 spring.mail.host=smtp.qq.com
 spring.mail.username=83387856@qq.com
@@ -54,14 +29,6 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 
-
-# rabbitmq
-spring.application.name=rabbitmq-hello
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=springcloud
-spring.rabbitmq.password=123456
-
 #spring.data.mongodb.uri=mongodb://name:pass@localhost:27017/test
 
 
