.

@@ -2,7 +2,12 @@ module.exports = function(app){
 
 
 var request = require("request");
 var request = require("request");
 var urlenconde = require('urlencode');
 var urlenconde = require('urlencode');
+<<<<<<< HEAD
 var apikey = "RGAPI-26fe9028-bf28-4baa-a0e0-34c116c57742"//api
 var apikey = "RGAPI-26fe9028-bf28-4baa-a0e0-34c116c57742"//api
+=======
+var apikey = "RGAPI-e4aabf85-2067-48cb-82ab-39bdf7c07325"//api
+
+>>>>>>> 2405bb4c8a3dae402c7d281fdffcda56ffb4ecfb
 
 
 var profileIconId;  //아이콘 번호
 var profileIconId;  //아이콘 번호
 var revisionDate; //수정날짜
 var revisionDate; //수정날짜
@@ -33,6 +38,7 @@ var rotation_champ = new Array();
 
 
       var info_summoner_json = JSON.parse(body);
       var info_summoner_json = JSON.parse(body);
 
 
+<<<<<<< HEAD
       accountId = info_summoner_json["accountId"];
       accountId = info_summoner_json["accountId"];
       id = info_summoner_json["id"];
       id = info_summoner_json["id"];
       summoner = info_summoner_json["name"];
       summoner = info_summoner_json["name"];
@@ -44,6 +50,15 @@ var rotation_champ = new Array();
         var profileIcon;
         var profileIcon;
         profileIcon="http://ddragon.leagueoflegends.com/cdn/10.23.1/img/profileicon/"+profileIconId+".png";
         profileIcon="http://ddragon.leagueoflegends.com/cdn/10.23.1/img/profileicon/"+profileIconId+".png";
       
       
+=======
+      accountId = info_summoner_json["accountId"]; // GZC51rstNY47-cmgcap94mfLe7JNjF1fz3dGAdwS6pEo
+      id = info_summoner_json["id"]; // T6cI_Zn5LEqyPuhCZz1do0Y-IJztJX1I1mvcQZRt9YKygA
+      summoner = info_summoner_json["name"]; // 환하다 추야
+      profileIconId = info_summoner_json["profileIconId"]; // 980
+      summonerLevel = info_summoner_json["summonerLevel"]; // 250
+      revisionDate = info_summoner_json["revisionDate"]; // 1605519790000
+
+>>>>>>> 2405bb4c8a3dae402c7d281fdffcda56ffb4ecfb
       var champUrl = "https://kr.api.riotgames.com/lol/champion-mastery/v4/champion-masteries/by-summoner/" + urlenconde(id) + "?api_key=" + apikey;
       var champUrl = "https://kr.api.riotgames.com/lol/champion-mastery/v4/champion-masteries/by-summoner/" + urlenconde(id) + "?api_key=" + apikey;
       request(champUrl,function(error,response,body){
       request(champUrl,function(error,response,body){
         var info_champ_json = JSON.parse(body);
         var info_champ_json = JSON.parse(body);