From d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:49:28 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop
---
web/web/GwClient.ashx | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 617bcaf..3d60023 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -229,13 +229,23 @@
{
int id = Int32.Parse(context.GetString("id"));
string clientID = context.GetString("clientID");
+ string company = context.GetString("company");
string password = context.GetString("password");
string clientName = context.GetString("clientName");
string address = context.GetString("address");
string telephone = context.GetString("telephone");
string remark = context.GetString("remark");
string agent = context.GetString("agent");
- string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(context.GetString("permissionData").Split(','));
+ string data = context.GetString("permissionData");
+ if(data.Contains("1"))
+ {
+ data += ",sp.aspx,GwTaskSmssend,SpPrePattern.aspx";
+ }
+ if(data.Contains("2"))
+ {
+ data += ",molog.aspx,mtlog.aspx#stat,mtlog.aspx,statis.aspx";
+ }
+ string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(data.Split(','));
if (string.IsNullOrEmpty(clientID))
{
@@ -257,6 +267,7 @@
client.Id = id;
client.ClientID = clientID;
+ client.Company = company;
client.Password = password;
client.ClientName = clientName;
client.Address = address;
@@ -275,13 +286,22 @@
{
string clientID = context.GetString("clientID");
string password = context.GetString("password");
- //string clientName = context.GetString("clientName");
+ string clientName = context.GetString("clientName");
string address = context.GetString("address");
string telephone = context.GetString("telephone");
string remark = context.GetString("remark");
string agent = context.GetString("agent");
string company = context.GetString("company");
- string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(context.GetString("permissionData").Split(','));
+ string data = context.GetString("permissionData");
+ if(data.Contains("1"))
+ {
+ data += ",sp.aspx,GwTaskSmssend,SpPrePattern.aspx";
+ }
+ if(data.Contains("2"))
+ {
+ data += ",molog.aspx,mtlog.aspx#stat,mtlog.aspx,statis.aspx";
+ }
+ string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(data.Split(','));
if (string.IsNullOrEmpty(clientID))
{
@@ -347,7 +367,7 @@
client.ClientID = clientID;
client.Password = password;
- //client.ClientName = clientName;
+ client.ClientName = clientName;
client.Address = address;
client.Remark = remark;
client.Telephone = telephone;
--
Gitblit v1.9.1