diff --git a/Server/Git/ExcelManager.cs b/Server/Git/ExcelManager.cs index a9e5ebb..13f3088 100644 --- a/Server/Git/ExcelManager.cs +++ b/Server/Git/ExcelManager.cs @@ -10,15 +10,18 @@ namespace Server.Git public string name { get { return _name; } } List _variable; public List variable { get { return _variable; } } + List _dataEnum; + public List dataEnum { get { return _dataEnum; } } List _type; public List type { get { return _type; } } Dictionary> _dicViewer; public Dictionary> dicViewer { get { return _dicViewer; } } - public sheet(string name, List variable, List type, Dictionary> dicViewer) + public sheet(string name, List variable, List dataEnum, List type, Dictionary> dicViewer) { this._name = name; this._variable = variable; + this._dataEnum = dataEnum; this._type = type; this._dicViewer = dicViewer; } @@ -61,6 +64,8 @@ namespace Server.Git { //변수이름 List variable = new List(); + //서버용인지 클라용인지 나뉘는 타입 + List dataEnum = new List(); //변수 타입 List type = new List(); Dictionary> dicViewer = new Dictionary>(); @@ -76,7 +81,8 @@ namespace Server.Git for (int n = 0; n <= horizontal; n++) { variable.Add((string)worksheet.Cells[0, n].Value); - type.Add(((string)worksheet.Cells[2, n].Value).ToLower()); + type.Add(((string)worksheet.Cells[3, n].Value).ToLower()); + dataEnum.Add(((string)worksheet.Cells[2, n].Value).ToLower()); } bool isIndex = variable[0] == "index"; @@ -90,7 +96,7 @@ namespace Server.Git } dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 3), dataList); } - sheet sheet = new sheet(worksheet.Name, variable, type, dicViewer); + sheet sheet = new sheet(worksheet.Name, variable, dataEnum, type, dicViewer); _sheets.Add(sheet); } } diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs index 7f28617..0471849 100644 --- a/Server/Git/ExcelSQL.cs +++ b/Server/Git/ExcelSQL.cs @@ -44,6 +44,9 @@ namespace Server.Git query = ""; for (int n = 0; n < sheets.Count; n++) { + if (sheets[n].dataEnum[0] == "client") + continue; + //초기화 newTableQuery = ""; tableDatas = "("; diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 86c33d8..67bff60 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -22,6 +22,8 @@ namespace Server.Git sheets = em.sheets; for (int m = 0; m < sheets.Count; m++) { + if (sheets[m].dataEnum[0] == "server") + continue; sheetList.Add(sheets[m].name, sheets[m].dicViewer); } } diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 3eaf146..d9b8f59 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -51,7 +51,7 @@ namespace Server.Service user = new User(); user.mail = req.mail; user.uuid = Guid.NewGuid().ToString(); - user.nickname = ""; + user.nickname = "NoName"; userSql.Insert(user); //저장하고 유닛의 id를 얻어오기 위함. #endregion #region 초기 유닛 지급