wangsheng
2021-12-01 751731362e5fcf901065c25eaed0319cf7a27cc1
掌骏云代理商权限无法正常使用修复
88个文件已修改
4个文件已删除
526 ■■■■■ 已修改文件
web/.vs/Web/config/applicationhost.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/bin/Debug/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/bin/Debug/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/bin/Release/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/bin/Release/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Release/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/App_Code/obj/Release/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/bin/Release/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/bin/Release/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/Common.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Release/Common.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Release/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/obj/Release/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/GwClientDao.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Debug/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Debug/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.csproj.CopyComplete 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/obj/Release/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/bin/Release/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/bin/Release/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Debug/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/bin/Debug/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/bin/Debug/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/bin/Release/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/bin/Release/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Debug/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Release/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/UMCLib/obj/Release/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Release/Publish/web.config 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwClient.ashx 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwClient.aspx 403 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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" />
web/.vs/Web/v16/.suo
Binary files differ
web/App_Code/bin/Debug/App_Code.dll
Binary files differ
web/App_Code/bin/Debug/App_Code.pdb
Binary files differ
web/App_Code/bin/Release/App_Code.dll
Binary files differ
web/App_Code/bin/Release/App_Code.pdb
Binary files differ
web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
Binary files differ
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
67fef8bd265e3351d06b7b87fad510aa955c58ab
73d59a519d75fba02045f94dbe09df43d113619d
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
web/App_Code/obj/Debug/App_Code.dll
Binary files differ
web/App_Code/obj/Debug/App_Code.pdb
Binary files differ
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
Binary files differ
web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
a26ba5f66c756c462f9a4c8af3717767d9eaeff9
74406b3dfaab2e4511ea31aebcbbc3c8da43a8a3
web/App_Code/obj/Release/App_Code.dll
Binary files differ
web/App_Code/obj/Release/App_Code.pdb
Binary files differ
web/Common/bin/Release/Common.dll
Binary files differ
web/Common/bin/Release/Common.pdb
Binary files differ
web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
Binary files differ
web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
<<<<<<< HEAD
594ea1d1d31149d5ab62b73514761c3e2fad45a1
=======
24545a9dc9d59dd930ea24c26e7c09fb3e3a97a3
>>>>>>> Release
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
web/Common/obj/Debug/Common.dll
Binary files differ
web/Common/obj/Debug/Common.pdb
Binary files differ
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
web/Common/obj/Release/Common.csproj.AssemblyReference.cache
Binary files differ
web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
8fa28965de052cfcbc97baede20ddb9815af4650
d34782dce186f7104d1081cac4d568756f64a0b0
web/Common/obj/Release/Common.dll
Binary files differ
web/Common/obj/Release/Common.pdb
Binary files differ
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)
web/Dao/bin/Release/Common.dll
Binary files differ
web/Dao/bin/Release/Common.pdb
Binary files differ
web/Dao/bin/Release/Dao.dll
Binary files differ
web/Dao/bin/Release/Dao.pdb
Binary files differ
web/Dao/bin/Release/Model.dll
Binary files differ
web/Dao/bin/Release/Model.pdb
Binary files differ
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
f6fac231961ef9524115a09b0ce4ecb9c4b2a491
f49ea4d5ec2d8ff937394d4683aa2e9a9d5935d0
web/Dao/obj/Debug/Dao.dll
Binary files differ
web/Dao/obj/Debug/Dao.pdb
Binary files differ
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
Binary files differ
web/Dao/obj/Release/Dao.csproj.CopyComplete
web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
0f5612b96640f5138a9eebbd1fdaf6592870e349
03ac8fb778df47064b4ab65f28af8408156b7fa4
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
web/Dao/obj/Release/Dao.dll
Binary files differ
web/Dao/obj/Release/Dao.pdb
Binary files differ
web/Lib/Common.dll
Binary files differ
web/Lib/Common.pdb
Binary files differ
web/Lib/Dao.dll
Binary files differ
web/Lib/Dao.pdb
Binary files differ
web/Lib/Model.dll
Binary files differ
web/Lib/Model.pdb
Binary files differ
web/Model/bin/Release/Common.dll
Binary files differ
web/Model/bin/Release/Common.pdb
Binary files differ
web/Model/bin/Release/Model.dll
Binary files differ
web/Model/bin/Release/Model.pdb
Binary files differ
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
Binary files differ
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
4b3c2f04fb75e599467a9cab9001384a90d8326e
39dc77968f868863dd739e41a7700ce06bba8c93
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
web/Model/obj/Debug/Model.dll
Binary files differ
web/Model/obj/Debug/Model.pdb
Binary files differ
web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
1fc600291e56e237859fa8b3d953e7128f3b8b31
c4762145da2a34560c5dc93e2958bfb07137e5f2
web/Model/obj/Release/Model.dll
Binary files differ
web/Model/obj/Release/Model.pdb
Binary files differ
web/UMCLib/bin/Debug/UMCLib.dll
Binary files differ
web/UMCLib/bin/Debug/UMCLib.pdb
Binary files differ
web/UMCLib/bin/Release/UMCLib.dll
Binary files differ
web/UMCLib/bin/Release/UMCLib.pdb
Binary files differ
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
Binary files differ
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
<<<<<<< HEAD
ba5129b8c35f1e2785f99668fd04dd28b6d68368
=======
c546f08e5171d2ea11491af4c442ff223c9bb58c
>>>>>>> Release
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
web/UMCLib/obj/Debug/UMCLib.dll
Binary files differ
web/UMCLib/obj/Debug/UMCLib.pdb
Binary files differ
web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
Binary files differ
web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
4e46879d79322e56a42a5667873b8b1effa2932f
fa96c443ff4c3eda7263ab6de8b0bbba4c306077
web/UMCLib/obj/Release/UMCLib.dll
Binary files differ
web/UMCLib/obj/Release/UMCLib.pdb
Binary files differ
web/web/Bin/App_Code.dll
Binary files differ
web/web/Bin/App_Code.pdb
Binary files differ
web/web/Bin/Common.dll
Binary files differ
web/web/Bin/Common.pdb
Binary files differ
web/web/Bin/Dao.dll
Binary files differ
web/web/Bin/Dao.pdb
Binary files differ
web/web/Bin/Model.dll
Binary files differ
web/web/Bin/Model.pdb
Binary files differ
web/web/Bin/Release/Publish/web.config
File was deleted
web/web/Bin/UMCLib.dll
Binary files differ
web/web/Bin/UMCLib.pdb
Binary files differ
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))
        {
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">&times;</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">&times;</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>&nbsp;&nbsp;
                    <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>&nbsp;&nbsp;
                    <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">&times;</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">&times;</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>&nbsp;&nbsp;
                    <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>&nbsp;&nbsp;
                    <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">&times;</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">&times;</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>&nbsp;&nbsp;
                    <div class="modal-footer">
                        <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
                            取消</button>&nbsp;&nbsp;
                    <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" />&nbsp
        <div class="form-group">
            <div class="input-group m-b">
                <input type="button" value="查询" class="btn btn-primary action-query" />&nbsp
            <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>