diff --git a/src/main/java/com/jmfy/Application.java b/src/main/java/com/jmfy/Application.java index 985bdcf..6487ccc 100644 --- a/src/main/java/com/jmfy/Application.java +++ b/src/main/java/com/jmfy/Application.java @@ -5,7 +5,7 @@ import com.jmfy.Handler.ManagerManager; import com.jmfy.controller.ManagerController; import com.jmfy.redisProperties.RedisAutoConfiguration; import com.jmfy.thrift.pool.ThriftPoolUtils; -import com.jmfy.util.KProducer; +import com.jmfy.util.JsonUtil; import com.jmfy.util.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,8 +15,6 @@ import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfigurat import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; -import java.util.Map; - @SpringBootApplication(exclude = {MongoAutoConfiguration.class,MongoDataAutoConfiguration.class}) public class Application { @@ -33,6 +31,7 @@ public class Application { //redis初始化 RedisAutoConfiguration redisAutoConfiguration = configurableApplicationContext.getBean(RedisAutoConfiguration.class); RedisUtil.getInstence().init(redisAutoConfiguration.getRedisProperties()); + JsonUtil.getInstence().initServerIPandProt(); // Map commandHanderMap = configurableApplicationContext.getBeansOfType(BaseHandler.class); // for (BaseHandler handler : commandHanderMap.values()){ // handlerManager.addHandler(handler); diff --git a/src/main/java/com/jmfy/controller/GetOrderController.java b/src/main/java/com/jmfy/controller/GetOrderController.java index 51e356f..d54c278 100644 --- a/src/main/java/com/jmfy/controller/GetOrderController.java +++ b/src/main/java/com/jmfy/controller/GetOrderController.java @@ -69,7 +69,7 @@ public class GetOrderController { .append(cPayOrder.getCreditId()); } } - System.out.println(result.toString()); + LOGGER.info("GetOrderController==> result={}",result.toString()); return result.toString(); } } diff --git a/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java b/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java index 448351f..1c66de4 100644 --- a/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java +++ b/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java @@ -62,7 +62,7 @@ public class CUserDaoImpl implements CUserDao { //保存单独订单 RedisUtil.getInstence().putObject("C_PAYORDER",cPayOrder.getOrderId(),cPayOrder,-1); //保存每一天的订单 - RedisUtil.getInstence().putMapEntry("C_PAYORDER_MAP",date,cPayOrder.getCreditId(),cPayOrder,-1); + RedisUtil.getInstence().putMapEntry("C_PAYORDER_MAP",date,cPayOrder.getOrderId(),cPayOrder,-1); } @Override diff --git a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java index 325ce32..3f826fd 100644 --- a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java +++ b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java @@ -31,4 +31,6 @@ public class RedisUserKey { public final static String Shero_Rand_Switch = "Shero_Rand_Switch"; public final static String Shero_Rand_Template = "Shero_Rand_Template"; public final static String Login_Server_Info = "Login_Server_Info"; + + public final static String IP_AND_PROT_MAP = "IP_AND_PROT_MAP"; } diff --git a/src/main/java/com/jmfy/util/JsonUtil.java b/src/main/java/com/jmfy/util/JsonUtil.java index 0fcb215..b7a0a34 100644 --- a/src/main/java/com/jmfy/util/JsonUtil.java +++ b/src/main/java/com/jmfy/util/JsonUtil.java @@ -2,10 +2,13 @@ package com.jmfy.util; import com.google.gson.Gson; import com.jmfy.controller.RechargeController; +import com.jmfy.redisProperties.RedisUserKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -76,4 +79,15 @@ public class JsonUtil { String dayBefore=new SimpleDateFormat("yyyy-MM-dd").format(c.getTime()); return dayBefore; } + + public void initServerIPandProt() { + InetAddress ia=null; + try { + ia=ia.getLocalHost(); + String deliveryAddress = ia.getHostAddress() +":"+9991; + RedisUtil.getInstence().putMapEntry(RedisUserKey.IP_AND_PROT_MAP, String.valueOf(9991),deliveryAddress,3,-1); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + } }