优化多项

wzp

2022-11-24 a5b2428bc6ebac0210e4c552f61e7c5e1f1c9134

优化多项

 web/.vs/Web/v16/.suo

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/Model/GwSp.cs

@@ -133,6 +133,11 @@
            }
            set
            {
                if (value.Length >= 20)
                {
                    throw new ArgumentOutOfRangeException("密码超过长度限制！");
                }

                this._password = value;
            }
        }
@@ -427,7 +432,19 @@

        public int ForceSignFlag { get; set; }

        public string ForceSign { get; set; }

        private string _forceSign;
        public string ForceSign
        {
            get { return _forceSign; }
            set {
                if (value.Length >= 20)
                {
                    throw new ArgumentOutOfRangeException("长度超出限制！");
                }
                _forceSign = value;
            }
        }

        public int CombinationMode { get; set; }


 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/GwClient.ashx

@@ -419,7 +419,7 @@
        string financialStaff = context.GetString("financialStaff");
        string chargeType = context.GetString("chargeType");
        string smsStatusReport = context.GetString("smsStatusReport");
        


        string isEnableWhite = context.GetString("isEnableWhite");
        string isEnableBlack = context.GetString("isEnableBlack");
@@ -530,7 +530,7 @@
        client.FinancialStaff = financialStaff;
        client.ChargeType = string.IsNullOrEmpty(chargeType) ? 0 : int.Parse(chargeType);
        client.SmsStatusReport = string.IsNullOrEmpty(smsStatusReport) ? 0 : int.Parse(smsStatusReport);
        


        client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
        client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
@@ -598,6 +598,11 @@
            throw new ArgumentException("客户账号不能为空，且必须为公司名称！");
        }

        if (address.Length >= 150)
        {
            throw new ArgumentException("地址长度超出限制！");
        }

        if (string.IsNullOrEmpty(company))
        {
            throw new AggregateException("公司名称不能为空，且必须是全称");

 web/web/GwClient.aspx

@@ -481,7 +481,7 @@
                document.execCommand('copy');
                element.remove ? element.remove() : element.removeNode(true);
            }
            mytek.alert("复制成功！", false);
            mytek.alert("复制成功！", true);

        });

@@ -703,7 +703,7 @@
                        </div>
                        <div class="form-group">
                            <label class="control-label  col-sm-2">
                                计费方式 <span style="color:red">*</span>
                                结费方式 <span style="color:red">*</span>
                            </label>
                            <div class="col-sm-4">
                                    <select name="chargeType" id="chargeType" class="form-control">
@@ -715,40 +715,17 @@
                        </div>
                        <div class="form-group">
                            <label class="control-label  col-sm-2">
                                短信是否支持显示状态报告 <span style="color:red">*</span>
                                短信是否显示状态报告 <span style="color:red">*</span>
                            </label>
                            <div class="col-sm-4">
                                    <select name="smsStatusReport" id="smsStatusReport" class="form-control">
                                        <option value="0" >不显示</option>
                                        <option value="1" >只显示提交失败为发送失败状态</option>
                                        <option value="2" >显示全部状态</option>
                                        <%--<option value="1" >只显示提交失败为发送失败状态</option>--%>
                                        <option value="2" >显示</option>
                                    </select>
                            </div>
                        </div>
                        <!--
                        <div class="form-group">
                            <label class="control-label  col-sm-2">
                                彩信是否支持显示状态报告 <span style="color:red">*</span>
                            </label>
                            <div class="col-sm-4">
                                    <select name="mmsStatusReport" id="mmsStatusReport" class="form-control">
                                        <option value="0" >不显示</option>
                                        <option value="1" >只显示提交失败为发送失败状态</option>
                                        <option value="2" >显示全部状态状态</option>
                                    </select>
                            </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>
                        </div>
                        -->
                        
                        <div class="form-group">
                            <label class="control-label  col-sm-2">
                                归属客户经理 <span style="color:red">*</span>
@@ -927,7 +904,7 @@
    <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>
                <span class="input-group-addon">客户账户</span>
                <input type="text" name="ClientID" id="ClientID" class="form-control" />
            </div>
        </div>
@@ -976,7 +953,10 @@
        <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" />&nbsp   

                <% if(IsEnable==1) { %>
                <input class="btn btn-success action-modal-create" value="创建客户" type="button" />&nbsp
                <%} %>
            </div>

        </div>
@@ -988,13 +968,13 @@
        <input class="btn btn-danger action-modal-setProduct" value="批量分配个性产品" type="button" />            
        <%} %>
        <input class="btn btn-info action-export" value="导出数据" type="button" />&nbsp;&nbsp;
        <table class="table table-striped table-bordered table-hover" id="gwclientTable">
        <table class="table table-striped table-bordered table-hover" id="gwclientTable" style="margin:10px 0 0 0;">
            <thead>
                <tr class="header">
                    <th>
                        <input type='checkbox' name='checkAll' id='checkAll' />
                    </th>
                    <th>客户账号
                    <th>客户账户
                    </th>
                    <th>公司名称</th>
                    <th>联系人
@@ -1027,7 +1007,7 @@

        </table>
    </div>
    <div id="pager">
    <div id="pager" style="margin:10px 0 0 0;">
    </div>

    <!--批量修改个性产品 -->
@@ -1037,7 +1017,7 @@
                <div class="modal-header">                    
                    <span class="title"><h3>批量分配个性产品</h3></span><a class="close" data-dismiss="modal" aria-hidden="true">×</a> 
                    <span class="text-muted">
                        批量分配个性产品将会更新所有选中的账号的客户，<br />
                        批量分配个性产品将会更新所有选中的账户的客户，<br />
                        确定分配不能取消，请谨慎操作！<br />
                        </span>
                </div>

 web/web/GwOrderAudit.aspx

@@ -239,7 +239,7 @@
        <div class="m-b">
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">客户账号</span>
                    <span class="input-group-addon">客户账户</span>
                    <input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
                </div>
            </div>
@@ -282,7 +282,7 @@
                    
                    <th>短信账号
                    </th>
                    <th>客户账号
                    <th>客户账户
                    </th>
                    <th>公司名称
                    </th>
@@ -354,7 +354,7 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                客户账号</label>
                                客户账户</label>
                            <div class="col-sm-4 ">
                                <!--
                                <select name="clientId" id="clientId" class="form-control">

 web/web/GwOrderComplete.aspx

@@ -125,7 +125,7 @@
        <div class="m-b">
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">客户账号</span>
                    <span class="input-group-addon">客户账户</span>
                    <input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
                </div>
            </div>
@@ -168,7 +168,7 @@
                    
                    <th>短信账号
                    </th>
                    <th>客户账号
                    <th>客户账户
                    </th>
                    <th>公司名称
                    </th>
@@ -239,7 +239,7 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                客户账号</label>
                                客户账户</label>
                            <div class="col-sm-4 ">
                                <!--
                                <select name="clientId" id="clientId" class="form-control">

 web/web/GwSp.aspx

@@ -151,7 +151,7 @@
                else {
                    statusMsg = "【启用】";
                }
                mytek.confirm("是否需要" + statusMsg + "该账户状态？", "是否操作！", function (b) {
                mytek.confirm("是否需要" + statusMsg + "该账号状态？", "是否操作！", function (b) {
                    if (b) {
                        $.post("gwsp.ashx", { action: "updateSpStatus", spid: spid,status:status }, function (r) {
                            mytek.alert(r.Message, r.OK, function () {
@@ -493,7 +493,7 @@
                        关联产品
                    </th>
                    <th>
                        客户账号
                        客户账户
                    </th>
                    <th>
                        公司名称

 web/web/Index.aspx

@@ -134,12 +134,27 @@
                            <li><a href="GwSmResend.aspx" class="J_menuItem">重发短信记录</a> </li>
                            <li><a href="GwRm.aspx" class="J_menuItem">状态报告记录</a> </li>
                            <li><a href="GwRmResend.aspx" class="J_menuItem">正在重推报告</a> </li>

                            <li><a href="gwerror.aspx" class="J_menuItem">客户提交错误代码</a> </li>
                            <%--   <li><a href="SysOperationLog.aspx" class="J_menuItem">系统日志记录</a> </li>--%>

                            <li><a href="AlarmLog.aspx" class="J_menuItem">告警日志记录</a> </li>
                        </ul>
                    </li>

                    <li>
                        <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">客户管理 </span><span class="fa arrow"></span></a>
                        <ul class="nav nav-second-level">
                            <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">客户信息管理</a> </li>
                            <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">停用客户信息管理</a> </li>
                            <li><a href="GwSp.aspx" class="J_menuItem">短信账号管理</a> </li>
                            <li><a href="GwMoRoute.aspx" class="J_menuItem">上行路由配置</a> </li>
                            <!--<li><a href="GwSpChargeLog.aspx" class="J_menuItem">充值记录查询</a> </li>-->
                            <li><a href="GwOrderList.aspx" class="J_menuItem">充值记录查询</a> </li>
                            <li><a href="api.aspx" class="J_menuItem">接口文档下载</a> </li>

                        </ul>
                    </li>

                    <li>
                        <a href="#"><i class="fa fa fa-bar-chart-o"></i><span class="nav-label">数据统计</span><span class="fa arrow"></span></a>
                        <ul class="nav nav-second-level">
@@ -186,18 +201,7 @@
                        </ul>
                    </li>

                    <li>
                        <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">客户管理 </span><span class="fa arrow"></span></a>
                        <ul class="nav nav-second-level">
                            <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">客户信息管理</a> </li>
                            <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">停用客户信息管理</a> </li>
                            <li><a href="GwSp.aspx" class="J_menuItem">短信账号管理</a> </li>
                            <li><a href="GwMoRoute.aspx" class="J_menuItem">上行路由配置</a> </li>
                            <!--<li><a href="GwSpChargeLog.aspx" class="J_menuItem">充值记录查询</a> </li>-->
                            <li><a href="GwOrderList.aspx" class="J_menuItem">充值记录查询</a> </li>

                        </ul>
                    </li>
                    

                    <li>
                        <a href="#">
@@ -224,11 +228,11 @@
                        </ul>
                    </li>
                    <li>
                        <a href="#"><i class="fa fa-home"></i><span class="nav-label">关于网关</span><span class="fa arrow"></span></a>
                        <a href="#"><i class="fa fa-home"></i><span class="nav-label">平台相关</span><span class="fa arrow"></span></a>
                        <ul class="nav nav-second-level">
                            <li><a href="Pinfo.aspx" class="J_menuItem">系统介绍</a> </li>
                            <li><a href="api.aspx" class="J_menuItem">接口文档</a> </li>
                            <li><a href="gwerror.aspx" class="J_menuItem">错误代码</a> </li>
                            
                            
                            <li><a href="VersionHistory.aspx" class="J_menuItem">版本历史</a> </li>
                        </ul>
                    </li>
@@ -252,9 +256,6 @@


                            <ul class="dropdown-menu dropdown-messages">
                                <div>
                                </div>

                                <li>
                                    <div class="text-center link-block">
                                        <a class="J_menuItem" href="alarmlog.aspx">

 web/web/VersionHistory.aspx

@@ -1,9 +1,47 @@
<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="VersionHistory.aspx.cs" Inherits="VersionHistory"%>
<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="VersionHistory.aspx.cs" Inherits="VersionHistory" %>

<asp:Content ID="Content1" ContentPlaceHolderID="title" Runat="Server">
<asp:Content ID="Content1" ContentPlaceHolderID="title" runat="Server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
<asp:Content ID="Content2" ContentPlaceHolderID="head" runat="Server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="content" Runat="Server">
<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">

    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
        <legend>版本更新日志</legend>
    </fieldset>
    <ul class="layui-timeline">
        <li class="layui-timeline-item">
            <i class="layui-icon layui-timeline-axis"></i>
            <div class="layui-timeline-content layui-text">
                <h3 class="layui-timeline-title">2022年11月23日 V3.1.1</h3>
                <p>
                    新增待审核内容可修改
                    <br />
                    优化多项...
                </p>
            </div>
        </li>
        <li class="layui-timeline-item">
            <i class="layui-icon layui-timeline-axis"></i>
            <div class="layui-timeline-content layui-text">
                <h3 class="layui-timeline-title">2022年11月21日 V3.1.0</h3>
                <p>上线新版本</p>
                <ul>
                    <li>账户账号分离管理</li>
                    <li>新增产品功能</li>
                    <li>新增订单管理相关功能</li>
                    <li>新增角色、权限控制等</li>
                </ul>
            </div>
        </li>
        
        <li class="layui-timeline-item">
            <i class="layui-icon layui-timeline-axis"></i>
            <div class="layui-timeline-content layui-text">
                <div class="layui-timeline-title">过去</div>
            </div>
        </li>
    </ul>

</asp:Content>


 web/web/gwspupdate.aspx

@@ -539,7 +539,7 @@
            <thead>
                <tr>
                    <th colspan="4">
                       <%=ActionTitle%> 编辑账户
                       <%=ActionTitle%> 编辑账号
                    </th>
                </tr>
            </thead>
@@ -803,7 +803,7 @@
                    </td>
                    
                    <th>
                        是否自动返还:
                        <span style="color:red">是否自动返还失败的条数:</span>
                    </th>
                    <td>
                        <select name="IsAutoReturn" id="IsAutoReturn">
@@ -815,6 +815,13 @@
                        <span class="highlight">*</span>
                    </td>
                </tr>
                <%--<tr>
                    <th>扣费方式：</th>
                    <td>
                        <input type="radio" class="icheck-me" name="DeductionMode" value="1" <%=(GwSp.DeductionMode==1 ? "checked":"")%>/><label>提交量</label>
                        <input type="radio" class="icheck-me" name="DeductionMode" value="2" <%=(GwSp.DeductionMode==2 ? "checked":"")%> /><label>成功量</label>
                        </td>
                </tr>--%>

            <tr>
                <th>
@@ -1140,11 +1147,7 @@
                        <input type="radio" class="icheck-me" name="IsDispalyPrice" value="0" <%=(GwSp.IsDispalyPrice==0 ? "checked":"")%> /><label>否</label>
                        <input type="radio" class="icheck-me" name="IsDispalyPrice" value="1" <%=(GwSp.IsDispalyPrice==1 ? "checked":"")%> /><label>是</label>
                        </td>
                    <%--<th>扣费方式：</th>
                    <td>
                        <input type="radio" class="icheck-me" name="DeductionMode" value="1" <%=(GwSp.DeductionMode==1 ? "checked":"")%>/><label>提交量</label>
                        <input type="radio" class="icheck-me" name="DeductionMode" value="2" <%=(GwSp.DeductionMode==2 ? "checked":"")%> /><label>成功量</label>
                        </td>--%>
                    
                </tr>
                <%--<tr>
                    <th>发送是否审核：</th>