From 751731362e5fcf901065c25eaed0319cf7a27cc1 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期三, 01 十二月 2021 13:59:30 +0800
Subject: [PATCH] 掌骏云代理商权限无法正常使用修复
---
web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt | 1
web/Dao/bin/Release/Dao.pdb | 0
web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache | 2
web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache | 2
web/Common/obj/Debug/Common.csproj.AssemblyReference.cache | 0
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt | 1
web/App_Code/obj/Release/App_Code.dll | 0
web/Dao/bin/Release/Dao.dll | 0
web/Model/obj/Debug/Model.pdb | 0
web/Model/bin/Release/Model.dll | 0
web/App_Code/obj/Debug/App_Code.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 1
web/App_Code/obj/Release/App_Code.pdb | 0
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/web/Bin/Common.dll | 0
web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache | 4
web/Common/bin/Release/Common.pdb | 0
web/Model/bin/Release/Model.pdb | 0
web/UMCLib/bin/Release/UMCLib.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache | 4
web/.vs/Web/config/applicationhost.config | 2
web/App_Code/bin/Debug/App_Code.pdb | 0
web/UMCLib/obj/Release/UMCLib.pdb | 0
web/Common/obj/Debug/Common.pdb | 0
web/web/Bin/Common.pdb | 0
web/App_Code/bin/Release/App_Code.dll | 0
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Release/Common.pdb | 0
web/UMCLib/bin/Release/UMCLib.pdb | 0
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/bin/Release/Model.pdb | 0
web/Dao/obj/Debug/Dao.pdb | 0
web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache | 2
web/Lib/Dao.dll | 0
web/web/GwClient.ashx | 22 ++
web/App_Code/bin/Debug/App_Code.dll | 0
web/.vs/Web/v16/.suo | 0
web/Dao/obj/Release/Dao.pdb | 0
web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache | 0
web/Common/obj/Release/Common.dll | 0
web/Model/obj/Release/Model.pdb | 0
web/web/GwClient.aspx | 403 ++++++++++++++++++++++----------------------
web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache | 0
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/UMCLib/obj/Release/UMCLib.dll | 0
web/Dao/obj/Release/Dao.dll | 0
web/Lib/Dao.pdb | 0
web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache | 0
web/web/Bin/Dao.dll | 0
web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache | 0
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 2
web/Model/obj/Release/Model.dll | 0
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache | 2
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Debug/Common.dll | 0
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/App_Code/bin/Release/App_Code.pdb | 0
web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache | 2
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/bin/Release/Model.dll | 0
web/UMCLib/obj/Debug/UMCLib.dll | 0
web/web/Bin/Dao.pdb | 0
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 2
web/UMCLib/bin/Debug/UMCLib.pdb | 0
web/web/Bin/App_Code.dll | 0
web/web/Bin/UMCLib.pdb | 0
web/Dao/bin/Release/Common.dll | 0
web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache | 2
web/Model/bin/Release/Common.dll | 0
web/Lib/Common.dll | 0
web/App_Code/obj/Debug/App_Code.pdb | 0
web/Common/bin/Release/Common.dll | 0
web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt | 1
web/UMCLib/obj/Debug/UMCLib.pdb | 0
web/Lib/Model.pdb | 0
web/Model/bin/Release/Common.pdb | 0
web/Dao/GwClientDao.cs | 2
/dev/null | 66 -------
web/Lib/Common.pdb | 0
web/web/Bin/Model.pdb | 0
web/web/Bin/UMCLib.dll | 0
web/UMCLib/bin/Debug/UMCLib.dll | 0
web/Dao/bin/Release/Common.pdb | 0
web/Common/obj/Release/Common.csproj.AssemblyReference.cache | 0
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 3
web/web/Bin/Model.dll | 0
89 files changed, 231 insertions(+), 295 deletions(-)
diff --git a/web/.vs/Web/config/applicationhost.config b/web/.vs/Web/config/applicationhost.config
index 88fe2ce..3a3a971 100644
--- a/web/.vs/Web/config/applicationhost.config
+++ b/web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@
</site>
<site name="web" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\web" />
+ <virtualDirectory path="/" physicalPath="D:\Company\SMGW_NewWeb\web\web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:60960:localhost" />
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 27e64c2..e7b3fb5 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.dll b/web/App_Code/bin/Debug/App_Code.dll
index 465dc0d..a3d6183 100644
--- a/web/App_Code/bin/Debug/App_Code.dll
+++ b/web/App_Code/bin/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.pdb b/web/App_Code/bin/Debug/App_Code.pdb
index ceaf345..c2f5c6a 100644
--- a/web/App_Code/bin/Debug/App_Code.pdb
+++ b/web/App_Code/bin/Debug/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/bin/Release/App_Code.dll b/web/App_Code/bin/Release/App_Code.dll
index fa57855..4563dce 100644
--- a/web/App_Code/bin/Release/App_Code.dll
+++ b/web/App_Code/bin/Release/App_Code.dll
Binary files differ
diff --git a/web/App_Code/bin/Release/App_Code.pdb b/web/App_Code/bin/Release/App_Code.pdb
index 431422f..835d4e7 100644
--- a/web/App_Code/bin/Release/App_Code.pdb
+++ b/web/App_Code/bin/Release/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
index 0e837c3..eb600d0 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
index c9aaa66..933dd95 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-67fef8bd265e3351d06b7b87fad510aa955c58ab
+73d59a519d75fba02045f94dbe09df43d113619d
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
index d199f1b..5282201 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
+++ b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
@@ -76,3 +76,4 @@
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.dll
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.pdb
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
diff --git a/web/App_Code/obj/Debug/App_Code.dll b/web/App_Code/obj/Debug/App_Code.dll
index 465dc0d..a3d6183 100644
--- a/web/App_Code/obj/Debug/App_Code.dll
+++ b/web/App_Code/obj/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.pdb b/web/App_Code/obj/Debug/App_Code.pdb
index ceaf345..c2f5c6a 100644
--- a/web/App_Code/obj/Debug/App_Code.pdb
+++ b/web/App_Code/obj/Debug/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index a0da3a7..fb4e382 100644
--- a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
index 50200d0..5cda5a2 100644
--- a/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
index 2116c7f..67e55a9 100644
--- a/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
+++ b/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a26ba5f66c756c462f9a4c8af3717767d9eaeff9
+74406b3dfaab2e4511ea31aebcbbc3c8da43a8a3
diff --git a/web/App_Code/obj/Release/App_Code.dll b/web/App_Code/obj/Release/App_Code.dll
index fa57855..4563dce 100644
--- a/web/App_Code/obj/Release/App_Code.dll
+++ b/web/App_Code/obj/Release/App_Code.dll
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.pdb b/web/App_Code/obj/Release/App_Code.pdb
index 431422f..835d4e7 100644
--- a/web/App_Code/obj/Release/App_Code.pdb
+++ b/web/App_Code/obj/Release/App_Code.pdb
Binary files differ
diff --git a/web/Common/bin/Release/Common.dll b/web/Common/bin/Release/Common.dll
index 5c99e85..a0c329f 100644
--- a/web/Common/bin/Release/Common.dll
+++ b/web/Common/bin/Release/Common.dll
Binary files differ
diff --git a/web/Common/bin/Release/Common.pdb b/web/Common/bin/Release/Common.pdb
index 90d07bc..db03453 100644
--- a/web/Common/bin/Release/Common.pdb
+++ b/web/Common/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
index dc189ff..f98c66b 100644
--- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
+++ b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
index 98a5f99..cef899f 100644
--- a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
+++ b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-594ea1d1d31149d5ab62b73514761c3e2fad45a1
-=======
24545a9dc9d59dd930ea24c26e7c09fb3e3a97a3
->>>>>>> Release
diff --git a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
index 8e84547..6543ffd 100644
--- a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
@@ -65,3 +65,4 @@
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
+D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
diff --git a/web/Common/obj/Debug/Common.dll b/web/Common/obj/Debug/Common.dll
index d919721..a1f24d4 100644
--- a/web/Common/obj/Debug/Common.dll
+++ b/web/Common/obj/Debug/Common.dll
Binary files differ
diff --git a/web/Common/obj/Debug/Common.pdb b/web/Common/obj/Debug/Common.pdb
index 3442a51..71e968c 100644
--- a/web/Common/obj/Debug/Common.pdb
+++ b/web/Common/obj/Debug/Common.pdb
Binary files differ
diff --git a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e3ce15b..77d2276 100644
--- a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Common/obj/Release/Common.csproj.AssemblyReference.cache b/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
index 737bb4b..dec21a9 100644
--- a/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
+++ b/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
index 804e21f..d15af69 100644
--- a/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
+++ b/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8fa28965de052cfcbc97baede20ddb9815af4650
+d34782dce186f7104d1081cac4d568756f64a0b0
diff --git a/web/Common/obj/Release/Common.dll b/web/Common/obj/Release/Common.dll
index 5c99e85..a0c329f 100644
--- a/web/Common/obj/Release/Common.dll
+++ b/web/Common/obj/Release/Common.dll
Binary files differ
diff --git a/web/Common/obj/Release/Common.pdb b/web/Common/obj/Release/Common.pdb
index 90d07bc..db03453 100644
--- a/web/Common/obj/Release/Common.pdb
+++ b/web/Common/obj/Release/Common.pdb
Binary files differ
diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index 1d595b4..2e72a86 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -162,7 +162,7 @@
/// <returns></returns>
public bool Update(GwClient item)
{
- return OracleHelper.ExecuteSql("UPDATE GW_CLIENT SET CLIENT_ID=:CLIENT_ID,CLIENT_NAME=:CLIENTNAME,TELEPHONE=:TELEPHONE,ADDRESS=:ADDRESS,COMPANY=:COMPANY,REMARK=:REMARK,PASSWORD=:PASSWORD,AGENT=:AGENT,PERMISSION_DATA=:PERMISSION_DATA,CREATE_TIME=SYSDATE WHERE ID=:Id", OracleHelper.Connection, new OracleParameter(":Id",(object)item.Id), new OracleParameter(":CLIENT_ID", (object)item.ClientID), new OracleParameter(":CLIENTNAME", (object)item.ClientName), new OracleParameter(":TELEPHONE", (object)item.Telephone), new OracleParameter(":ADDRESS", (object)item.Address), new OracleParameter(":COMPANY", (object)item.Company), new OracleParameter(":REMARK", (object)item.Remark), new OracleParameter(":PASSWORD", (object)item.Password), new OracleParameter(":AGENT", (object)item.Agent), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData)) > 0;
+ return OracleHelper.ExecuteSql("UPDATE GW_CLIENT SET CLIENT_ID=:CLIENT_ID,CLIENT_NAME=:CLIENTNAME,TELEPHONE=:TELEPHONE,ADDRESS=:ADDRESS,COMPANY=:COMPANY,REMARK=:REMARK,PASSWORD=:PASSWORD,AGENT=:AGENT,PERMISSION_DATA=:PERMISSION_DATA,CREATE_TIME=SYSDATE WHERE CLIENT_ID=:Id", OracleHelper.Connection, new OracleParameter(":Id",(object)item.ClientID), new OracleParameter(":CLIENT_ID", (object)item.ClientID), new OracleParameter(":CLIENTNAME", (object)item.ClientName), new OracleParameter(":TELEPHONE", (object)item.Telephone), new OracleParameter(":ADDRESS", (object)item.Address), new OracleParameter(":COMPANY", (object)item.Company), new OracleParameter(":REMARK", (object)item.Remark), new OracleParameter(":PASSWORD", (object)item.Password), new OracleParameter(":AGENT", (object)item.Agent), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData)) > 0;
}
public bool Add(GwClient item)
diff --git a/web/Dao/bin/Release/Common.dll b/web/Dao/bin/Release/Common.dll
index d919721..a1f24d4 100644
--- a/web/Dao/bin/Release/Common.dll
+++ b/web/Dao/bin/Release/Common.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Common.pdb b/web/Dao/bin/Release/Common.pdb
index 3442a51..71e968c 100644
--- a/web/Dao/bin/Release/Common.pdb
+++ b/web/Dao/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Dao.dll b/web/Dao/bin/Release/Dao.dll
index b83a002..4769573 100644
--- a/web/Dao/bin/Release/Dao.dll
+++ b/web/Dao/bin/Release/Dao.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Dao.pdb b/web/Dao/bin/Release/Dao.pdb
index 9700585..15300ad 100644
--- a/web/Dao/bin/Release/Dao.pdb
+++ b/web/Dao/bin/Release/Dao.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Model.dll b/web/Dao/bin/Release/Model.dll
index 778e4f5..2982995 100644
--- a/web/Dao/bin/Release/Model.dll
+++ b/web/Dao/bin/Release/Model.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Model.pdb b/web/Dao/bin/Release/Model.pdb
index ec8d672..9987a01 100644
--- a/web/Dao/bin/Release/Model.pdb
+++ b/web/Dao/bin/Release/Model.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index 8afe7d0..d5f6ddb 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index 890d27e..c0e4614 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f6fac231961ef9524115a09b0ce4ecb9c4b2a491
+f49ea4d5ec2d8ff937394d4683aa2e9a9d5935d0
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index 502b9fd..494fccd 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index a43b989..839ea92 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 675b0b1..d3bed3f 100644
--- a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
index 927482e..c7c0395 100644
--- a/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.csproj.CopyComplete b/web/Dao/obj/Release/Dao.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Dao/obj/Release/Dao.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 1d29b54..9b16cba 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0f5612b96640f5138a9eebbd1fdaf6592870e349
+03ac8fb778df47064b4ab65f28af8408156b7fa4
diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
index 9f886fc..a613a38 100644
--- a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
@@ -53,7 +53,6 @@
D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Common.pdb
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.pdb
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Dao.dll
diff --git a/web/Dao/obj/Release/Dao.dll b/web/Dao/obj/Release/Dao.dll
index b83a002..4769573 100644
--- a/web/Dao/obj/Release/Dao.dll
+++ b/web/Dao/obj/Release/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.pdb b/web/Dao/obj/Release/Dao.pdb
index 9700585..15300ad 100644
--- a/web/Dao/obj/Release/Dao.pdb
+++ b/web/Dao/obj/Release/Dao.pdb
Binary files differ
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index d919721..a1f24d4 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index 3442a51..71e968c 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 502b9fd..494fccd 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index a43b989..839ea92 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 4bfe5cb..354f3d0 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index abd7e45..073c468 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/bin/Release/Common.dll b/web/Model/bin/Release/Common.dll
index d919721..a1f24d4 100644
--- a/web/Model/bin/Release/Common.dll
+++ b/web/Model/bin/Release/Common.dll
Binary files differ
diff --git a/web/Model/bin/Release/Common.pdb b/web/Model/bin/Release/Common.pdb
index 3442a51..71e968c 100644
--- a/web/Model/bin/Release/Common.pdb
+++ b/web/Model/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Model/bin/Release/Model.dll b/web/Model/bin/Release/Model.dll
index 778e4f5..2982995 100644
--- a/web/Model/bin/Release/Model.dll
+++ b/web/Model/bin/Release/Model.dll
Binary files differ
diff --git a/web/Model/bin/Release/Model.pdb b/web/Model/bin/Release/Model.pdb
index ec8d672..9987a01 100644
--- a/web/Model/bin/Release/Model.pdb
+++ b/web/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 2743635..8dd191b 100644
--- a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
deleted file mode 100644
index 523105b..0000000
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index f12e6a2..93b5477 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4b3c2f04fb75e599467a9cab9001384a90d8326e
+39dc77968f868863dd739e41a7700ce06bba8c93
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 2a2d851..b76e98b 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -50,8 +50,7 @@
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Lib\Model.dll
D:\Company\SMGW_NewWeb\web\Lib\Model.pdb
-D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
-D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll
index 4bfe5cb..354f3d0 100644
--- a/web/Model/obj/Debug/Model.dll
+++ b/web/Model/obj/Debug/Model.dll
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
index abd7e45..073c468 100644
--- a/web/Model/obj/Debug/Model.pdb
+++ b/web/Model/obj/Debug/Model.pdb
Binary files differ
diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index c46e7dd..ae80e02 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-1fc600291e56e237859fa8b3d953e7128f3b8b31
+c4762145da2a34560c5dc93e2958bfb07137e5f2
diff --git a/web/Model/obj/Release/Model.dll b/web/Model/obj/Release/Model.dll
index 778e4f5..2982995 100644
--- a/web/Model/obj/Release/Model.dll
+++ b/web/Model/obj/Release/Model.dll
Binary files differ
diff --git a/web/Model/obj/Release/Model.pdb b/web/Model/obj/Release/Model.pdb
index ec8d672..9987a01 100644
--- a/web/Model/obj/Release/Model.pdb
+++ b/web/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.dll b/web/UMCLib/bin/Debug/UMCLib.dll
index 1816571..5fa8af4 100644
--- a/web/UMCLib/bin/Debug/UMCLib.dll
+++ b/web/UMCLib/bin/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.pdb b/web/UMCLib/bin/Debug/UMCLib.pdb
index c26dc29..b36fb0d 100644
--- a/web/UMCLib/bin/Debug/UMCLib.pdb
+++ b/web/UMCLib/bin/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Release/UMCLib.dll b/web/UMCLib/bin/Release/UMCLib.dll
index 2e468df..c4dccfe 100644
--- a/web/UMCLib/bin/Release/UMCLib.dll
+++ b/web/UMCLib/bin/Release/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/bin/Release/UMCLib.pdb b/web/UMCLib/bin/Release/UMCLib.pdb
index 67af13a..015c9a8 100644
--- a/web/UMCLib/bin/Release/UMCLib.pdb
+++ b/web/UMCLib/bin/Release/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6109698..54616eb 100644
--- a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
deleted file mode 100644
index 8c728cb..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
index 3bc0822..40c0a9e 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-ba5129b8c35f1e2785f99668fd04dd28b6d68368
-=======
c546f08e5171d2ea11491af4c442ff223c9bb58c
->>>>>>> Release
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
index 855723c..1809220 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -62,4 +62,3 @@
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
diff --git a/web/UMCLib/obj/Debug/UMCLib.dll b/web/UMCLib/obj/Debug/UMCLib.dll
index 1816571..5fa8af4 100644
--- a/web/UMCLib/obj/Debug/UMCLib.dll
+++ b/web/UMCLib/obj/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.pdb b/web/UMCLib/obj/Debug/UMCLib.pdb
index c26dc29..b36fb0d 100644
--- a/web/UMCLib/obj/Debug/UMCLib.pdb
+++ b/web/UMCLib/obj/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
index 21ab02e..841426a 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
index cbad6a9..ed11994 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4e46879d79322e56a42a5667873b8b1effa2932f
+fa96c443ff4c3eda7263ab6de8b0bbba4c306077
diff --git a/web/UMCLib/obj/Release/UMCLib.dll b/web/UMCLib/obj/Release/UMCLib.dll
index 2e468df..c4dccfe 100644
--- a/web/UMCLib/obj/Release/UMCLib.dll
+++ b/web/UMCLib/obj/Release/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.pdb b/web/UMCLib/obj/Release/UMCLib.pdb
index 67af13a..015c9a8 100644
--- a/web/UMCLib/obj/Release/UMCLib.pdb
+++ b/web/UMCLib/obj/Release/UMCLib.pdb
Binary files differ
diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll
index fa57855..4563dce 100644
--- a/web/web/Bin/App_Code.dll
+++ b/web/web/Bin/App_Code.dll
Binary files differ
diff --git a/web/web/Bin/App_Code.pdb b/web/web/Bin/App_Code.pdb
index 431422f..835d4e7 100644
--- a/web/web/Bin/App_Code.pdb
+++ b/web/web/Bin/App_Code.pdb
Binary files differ
diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll
index d919721..a1f24d4 100644
--- a/web/web/Bin/Common.dll
+++ b/web/web/Bin/Common.dll
Binary files differ
diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb
index 3442a51..71e968c 100644
--- a/web/web/Bin/Common.pdb
+++ b/web/web/Bin/Common.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index b83a002..4769573 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 9700585..15300ad 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index 778e4f5..2982995 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index ec8d672..9987a01 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/Release/Publish/web.config b/web/web/Bin/Release/Publish/web.config
deleted file mode 100644
index eaa8087..0000000
--- a/web/web/Bin/Release/Publish/web.config
+++ /dev/null
@@ -1,66 +0,0 @@
-锘�<?xml version="1.0"?>
-<!--
- 娉ㄦ剰: 闄や簡鎵嬪姩缂栬緫姝ゆ枃浠朵互澶栵紝鎮ㄨ繕鍙互浣跨敤
- Web 绠＄悊宸ュ叿鏉ラ厤缃簲鐢ㄧ▼搴忕殑璁剧疆銆傚彲浠ヤ娇鐢� Visual Studio 涓殑
- 鈥滅綉绔欌��->鈥淎sp.Net 閰嶇疆鈥濋�夐」銆�
- 璁剧疆鍜屾敞閲婄殑瀹屾暣鍒楄〃鍦�
- machine.config.comments 涓紝璇ユ枃浠堕�氬父浣嶄簬
- \Windows\Microsoft.Net\Framework\v2.x\Config 涓�
--->
-<configuration>
- <configSections>
- <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
- </configSections>
- <appSettings>
- <add key="CopyID" value="ED-500-37150864-b30b-847a-293a-b25c594581b3"/>
- <add key="Validation" value="FLTk2AuH3fkI2Cg2PxNv3qbedwY6K6NKDUi6VVGB90cIc4IARG4GzDGWJhSJtXAus9AMP5E5yEaSQzNipaPKOp4XESg22bQ5JUkuMXgITRKqHFH22Sc1DMM4l+8pfYjp8HIkQMR1WDspB8jBwGSz846FEtyTdu1S5jtyA2sCVj0="/>
- <add key="appTitle" value="Zjunmedia"/>
- <add key="siteIp" value="127.0.0.1:8084"/>
- <!--瀹㈡埛绔疘P鍜岀鍙�-->
- <add key="serverIp" value="8.129.227.30"/>
- <add key="clientPort" value="8888"/>
- <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=SMGW)));User ID=smgw;Password=smgw2018"/>
- </appSettings>
- <connectionStrings/>
- <system.web>
- <!--
- 璁剧疆 compilation debug="true" 鍙皢璋冭瘯绗﹀彿鎻掑叆
- 宸茬紪璇戠殑椤甸潰涓�備絾鐢变簬杩欎細
- 褰卞搷鎬ц兘锛屽洜姝ゅ彧鍦ㄥ紑鍙戣繃绋嬩腑灏嗘鍊�
- 璁剧疆涓� true銆�
- -->
- <compilation debug="true" targetFramework="4.0">
- <assemblies>
- <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
- <add assembly="System.Data.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
- <add assembly="System.Data.Services.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
- </assemblies>
- </compilation>
- <!--
- 閫氳繃 <authentication> 鑺傚彲浠ラ厤缃� ASP.NET 鐢ㄦ潵
- 璇嗗埆杩涘叆鐢ㄦ埛鐨�
- 瀹夊叏韬唤楠岃瘉妯″紡銆�
- -->
- <authentication mode="Windows"/>
- <!--
- 濡傛灉鍦ㄦ墽琛岃姹傜殑杩囩▼涓嚭鐜版湭澶勭悊鐨勯敊璇紝
- 鍒欓�氳繃 <customErrors> 鑺傚彲浠ラ厤缃浉搴旂殑澶勭悊姝ラ銆傚叿浣撹鏉ワ紝
- 寮�鍙戜汉鍛橀�氳繃璇ヨ妭鍙互閰嶇疆
- 瑕佹樉绀虹殑 html 閿欒椤�
- 浠ヤ唬鏇块敊璇爢鏍堣窡韪��
-
- <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
- <error statusCode="403" redirect="NoAccess.htm" />
- <error statusCode="404" redirect="FileNotFound.htm" />
- </customErrors>
- -->
- <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
- </system.web>
- <!--
- 鍦� Internet 淇℃伅鏈嶅姟 7.0 涓嬭繍琛� ASP.NET AJAX 闇�瑕� system.webServer
- 鑺傘�傚鏃╂湡鐗堟湰鐨� IIS 鏉ヨ鍒欎笉闇�瑕佹鑺傘��
- -->
- <system.serviceModel>
- <serviceHostingEnvironment aspNetCompatibilityEnabled="true"/>
- </system.serviceModel>
-</configuration>
\ No newline at end of file
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index 2e468df..c4dccfe 100644
--- a/web/web/Bin/UMCLib.dll
+++ b/web/web/Bin/UMCLib.dll
Binary files differ
diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb
index 67af13a..015c9a8 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
Binary files differ
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 617bcaf..ccf09d3 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -235,7 +235,16 @@
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))
{
@@ -281,7 +290,16 @@
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))
{
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index 05a73a2..d614ce5 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -1,14 +1,14 @@
-锘�<%@ Page Language="C#" masterpagefile="~/Main.master" AutoEventWireup="true" CodeFile="GwClient.aspx.cs" Inherits="_GwClient" %>
+锘�<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="GwClient.aspx.cs" Inherits="_GwClient" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
<%--<link href="css/plugins/bootstrap-fileinput/fileinput.min.css" rel="stylesheet"/>
<script src="js/plugins/bootstrap-fileinput/fileinput.min.js" type="text/javascript"></script>--%>
<script>
- $(function() {
+ $(function () {
$("#pager").Pager({
pageSize: 20,
- onChange: function(pageIndex, pageSize) {
+ onChange: function (pageIndex, pageSize) {
loadPageList();
}
});
@@ -22,7 +22,7 @@
url: "GwClient.ashx",
type: "POST",
data: { action: "loadGwClientPageList", ClientID: ClientID, ClientName: ClientName, Telephone: Telephone, Agent: Agent, pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
- success: function(result) {
+ success: function (result) {
if (result.OK) {
$("#gwclientTable tbody").html(result.Message.Table);
$("#pager").Pager("setTotalCount", result.Message.TotalCount);
@@ -44,30 +44,30 @@
return pwd;
}
- $(document).ready(function() {
+ $(document).ready(function () {
$("textarea").numberedtextarea();
- $(document).on("click", ".action-query", function() {
+ $(document).on("click", ".action-query", function () {
loadPageList();
});
loadPageList();
- $(document).on("click", ".action-modal-create", function() {
+ $(document).on("click", ".action-modal-create", function () {
$("#clientDialog .modal-title").text("鍒涘缓瀹㈡埛璐︽埛");
$("#clientDialog input").attr("readonly", false);
$("#clientDialog input[name=action]").val("save");
$("#clientDialog").modal("show");
});
- $(document).on("click", ".action-generate-password", function() {
+ $(document).on("click", ".action-generate-password", function () {
$("#password").val(randomString(8));
});
- $(document).on("click", ".action-modal-edit", function() {
+ $(document).on("click", ".action-modal-edit", function () {
$("#clientDialog .modal-title").text("淇敼瀹㈡埛璧勬枡");
$("#clientDialog input[name=action]").val("update");
var id = $(this).data("id");
- $.get("gwclient.ashx?action=get", { clientID: id }, function(r) {
+ $.get("gwclient.ashx?action=get", { clientID: id }, function (r) {
if (r.OK) {
try {
$("#clientDialog #id").val(r.Message.Id);
@@ -80,7 +80,7 @@
$("#clientDialog #remark").val(r.Message.Remark);
var permissionData = $.evalJSON(r.Message.PermissionData);
$("#clientDialog input[name=permissionData]").iCheck("uncheck");
- $.each(permissionData, function(i) {
+ $.each(permissionData, function (i) {
$("#clientDialog input[name=permissionData][value='" + this + "']").iCheck("check");
});
}
@@ -95,9 +95,9 @@
}, "json");
});
- $(document).on("click", ".action-modal-black", function() {
+ $(document).on("click", ".action-modal-black", function () {
var id = $(this).data("id");
- $.get("gwclient.ashx?action=getBlack", { clientID: id }, function(r) {
+ $.get("gwclient.ashx?action=getBlack", { clientID: id }, function (r) {
if (r.OK) {
$("#blackDialog input[name='clientID']").val(id);
$("#blackDialog textarea").val(r.Message);
@@ -109,9 +109,9 @@
}, "json");
});
- $(document).on("click", ".action-modal-white", function() {
+ $(document).on("click", ".action-modal-white", function () {
var id = $(this).data("id");
- $.get("gwclient.ashx?action=getWhite", { clientID: id }, function(r) {
+ $.get("gwclient.ashx?action=getWhite", { clientID: id }, function (r) {
if (r.OK) {
$("#whiteDialog input[name='clientID']").val(id);
$("#whiteDialog textarea").val(r.Message);
@@ -123,12 +123,12 @@
}, "json");
});
- $(document).on("click", ".action-delete", function() {
+ $(document).on("click", ".action-delete", function () {
var id = $(this).data("id");
- mytek.confirm("鏄惁闇�瑕佸垹闄よ瀹㈡埛锛�", "瀹㈡埛鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function(b) {
+ mytek.confirm("鏄惁闇�瑕佸垹闄よ瀹㈡埛锛�", "瀹㈡埛鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function (b) {
if (b) {
- $.post("gwclient.ashx", { action: "delete", clientID: id }, function(r) {
- mytek.alert(r.Message, r.OK, function() {
+ $.post("gwclient.ashx", { action: "delete", clientID: id }, function (r) {
+ mytek.alert(r.Message, r.OK, function () {
window.location.reload();
});
});
@@ -137,23 +137,23 @@
});
$("#blackForm,#whiteForm").ajaxForm({
- success: function(r) {
- mytek.alert(r.Message, r.OK, function() {
+ success: function (r) {
+ mytek.alert(r.Message, r.OK, function () {
$("#whiteDialog,#blackDialog").modal("hide");
});
}
});
$("#clientForm").ajaxForm({
- success: function(r) {
- mytek.alert(r.Message, r.OK, function() {
+ success: function (r) {
+ mytek.alert(r.Message, r.OK, function () {
r.OK && (window.location.reload());
});
}
});
})
-
+
});
</script>
@@ -162,257 +162,250 @@
<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
<div class="modal inmodal fade" id="whiteDialog" tabindex="-1" role="dialog" aria-hidden="true">
<form name="whiteForm" method="post" action="gwclient.ashx?action=updateWhite" id="whiteForm"
- class="form-horizontal">
- <div class="modal-dialog modal-sm">
- <div class="modal-content ">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">
- <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">
- 瀹㈡埛鐧藉悕鍗�
- </h4>
- 瀹㈡埛鐧藉悕鍗曞璇ュ鎴蜂笅鎵�鏈夋帴鍏ヨ处鍙峰潎鏈夋晥<input type="hidden" value="" name="clientID" />
- </div>
- <div class="modal-body">
- <div class="form-group">
- <span class="help-block m-b-none">姣忚涓�涓彿鐮侊紝瀹㈡埛鐧藉悕鍗曞唴鐨勬墜鏈哄彿鐮佸皢涓嶅彈姣忓皬鏃朵笅鍙戞鏁伴檺鍒讹紱 鐧藉悕鍗曟�绘暟灏介噺鎺у埗2000浠ュ唴</span></div>
- <div class="form-group">
- <textarea class="form-control" name="mobileData" rows="6"></textarea>
+ class="form-horizontal">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content ">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">
+ <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ <h4 class="modal-title">瀹㈡埛鐧藉悕鍗�
+ </h4>
+ 瀹㈡埛鐧藉悕鍗曞璇ュ鎴蜂笅鎵�鏈夋帴鍏ヨ处鍙峰潎鏈夋晥<input type="hidden" value="" name="clientID" />
</div>
- </div>
- <div class="modal-footer">
- <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
- 鍙栨秷</button>
+ <div class="modal-body">
+ <div class="form-group">
+ <span class="help-block m-b-none">姣忚涓�涓彿鐮侊紝瀹㈡埛鐧藉悕鍗曞唴鐨勬墜鏈哄彿鐮佸皢涓嶅彈姣忓皬鏃朵笅鍙戞鏁伴檺鍒讹紱 鐧藉悕鍗曟�绘暟灏介噺鎺у埗2000浠ュ唴</span>
+ </div>
+ <div class="form-group">
+ <textarea class="form-control" name="mobileData" rows="6"></textarea>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
+ 鍙栨秷</button>
<button class="btn btn-primary action-save">
淇濆瓨</button>
+ </div>
</div>
</div>
- </div>
</form>
</div>
<div class="modal inmodal fade" id="blackDialog" tabindex="-1" role="dialog" aria-hidden="true">
<form name="blackForm" method="post" action="gwclient.ashx?action=updateBlack" id="blackForm"
- class="form-horizontal">
- <div class="modal-dialog modal-sm">
- <div class="modal-content ">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">
- <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">
- 瀹㈡埛榛戝悕鍗�
- </h4>
- 瀹㈡埛榛戝悕鍗曞璇ュ鎴蜂笅鎵�鏈夋帴鍏ヨ处鍙峰潎鏈夋晥<input type="hidden" value="" name="clientID" />
- </div>
- <div class="modal-body">
- <div class="form-group">
- <span class="help-block m-b-none">姣忚涓�涓彿鐮侊紝瀹㈡埛榛戝悕鍗曞唴鐨勬墜鏈哄彿鐮佸皢鏃犳硶涓嬪彂鐭俊锛� 榛戝悕鍗曟�绘暟灏介噺鎺у埗2000浠ュ唴锛涘闇�鏇村ぇ榛戝悕鍗曪紝璇蜂娇鐢ㄥ叏灞�榛戝悕鍗�</span></div>
- <div class="form-group">
- <textarea class="form-control" name="mobileData" rows="6"> </textarea>
+ class="form-horizontal">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content ">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">
+ <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ <h4 class="modal-title">瀹㈡埛榛戝悕鍗�
+ </h4>
+ 瀹㈡埛榛戝悕鍗曞璇ュ鎴蜂笅鎵�鏈夋帴鍏ヨ处鍙峰潎鏈夋晥<input type="hidden" value="" name="clientID" />
</div>
- </div>
- <div class="modal-footer">
- <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
- 鍙栨秷</button>
+ <div class="modal-body">
+ <div class="form-group">
+ <span class="help-block m-b-none">姣忚涓�涓彿鐮侊紝瀹㈡埛榛戝悕鍗曞唴鐨勬墜鏈哄彿鐮佸皢鏃犳硶涓嬪彂鐭俊锛� 榛戝悕鍗曟�绘暟灏介噺鎺у埗2000浠ュ唴锛涘闇�鏇村ぇ榛戝悕鍗曪紝璇蜂娇鐢ㄥ叏灞�榛戝悕鍗�</span>
+ </div>
+ <div class="form-group">
+ <textarea class="form-control" name="mobileData" rows="6"> </textarea>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
+ 鍙栨秷</button>
<button class="btn btn-primary action-save">
淇濆瓨</button>
+ </div>
</div>
</div>
- </div>
</form>
</div>
<!--鍒涘缓瀹㈡埛璐︽埛闈㈡澘 -->
<div class="modal inmodal fade" id="clientDialog" tabindex="-1" role="dialog" aria-hidden="true">
<form name="clientForm" method="post" action="gwclient.ashx" id="clientForm" class="form-horizontal">
- <div class="modal-dialog modal-lg">
- <div class="modal-content ">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">
- <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">
- 鍒涘缓/淇敼瀹㈡埛
- </h4>
- <input name="action" value="add" type="hidden" />
- <input name="id" id="id" type="hidden" value="" />
- </div>
- <div class="modal-body">
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鐧诲綍璐︽埛
- </label>
- <div class="col-sm-4">
- <input type="text" name="clientID" id="clientID" value="" class="form-control" />
- </div>
- <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
+ <div class="modal-dialog modal-lg">
+ <div class="modal-content ">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">
+ <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ <h4 class="modal-title">鍒涘缓/淇敼瀹㈡埛
+ </h4>
+ <input name="action" value="add" type="hidden" />
+ <input name="id" id="id" type="hidden" value="" />
</div>
+ <div class="modal-body">
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鐧诲綍璐︽埛
+ </label>
+ <div class="col-sm-4">
+ <input type="text" name="clientID" id="clientID" value="" class="form-control" />
+ </div>
+ <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
+ </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鍏徃鍚嶇О(鍏ㄧО)
- </label>
- <div class="col-sm-4">
- <input type="text" name="company" id="company" value="" class="form-control" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鍏徃鍚嶇О(鍏ㄧО)
+ </label>
+ <div class="col-sm-4">
+ <input type="text" name="company" id="company" value="" class="form-control" />
+ </div>
+ <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
</div>
- <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鐧诲綍瀵嗙爜
- </label>
- <div class="col-sm-4">
- <input type="text" name="password" id="password" value="123456" class="form-control" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鐧诲綍瀵嗙爜
+ </label>
+ <div class="col-sm-4">
+ <input type="text" name="password" id="password" value="123456" class="form-control" />
+ </div>
+ <div class="col-sm-6">
+ <a class="btn btn-xs btn-primary action-generate-password ">鐢熸垚瀵嗙爜</a>
+ </div>
</div>
- <div class="col-sm-6">
- <a class="btn btn-xs btn-primary action-generate-password ">鐢熸垚瀵嗙爜</a>
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鑱旂郴浜�</label>
+ <div class="col-sm-4">
+ <input type="text" name="clientName" id="clientName" value="" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鑱旂郴浜�</label>
- <div class="col-sm-4">
- <input type="text" name="clientName" id="clientName" value="" class="form-control" />
+ <div class="form-group ">
+ <label class="control-label col-sm-2">
+ 鑱旂郴鐢佃瘽
+ </label>
+ <div class="col-sm-4">
+ <input type="text" name="telephone" id="telephone" value="" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group ">
- <label class="control-label col-sm-2">
- 鑱旂郴鐢佃瘽
- </label>
- <div class="col-sm-4">
- <input type="text" name="telephone" id="telephone" value="" class="form-control" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鑱旂郴鍦板潃
+ </label>
+ <div class="col-sm-10">
+ <input type="text" name="address" id="address" value="" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鑱旂郴鍦板潃
- </label>
- <div class="col-sm-10">
- <input type="text" name="address" id="address" value="" class="form-control" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 褰掑睘涓氬姟鍛�
+ </label>
+ <div class="col-sm-4">
+ <input type="text" name="agent" id="agent" value="" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 褰掑睘涓氬姟鍛�
- </label>
- <div class="col-sm-4">
- <input type="text" name="agent" id="agent" value="" class="form-control" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">钀ヤ笟鎵х収</label>
+ <div class="col-sm-4">
+ <input type="file" name="txt_file" id="txt_file" class="file-loading" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">钀ヤ笟鎵х収</label>
- <div class="col-sm-4">
- <input type="file" name="txt_file" id="txt_file" class="file-loading" />
- </div>
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 鏉冮檺绠＄悊
- </label>
- <div class="col-sm-10">
- <input type="checkbox" class="icheck-me" value="GwClientList.aspx" name="permissionData" />浠ｇ悊鍟嗙鐞�(*鏄惁鏀寔鍒涘缓涓嬬骇浠ｇ悊)
- <input type="checkbox" class="icheck-me" value="LgSmsDetailReport.aspx" name="permissionData" />鏌ョ湅鐘舵�佹姤鍛�
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鏉冮檺绠＄悊
+ </label>
+ <div class="col-sm-10">
+ <input type="checkbox" class="icheck-me" value="GwClientList.aspx" name="permissionData" />浠ｇ悊鍟嗙鐞�(*鏄惁鏀寔鍒涘缓涓嬬骇浠ｇ悊)
+ <input type="checkbox" class="icheck-me" value="LgSmsDetailReport.aspx" name="permissionData" />鏌ョ湅鐘舵�佹姤鍛�
+ <input type="checkbox" class="icheck-me" value="1" name="permissionData" />鍙戦�佹潈闄�
+ <input type="checkbox" class="icheck-me" value="2" name="permissionData" />鏌ョ湅鏁版嵁鏉冮檺
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 澶囨敞
+ </label>
+ <div class="col-sm-10">
+ <input type="text" name="remark" id="remark" value="" class="form-control" />
+ </div>
</div>
</div>
- <div class="form-group">
- <label class="control-label col-sm-2">
- 澶囨敞
- </label>
- <div class="col-sm-10">
- <input type="text" name="remark" id="remark" value="" class="form-control" />
- </div>
- </div>
- </div>
- <div class="modal-footer">
- <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
- 鍙栨秷</button>
+ <div class="modal-footer">
+ <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
+ 鍙栨秷</button>
<button class="btn btn-primary action-save">
淇濆瓨</button>
+ </div>
</div>
</div>
- </div>
</form>
</div>
<form name="queryForm" method="post" id="queryForm" class="form-inline">
- <div class="form-group">
- <div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
- <input type="text" name="ClientID" id="ClientID" class="form-control" />
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
+ <input type="text" name="ClientID" id="ClientID" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <div class="input-group m-b">
- <span class="input-group-addon">鍏徃鍚嶇О</span>
- <input type="text" name="Company" id="Company" class=" form-control" />
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">鍏徃鍚嶇О</span>
+ <input type="text" name="Company" id="Company" class=" form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <div class="input-group m-b">
- <span class="input-group-addon">鑱旂郴浜�</span>
- <input type="text" name="ClientName" id="ClientName" class="form-control" />
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">鑱旂郴浜�</span>
+ <input type="text" name="ClientName" id="ClientName" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <div class="input-group m-b">
- <span class="input-group-addon">鑱旂郴鐢佃瘽</span>
- <input type="text" name="Telephone" id="Telephone" class="form-control" />
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">鑱旂郴鐢佃瘽</span>
+ <input type="text" name="Telephone" id="Telephone" class="form-control" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <div class="input-group m-b">
- <span class="input-group-addon">涓氬姟鍛�</span>
- <input type="text" name="Agent" id="Agent" class="form-control" style="width:100px"/>
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">涓氬姟鍛�</span>
+ <input type="text" name="Agent" id="Agent" class="form-control" style="width: 100px" />
+ </div>
</div>
- </div>
- <div class="form-group">
- <div class="input-group m-b">
- <input type="button" value="鏌ヨ" class="btn btn-primary action-query" /> 
+ <div class="form-group">
+ <div class="input-group m-b">
+ <input type="button" value="鏌ヨ" class="btn btn-primary action-query" /> 
<input class="btn btn-success action-modal-create" value="鍒涘缓瀹㈡埛" type="button" />
+ </div>
+
</div>
-
- </div>
</form>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover" id="gwclientTable">
<thead>
<tr class="header">
- <th>
- 瀹㈡埛璐﹀彿
+ <th>瀹㈡埛璐﹀彿
</th>
<th>鍏徃鍚嶇О</th>
- <th>
- 鑱旂郴浜�
+ <th>鑱旂郴浜�
</th>
- <th>
- 鑱旂郴鐢佃瘽
+ <th>鑱旂郴鐢佃瘽
</th>
- <th>
- 绱鍏呭��
+ <th>绱鍏呭��
</th>
- <th>
- 涓氬姟鍛�
+ <th>涓氬姟鍛�
</th>
- <th>
- 璁よ瘉鐘舵��
+ <th>璁よ瘉鐘舵��
</th>
- <th>
- 鎿嶄綔
+ <th>鎿嶄綔
</th>
</tr>
</thead>
<tbody>
</tbody>
-
+
</table>
</div>
<div id="pager">
</div>
-
-
+
+
</asp:Content>
-
-
\ No newline at end of file
+
--
Gitblit v1.9.1