Merge branch 'master' of http://60.1.1.230/backend/jieling_server

common/src/main/java/com/ljsd/common/mogodb/MongoConfig.java

@@ -21,13 +21,13 @@ public class MongoConfig {
 
 
     // 注入配置实体
-    @Autowired
     private MongoSettingsProperties mongoSettingsProperties;
     @Bean
     @ConfigurationProperties(
             prefix = "mongodb.options")
     MongoSettingsProperties mongoSettingsProperties() {
-        return new MongoSettingsProperties();
+        mongoSettingsProperties =new MongoSettingsProperties();
+        return mongoSettingsProperties;
     }
 
     @Value("${spring.data.mongodb.uri}")

serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java

@@ -90,6 +90,7 @@ public class ChatLogic {
      * @param message
      */
     public void sendChatMessage(ISession iSession, int chatType, String message,int friendId) throws Exception {
+        System.out.println("the uid=" + iSession.getUid() + "send msg =" +message);
         int msgId = MessageTypeProto.MessageType.SEND_CHAT_INFO_RESPONSE_VALUE;
         int uid = iSession.getUid();
         User user = UserManager.getUser(uid);

serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java

@@ -162,6 +162,7 @@ public class HeroLogic {
 
 
     public void random(ISession session,int type) throws Exception {
+        LOGGER.info("test randomxxxxx... the type={} ",type);
         int uid = session.getUid();
         User user = UserManager.getUser(uid);
         SLotterySetting sLotterySetting = SLotterySetting.getsLotterySettingMap().get(type);