diff --git a/src/main/java/com/html/deliveryGoods.html b/src/main/java/com/html/deliveryGoods.html
index e0445df..565deeb 100644
--- a/src/main/java/com/html/deliveryGoods.html
+++ b/src/main/java/com/html/deliveryGoods.html
@@ -2,12 +2,19 @@
- Title
+ 发货机
-
diff --git a/src/main/java/com/jmfy/Application.java b/src/main/java/com/jmfy/Application.java
index 34c3e11..5f7faee 100644
--- a/src/main/java/com/jmfy/Application.java
+++ b/src/main/java/com/jmfy/Application.java
@@ -6,11 +6,13 @@ import com.jmfy.thrift.pool.ThriftPoolUtils;
import com.jmfy.util.KProducer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import java.util.Map;
-@SpringBootApplication
+@SpringBootApplication(exclude = {MongoAutoConfiguration.class,MongoDataAutoConfiguration.class})
public class Application {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext configurableApplicationContext = SpringApplication.run(Application.class, args);
diff --git a/src/main/java/com/jmfy/controller/TestController.java b/src/main/java/com/jmfy/controller/TestController.java
index 17a89d3..73eebf9 100644
--- a/src/main/java/com/jmfy/controller/TestController.java
+++ b/src/main/java/com/jmfy/controller/TestController.java
@@ -20,8 +20,10 @@ public class TestController {
@RequestMapping(value = "/test")
public JsonResult deliveryGoods(HttpServletRequest request){
int userId = Integer.parseInt(request.getParameter("userId"));
- int itemId = Integer.parseInt(request.getParameter("itemId"));
- int itemNum = Integer.parseInt(request.getParameter("itemNum"));
+ int itemType = Integer.parseInt(request.getParameter("itemType"));
+ String num = request.getParameter("itemNum");
+
+ int itemNum = Integer.parseInt(String.valueOf("".equals(num) ?0:num));
//TODO 根据大区id和小区id从redis找到对应服的 IP和 Port
String ip = "127.0.0.1";
@@ -32,7 +34,7 @@ public class TestController {
String serviceKey = getServiceKey(ServiceKey.RPCCore,ip,port);
try {
rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey);
- result = rPCClient.getClient().TestdeliveryGood(userId,itemId,itemNum);
+ result = rPCClient.getClient().testdeliveryGood(userId,itemType,itemNum);
} catch (Exception e) {
e.printStackTrace();
} finally {
diff --git a/src/main/java/com/jmfy/dao/UserDao.java b/src/main/java/com/jmfy/dao/UserDao.java
deleted file mode 100644
index f9b3264..0000000
--- a/src/main/java/com/jmfy/dao/UserDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jmfy.dao;
-
-import com.jmfy.dto.CPayOrder;
-
-public interface UserDao {
- /*
- * 获取玩家订单信息
- * */
- CPayOrder getBuyOrderInfo(String orderId, String dbName);
-}
diff --git a/src/main/java/com/jmfy/dao/impl/UserDaoImpl.java b/src/main/java/com/jmfy/dao/impl/UserDaoImpl.java
deleted file mode 100644
index aa3da30..0000000
--- a/src/main/java/com/jmfy/dao/impl/UserDaoImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jmfy.dao.impl;
-
-import com.jmfy.dao.UserDao;
-import com.jmfy.dto.CPayOrder;
-import com.mongodb.Mongo;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.stereotype.Repository;
-
-import javax.annotation.Resource;
-
-@Repository
-public class UserDaoImpl implements UserDao{
-
- @Resource
- private Mongo mongo;
-
- public MongoTemplate getrMongoTemplateByDBName(String dataBaseName){
- return new MongoTemplate(mongo,dataBaseName);
- }
-
- @Override
- public CPayOrder getBuyOrderInfo(String orderId, String dbName) {
- MongoTemplate rMongoTemplate =getrMongoTemplateByDBName(dbName);
- String sql = "{id:" + orderId + "}";
- BasicQuery basicQuery = new BasicQuery(sql);
- return rMongoTemplate.findOne(basicQuery, CPayOrder.class);
- }
-
-}
diff --git a/src/main/java/com/jmfy/util/Connect.java b/src/main/java/com/jmfy/util/Connect.java
index 488b0ad..986e4de 100644
--- a/src/main/java/com/jmfy/util/Connect.java
+++ b/src/main/java/com/jmfy/util/Connect.java
@@ -14,24 +14,24 @@ import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-@Component
+//@Component
public class Connect {
-
- @Resource
- private MongoClient mongo;
- @Resource
- private MongoConverter mongoConverter;
-
- private Map mongoMaps= new HashMap<>();
-
- @PostConstruct
- public void init(){
- MongoIterable databases = mongo.listDatabaseNames();
- for(String dbName:databases){
- MongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(mongo,dbName);
- MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, mongoConverter);
- mongoMaps.put(dbName,mongoTemplate);
- }
- }
+//
+// @Resource
+// private MongoClient mongo;
+// @Resource
+// private MongoConverter mongoConverter;
+//
+// private Map mongoMaps= new HashMap<>();
+//
+// @PostConstruct
+// public void init(){
+// MongoIterable databases = mongo.listDatabaseNames();
+// for(String dbName:databases){
+// MongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(mongo,dbName);
+// MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, mongoConverter);
+// mongoMaps.put(dbName,mongoTemplate);
+// }
+// }
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9451df1..5a06eb8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,9 +2,9 @@
server.port=9991
##contextPath
server.context-path=/delivery
-
-spring.data.mongodb.host=192.168.0.169
-spring.data.mongodb.port=27017
+#
+#spring.data.mongodb.host=192.168.0.170
+#spring.data.mongodb.port=27017
#spring.data.mongodb.host=gameP.pr1.ysj.db
#spring.data.mongodb.port=27017
diff --git a/src/main/thrift/idl/core.thrift b/src/main/thrift/idl/core.thrift
index 01e2ccd..2e13c05 100644
--- a/src/main/thrift/idl/core.thrift
+++ b/src/main/thrift/idl/core.thrift
@@ -10,5 +10,5 @@ service RPCRequestIFace{
Result deliveryGood(1:string openid, 2:i32 userId, 3:string payitem, 4:string billno, 5:string amt,
6:string channel_id, 7:string token, 8:string serverOrder) throws (1:common.InvalidOperException ouch);
- Result TestdeliveryGood(1:i32 userId, 2:i32 itemId ,3:i32 itemNum) throws (1:common.InvalidOperException ouch);
+ Result testdeliveryGood(1:i32 userId, 2:i32 itemType ,3:i32 itemNum) throws (1:common.InvalidOperException ouch);
}
\ No newline at end of file