|
|
@@ -18,6 +18,7 @@ using OfficeOpenXml;
|
|
|
using OpenXmlPowerTools;
|
|
|
using StackExchange.Redis;
|
|
|
using System;
|
|
|
+using System.Collections;
|
|
|
using System.Collections.Generic;
|
|
|
using System.ComponentModel;
|
|
|
using System.IdentityModel.Tokens.Jwt;
|
|
|
@@ -38,6 +39,7 @@ using TEAMModelOS.SDK.Extension;
|
|
|
using TEAMModelOS.SDK.Helper.Common.JsonHelper;
|
|
|
using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
|
|
|
using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
|
|
|
+using Top.Api;
|
|
|
|
|
|
namespace TEAMModelOS.Controllers
|
|
|
{
|
|
|
@@ -75,7 +77,23 @@ namespace TEAMModelOS.Controllers
|
|
|
[RequestSizeLimit(102_400_000_00)] //最大10000m左右
|
|
|
public async Task<IActionResult> ReportApi(JsonElement json)
|
|
|
{
|
|
|
-
|
|
|
+ var untyped = new JsonParser().Parse(json.GetRawText());
|
|
|
+ var selection = new JsonPathSelection(untyped);
|
|
|
+ {
|
|
|
+ var nodes_id_token = selection.SelectNodes(json.GetProperty("path").GetString());
|
|
|
+ foreach (var node in nodes_id_token)
|
|
|
+ {
|
|
|
+ if (node.Value is string)
|
|
|
+ {
|
|
|
+ Console.WriteLine(node.Value);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return Ok(node);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //return Ok(nodes_id_token);
|
|
|
+ }
|
|
|
List<string> times = json.GetProperty("times").ToObject<List<string>>();
|
|
|
foreach (var time in times)
|
|
|
{
|
|
|
@@ -111,7 +129,7 @@ namespace TEAMModelOS.Controllers
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- List<(string tmd, bool exists)> tmdexists = new List<(string tmd, bool exists)>();
|
|
|
+ List<(string tmd, bool exists, string scope)> tmdexists = new List<(string tmd, bool exists, string scope)>();
|
|
|
List<(string sch, bool exists)> schexists = new List<(string sch, bool exists)>();
|
|
|
var tmds = uuidInfos.SelectMany(x => x.tmdid).ToHashSet();
|
|
|
if (tmds.Any())
|
|
|
@@ -119,7 +137,15 @@ namespace TEAMModelOS.Controllers
|
|
|
foreach (var tmd in tmds)
|
|
|
{
|
|
|
var exists = await _azureRedis.GetRedisClient().KeyExistsAsync($"Blob:Catalog:{tmd}");
|
|
|
- tmdexists.Add((tmd, exists));
|
|
|
+ if (exists)
|
|
|
+ {
|
|
|
+ tmdexists.Add((tmd, exists, "teacher"));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ exists = await _azureRedis.GetRedisClient().KeyExistsAsync($"Login:School:hbcn:student:{tmd}");
|
|
|
+ tmdexists.Add((tmd, exists, "student"));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
var schs = uuidInfos.SelectMany(x => x.school).ToHashSet();
|
|
|
@@ -142,6 +168,10 @@ namespace TEAMModelOS.Controllers
|
|
|
if (vist!= null)
|
|
|
{
|
|
|
vist.userId=tmd;
|
|
|
+ if (string.IsNullOrWhiteSpace(vist.scope))
|
|
|
+ {
|
|
|
+ vist.scope=tmdext.scope;
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -180,6 +210,70 @@ namespace TEAMModelOS.Controllers
|
|
|
{
|
|
|
var untyped = new JsonParser().Parse(log.param.GetRawText());
|
|
|
var selection = new JsonPathSelection(untyped);
|
|
|
+ string path = "$..[id_token,idToken,idtoken,tmdid,id,teacherId,teacher,tid,tId,userid,userId,code,studentId,student,studentid]";
|
|
|
+
|
|
|
+ var nodes_path = selection.SelectNodes(path);
|
|
|
+ foreach (var node in nodes_path)
|
|
|
+ {
|
|
|
+ // 只获取是字符串的
|
|
|
+ if (node.Value is string)
|
|
|
+ {
|
|
|
+ switch (true)
|
|
|
+ {
|
|
|
+ case bool when node.Path.Contains("id_token")||node.Path.Contains("idToken")||node.Path.Contains("idtoken"):
|
|
|
+ {
|
|
|
+ try
|
|
|
+ {
|
|
|
+ var jwt = new JwtSecurityToken($"{node.Value}");
|
|
|
+ string id = jwt.Payload.Sub;
|
|
|
+ var name = jwt.Claims.FirstOrDefault(claim => claim.Type.Equals("name"))?.Value;
|
|
|
+ if (!string.IsNullOrWhiteSpace(id) && long.TryParse(id, out long _id))
|
|
|
+ {
|
|
|
+ useridMatch.Add(id);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ catch (Exception ex) { }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ case bool when node.Path.Contains("tmdid")||node.Path.Contains("id")||node.Path.Contains("teacherId")
|
|
|
+ ||node.Path.Contains("teacher")||node.Path.Contains("tid")||node.Path.Contains("tId")||node.Path.Contains("userid")
|
|
|
+ ||node.Path.Contains("userId")||node.Path.Contains("studentId")||node.Path.Contains("student")||node.Path.Contains("studentid"):
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{node.Value}") && long.TryParse($"{node.Value}", out long _id))
|
|
|
+ {
|
|
|
+ useridMatch.Add($"{node.Value}");
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ case bool when node.Path.Contains("code"):
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{node.Value}"))
|
|
|
+ {
|
|
|
+ if (long.TryParse($"{node.Value}", out long _id))
|
|
|
+ {
|
|
|
+ useridMatch.Add($"{node.Value}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ string[] codes = $"{node.Value}".Split("-");
|
|
|
+ foreach (var _code in codes)
|
|
|
+ {
|
|
|
+ if (long.TryParse(_code, out long _codeid))
|
|
|
+ {
|
|
|
+ useridMatch.Add($"{_code}");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+
|
|
|
{
|
|
|
var nodes_id_token = selection.SelectNodes("$.request.id_token");
|
|
|
if (nodes_id_token.Count()>0)
|
|
|
@@ -353,91 +447,202 @@ namespace TEAMModelOS.Controllers
|
|
|
}
|
|
|
}
|
|
|
// }
|
|
|
+ */
|
|
|
}
|
|
|
if (string.IsNullOrWhiteSpace(vist.school))
|
|
|
{
|
|
|
var untyped = new JsonParser().Parse(log.param.GetRawText());
|
|
|
var selection = new JsonPathSelection(untyped);
|
|
|
+
|
|
|
+ string path = "$..[school,id,schoolId,schoolid,schoolCode,school_code,schoolcode,code]";
|
|
|
+ var nodes_path = selection.SelectNodes(path);
|
|
|
+ foreach (var node in nodes_path)
|
|
|
{
|
|
|
- var nodes_school = selection.SelectNodes("$.request.school");
|
|
|
- if (nodes_school.Count()>0)
|
|
|
+ // 只获取是字符串的
|
|
|
+ if (node.Value is string)
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_school[0].Value}") && $"{nodes_school[0].Value}".Length<=8)
|
|
|
+ switch (true)
|
|
|
{
|
|
|
- schoolMatch.Add($"{nodes_school[0].Value}");
|
|
|
+ case bool when node.Path.Contains("school")||node.Path.Contains("id")||node.Path.Contains("schoolId")
|
|
|
+ ||node.Path.Contains("schoolid")||node.Path.Contains("schoolCode")||node.Path.Contains("school_code")||node.Path.Contains("schoolcode"):
|
|
|
+ { break; }
|
|
|
+ case bool when node.Path.Contains("code"):
|
|
|
+ {
|
|
|
+ if (!$"{node.Value}".Contains("-")&& $"{node.Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{node.Value}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ string[] codes = $"{node.Value}".Split("-");
|
|
|
+ foreach (var _code in codes)
|
|
|
+ {
|
|
|
+ if ($"{node.Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{_code}");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
- var nodes_id = selection.SelectNodes("$.request.id");
|
|
|
- if (nodes_id.Count()>0)
|
|
|
+
|
|
|
+ /*
|
|
|
+ {
|
|
|
+ var nodes_school = selection.SelectNodes("$.request.school");
|
|
|
+ if (nodes_school.Count()>0)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_school[0].Value}") && $"{nodes_school[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_school[0].Value}");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var nodes_id = selection.SelectNodes("$.request.id");
|
|
|
+ if (nodes_id.Count()>0)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_id[0].Value}") && $"{nodes_id[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_id[0].Value}");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var nodes_schoolId = selection.SelectNodes("$.request.schoolId");
|
|
|
+ if (nodes_schoolId.Count()>0)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_schoolId[0].Value}") && $"{nodes_schoolId[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_schoolId[0].Value}");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var nodes_schoolid = selection.SelectNodes("$.request.schoolid");
|
|
|
+ if (nodes_schoolid.Count()>0)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_schoolid[0].Value}") && $"{nodes_schoolid[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_schoolid[0].Value}");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var nodes_schoolCode = selection.SelectNodes("$.request.schoolCode");
|
|
|
+ if (nodes_schoolCode.Count()>0)
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_schoolCode[0].Value}") && $"{nodes_schoolCode[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_schoolCode[0].Value}");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var nodes_school_code = selection.SelectNodes("$.request.school_code");
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_school_code[0].Value}") && $"{nodes_school_code[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_school_code[0].Value}");
|
|
|
+ }
|
|
|
+ var nodes_schoolcode = selection.SelectNodes("$.request.schoolcode");
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_schoolcode[0].Value}") && $"{nodes_schoolcode[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add($"{nodes_schoolcode[0].Value}");
|
|
|
+ }
|
|
|
+ var nodes_code = selection.SelectNodes("$.request.code");
|
|
|
+ if (!string.IsNullOrWhiteSpace($"{nodes_code[0].Value}"))
|
|
|
+ {
|
|
|
+ if (!$"{nodes_code[0].Value}".Contains("-")&& $"{nodes_code[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ //vist.userId=$"{nodes_code[0].Value}";
|
|
|
+ schoolMatch.Add($"{nodes_code[0].Value}");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ string[] codes = $"{nodes_code[0].Value}".Split("-");
|
|
|
+ foreach (var _code in codes)
|
|
|
+ {
|
|
|
+ if ($"{nodes_code[0].Value}".Length<=8)
|
|
|
+ {
|
|
|
+ schoolMatch.Add(vist.userId=$"{_code}");
|
|
|
+ // vist.userId=$"{_code}";
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ */
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ uuidInfo.Add((uuid, useridMatch, schoolMatch));
|
|
|
+ vists.Add(vist);
|
|
|
+ //补全站点
|
|
|
+ {
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teammodelos-yx.chinacloudsites.cn")||log.host.Equals("teammodelos.chinacloudsites.cn")
|
|
|
+ ||log.host.Equals("yx.teammodel.cn")||log.host.Equals("scyx.teammodel.cn") ||log.host.Equals("jinniu.teammodel.cn")))
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_id[0].Value}") && $"{nodes_id[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- schoolMatch.Add($"{nodes_id[0].Value}");
|
|
|
- }
|
|
|
+ log.host="www.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_schoolId = selection.SelectNodes("$.request.schoolId");
|
|
|
- if (nodes_schoolId.Count()>0)
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teammodelos-rc.chinacloudsites.cn")))
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_schoolId[0].Value}") && $"{nodes_schoolId[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- schoolMatch.Add($"{nodes_schoolId[0].Value}");
|
|
|
- }
|
|
|
+ log.host="rc.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_schoolid = selection.SelectNodes("$.request.schoolid");
|
|
|
- if (nodes_schoolid.Count()>0)
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teammodelos-test.chinacloudsites.cn") || log.host.Equals("zhiyin-test.teammodel.cn")))
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_schoolid[0].Value}") && $"{nodes_schoolid[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- schoolMatch.Add($"{nodes_schoolid[0].Value}");
|
|
|
- }
|
|
|
+ log.host="test.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_schoolCode = selection.SelectNodes("$.request.schoolCode");
|
|
|
- if (nodes_schoolCode.Count()>0)
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teammodelbi-test.chinacloudsites.cn")))
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_schoolCode[0].Value}") && $"{nodes_schoolCode[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- schoolMatch.Add($"{nodes_schoolCode[0].Value}");
|
|
|
- }
|
|
|
+ log.host="bitest.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_school_code = selection.SelectNodes("$.request.school_code");
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_school_code[0].Value}") && $"{nodes_school_code[0].Value}".Length<=8)
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teammodelbi.chinacloudsites.cn")))
|
|
|
{
|
|
|
- schoolMatch.Add($"{nodes_school_code[0].Value}");
|
|
|
+ log.host="bi.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_schoolcode = selection.SelectNodes("$.request.schoolcode");
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_schoolcode[0].Value}") && $"{nodes_schoolcode[0].Value}".Length<=8)
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("teamcontest.chinacloudsites.cn")))
|
|
|
{
|
|
|
- schoolMatch.Add($"{nodes_schoolcode[0].Value}");
|
|
|
+ log.host="bi.teammodel.cn";
|
|
|
}
|
|
|
- var nodes_code = selection.SelectNodes("$.request.code");
|
|
|
- if (!string.IsNullOrWhiteSpace($"{nodes_code[0].Value}"))
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("contest.chinacloudsites.cn")))
|
|
|
{
|
|
|
- if (!$"{nodes_code[0].Value}".Contains("-")&& $"{nodes_code[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- //vist.userId=$"{nodes_code[0].Value}";
|
|
|
- schoolMatch.Add($"{nodes_code[0].Value}");
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- string[] codes = $"{nodes_code[0].Value}".Split("-");
|
|
|
- foreach (var _code in codes)
|
|
|
- {
|
|
|
- if ($"{nodes_code[0].Value}".Length<=8)
|
|
|
- {
|
|
|
- schoolMatch.Add(vist.userId=$"{_code}");
|
|
|
- // vist.userId=$"{_code}";
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+ log.host="contest.teammodel.cn";
|
|
|
+ }
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("contest-test.chinacloudsites.cn")))
|
|
|
+ {
|
|
|
+ log.host="contest-test.teammodel.cn";
|
|
|
+ }
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("hiteachcc.chinacloudsites.cn")))
|
|
|
+ {
|
|
|
+ log.host="hiteachcc.teammodel.cn";
|
|
|
+ }
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("appraisal.chinacloudsites.cn")))
|
|
|
+ {
|
|
|
+ log.host="appraisal.teammodel.cn";
|
|
|
+ }
|
|
|
+ if (!string.IsNullOrWhiteSpace(log.host)
|
|
|
+ &&(log.host.Equals("appraisal-test.chinacloudsites.cn")))
|
|
|
+ {
|
|
|
+ log.host="appraisal-test.teammodel.cn";
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
|
|
|
- uuidInfo.Add((uuid, useridMatch, schoolMatch));
|
|
|
- vists.Add(vist);
|
|
|
+ if (log.host.Equals("localhost") && log.p.Equals("os"))
|
|
|
+ {
|
|
|
+ log.host="test.teammodel.cn";
|
|
|
+ }
|
|
|
+ else if (log.host.Equals("localhost") && ( log.p.Equals("bi")))
|
|
|
+ {
|
|
|
+ log.host="bitest.teammodel.cn";
|
|
|
+ }
|
|
|
+ vist.host= log.host;
|
|
|
}
|
|
|
return (vists, uuidInfo);
|
|
|
}
|
|
|
@@ -1037,7 +1242,7 @@ namespace TEAMModelOS.Controllers
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string MeterRegion { get; set; }
|
|
|
+ // public string MeterRegion { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
@@ -1045,11 +1250,11 @@ namespace TEAMModelOS.Controllers
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public double ConsumedQuantity { get; set; }
|
|
|
+ // public double ConsumedQuantity { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public double ResourceRate { get; set; }
|
|
|
+ // public double ResourceRate { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
@@ -1057,7 +1262,7 @@ namespace TEAMModelOS.Controllers
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string ResourceLocation { get; set; }
|
|
|
+ // public string ResourceLocation { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
@@ -1069,31 +1274,31 @@ namespace TEAMModelOS.Controllers
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string ServiceInfo1 { get; set; }
|
|
|
+ // public string ServiceInfo1 { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string ServiceInfo2 { get; set; }
|
|
|
+ // public string ServiceInfo2 { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string AdditionalInfo { get; set; }
|
|
|
+ // public string AdditionalInfo { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string Tags { get; set; }
|
|
|
+ // public string Tags { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string StoreServiceIdentifier { get; set; }
|
|
|
+ // public string StoreServiceIdentifier { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string DepartmentName { get; set; }
|
|
|
+ // public string DepartmentName { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
- // public string CostCenter { get; set; }
|
|
|
+ // public string CostCenter { get; set; }
|
|
|
/// <summary>
|
|
|
///
|
|
|
/// </summary>
|
|
|
@@ -1117,6 +1322,7 @@ namespace TEAMModelOS.Controllers
|
|
|
/// </summary>
|
|
|
public string client { get; set; }
|
|
|
public string userId { get; set; }
|
|
|
+ public string scope { get; set; }
|
|
|
public string tname { get; set; }
|
|
|
public string school { get; set; }
|
|
|
public string ip { get; set; }
|
|
|
@@ -1144,7 +1350,8 @@ namespace TEAMModelOS.Controllers
|
|
|
public string name { get; set; }
|
|
|
public string school { get; set; }
|
|
|
public string p { get; set; }
|
|
|
- public string ua { get; set; }
|
|
|
- public string referer { get; set; }
|
|
|
+ // public string ua { get; set; }
|
|
|
+ // public string referer { get; set; }
|
|
|
+ public string scope { get; set; }
|
|
|
}
|
|
|
}
|
