1.系统账户数据库优化： 修改“账户类型”的数据类型为VARCHAR2(1024)，多个角色时以半角“,”分隔。 加密盐。 密码加密优化；账户...

yzh

2022-06-15 f63d8ead25bdb3c32dacca817a059bd30390e9bc

 web/web/GwSp.ashx

@@ -22,7 +22,7 @@
    private List<GwProduct> _ProductList;

    private int _userId = -1;
    private int _userType = -1;
    private string _userType = "";
    private string _account = "";

    private List<GwOp> OpList
@@ -334,44 +334,44 @@
        {
            foreach (GwSp gwSp in list)
            {
                str1 = str1 + "<tr><td  rowspan=\"1\" ><input type=\"checkbox\"name=\"checkbox\" value=\"" + gwSp.SpID + "\"/></td><td rowspan=\"1\">" + gwSp.SpID + "<div class=\"text-muted\">" + this.GetAPName(gwSp.ApID) + "</div><div class=\"text-muted\">" + this.GetClientName(gwSp.ClientID) + "</div>";
                str1 += "</td>";
                str1 = str1 + "<td>" + (object)this.GetProductToName(gwSp.ProductId) + "</td>";
                //str1 = str1 + "<tr><td  rowspan=\"1\" ><input type=\"checkbox\"name=\"checkbox\" value=\"" + gwSp.SpID + "\"/></td><td rowspan=\"1\">" + gwSp.SpID + "<div class=\"text-muted\">" + this.GetAPName(gwSp.ApID) + "</div><div class=\"text-muted\">" + this.GetClientName(gwSp.ClientID) + "</div>";
                str1 += "<tr><td  rowspan=\"1\" ><input type=\"checkbox\"name=\"checkbox\" value=\"" + gwSp.SpID + "\"/></td><td rowspan=\"1\">" + gwSp.SpID + "</td>";
                str1 += "<td>" + (object)this.GetProductToName(gwSp.ProductId) + "</td>";
                str1 += "<td>" + (object)gwSp.ClientID + "</td>";
                str1 += "<td>" + (object)this.GetClientName(gwSp.ClientID) + "</td>";
                str1 += "<td>" + (object)this.GetAPName(gwSp.ApID) + "</td>";
                if (gwSp.RouterType == 1)
                {
                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-primary btn-xs\">点路由</div>";
                    str1 += "<td rowspan=\"1\"><span class='label label-primary'>通道</span>";
                    str1 += string.Format("<div>移动：{0}</div><div>电信：{1}</div><div>联通：{2}</div>", (object)this.GetOpName(gwSp.CMOPID), (object)this.GetOpName(gwSp.CTOPID), (object)this.GetOpName(gwSp.UNOPID));
                }
                else if (gwSp.RouterType == 3)
                {
                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-success  btn-xs\">组路由</div>";
                    str1 += "<td rowspan=\"1\"><span class='label label-success'>通道组</span>";
                    str1 += string.Format("<div>移动：{0}</div><div>电信：{1}</div><div>联通：{2}</div>", (object)this.GetGroupName(gwSp.CMGroupID), (object)this.GetGroupName(gwSp.CTGroupID), (object)this.GetGroupName(gwSp.CUGroupID));
                }

                if (gwSp.RESEND_STATUS == 1)
                {
                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-primary  btn-xs\">启用失败补发</div>";
                    str1 += "<td rowspan=\"1\"><span class='label label-success'>启用失败补发</span>";
                    //str1 += string.Format("<div>移动：{0}</div><div>电信：{1}</div><div>联通：{2}</div>", (object)this.GetGroupName(gwSp.RESEND_CM_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CU_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CT_GROUPID));
                    //账户页面显示补发通道具体的通道
                }
                else
                {
                    str1 += "<td rowspan=\"1\"><div class=\"btn  btn-danger  btn-xs\">停用失败补发</div>";
                    str1 += "<td rowspan=\"1\"><span class='label label-danger'>停用失败补发</span>";
                }


                string str2 = "<div class=\"text-muted\">" + gwSp.ChargerTypeText + "</div>";
                string str2 = gwSp.ChargerTypeText ;
                if (gwSp.ChargerTypeText == "后付费")
                    str2 = "<div  style=\"color:red\">" + gwSp.ChargerTypeText + "</div>";
                str1 += "<td>" + str2 + "</td>";
                str1 += "<td>" + (object)((double)gwSp.Price / 1000.0) + "</td>";
                //add: yangzh by 2022-03-14 start
                //str1 = str1 + (object)"<td><div class=\"text-muted\">" + (object)(gwSp.Balance / (long)gwSp.Price) + "条/" + (object)((double)gwSp.Balance / 1000.0) + "元</div>";
                str1 = str1 + (object)"<td><div class=\"text-muted\">" + (object)(gwSp.BasicNum + (long)gwSp.GivingNum) + "条 / " + (object)(gwSp.BasicNum) + "条 / " + (object)(gwSp.GivingNum) + "条</div>";
                str1 = str1 + (object)"<td>" + (object)(gwSp.BasicNum + (long)gwSp.GivingNum) + "条 / " + (object)(gwSp.BasicNum) + "条 / " + (object)(gwSp.GivingNum) + "条";
                //add: yangzh by 2022-03-14 end
                str1 = str1 + (object)str2 + "<div class=\"text-muted\">" + (object)((double)gwSp.Price / 1000.0) + "元/条</div>";
                if (context.HasRight("3021"))
                    str1 += string.Format(" <a class=\"btn btn-xs btn-success action-modal-charge\"  data-id=\"{0}\"><i class=\"fa fa-cny\"></i> 充值</a>", (object)gwSp.SpID);
                if (context.HasRight("3022"))
                    str1 += string.Format(" <a class=\" btn btn-success btn-xs action-modal-Acctunchargelog\"  data-id=\"{0}\"><i class=\"fa fa-list-alt\"></i> 充值日志</a>", (object)gwSp.SpID);
                if (gwSp.BalanceThreshold > 0 && !string.IsNullOrEmpty(gwSp.AlarmMobile))
                    str1 = str1 + (object)"<div class=\"text-danger\">" + (object)(gwSp.BalanceThreshold / 1000) + "元(" + gwSp.AlarmMobile + ")</div>";
                str1 += "</td>";
@@ -387,11 +387,17 @@
                // str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status);
                str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status, gwSp.SpID);
                str1 += "</td>";
                str1 += "<td>" + gwSp.CreateTime + "</td>";
                str1 += "<td rowspan=\"1\" class=\"text-right\">";
                if (context.HasRight("3023"))
                    str1 += string.Format(" <a class=\"btn-block btn btn-primary btn-xs action-modal-edit\" data-id=\"{0}\"><i class=\"fa fa-edit\"></i>  编辑</a>", (object)gwSp.SpID);
                str1 += string.Format(" <a class=\"btn-block btn btn-success btn-xs action-create-summary\" data-id=\"{0}\">账号摘要</a>", (object)gwSp.SpID);

                //str1 += string.Format(" <a class=\"btn-block btn btn-success btn-xs action-create-summary\" data-id=\"{0}\">账号摘要</a>", (object)gwSp.SpID);
                str1 = gwSp.Status != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"0\" class=\"action-updateStatus btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i>&nbsp;停用</a> ", (object) gwSp.SpID ) : str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"1\" class=\"action-updateStatus btn  btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i>&nbsp;启用</a> ", (object) gwSp.SpID );
                if (context.HasRight("3021"))
                    str1 += string.Format(" <a class=\"btn btn-xs btn-success action-modal-charge\"  data-id=\"{0}\"><i class=\"fa fa-cny\"></i> 充值</a>", (object)gwSp.SpID);
                if (context.HasRight("3022"))
                    str1 += string.Format(" <a class=\" btn btn-success btn-xs action-modal-Acctunchargelog\"  data-id=\"{0}\"><i class=\"fa fa-list-alt\"></i> 充值日志</a>", (object)gwSp.SpID);
                
                //if (context.HasRight("3024"))
                //    str1 += string.Format(" <a class=\"btn-block btn btn-xs btn-default action-delete\"  data-id=\"{0}\"><i class=\"fa fa-trash\"></i> 删除</a>", (object)gwSp.SpID);
                str1 += "</td>";
@@ -399,7 +405,7 @@
            }
        }
        else
            str1 += "<tr><td colspan=\"14\" style=\"padding-left:5px; text-align: center;\">暂无信息</td></tr>";
            str1 += "<tr><td colspan=\"17\" style=\"padding-left:5px; text-align: center;\">暂无信息</td></tr>";
        return new JsonPageResult(true, (object)new
        {
            Table = str1.ToString(),
@@ -446,7 +452,7 @@
        if (gwAp != null)
        {
            //return string.Format("{0}-{1}", (object)gwAp.ApID, (object)gwAp.ApName);//2021.2.24.wzp变更,后续可以删除
            return string.Format("接入协议:{0}", (object)gwAp.ApName);
            return string.Format("{0}", (object)gwAp.ApName);
        }
        return string.Empty;
    }
@@ -477,7 +483,7 @@
            return string.Empty;
        GwClient gwClient = this.ClientList.Find((Predicate<GwClient>)(client => client.ClientID == clientID));
        if (gwClient != null)
            return string.Format("{0}<div class=\"text-muted\">{1}</div>", (object)gwClient.ClientID, (object)gwClient.ClientName);
            return string.Format("{0}", (object)gwClient.Company);
        return string.Format("{0}", (object)clientID);
    }

@@ -498,8 +504,10 @@
    private string GetStatusText(int status, string spid)
    {
        if (status == 0)
            return string.Format("<span class=\"action-updateStatus btn btn-xs btn-default\" data-status=\"1\" data-spid=\"{0}\">已停用</span>", (object)spid);
        return string.Format("<span class=\"action-updateStatus btn btn-xs  btn-success \" data-status=\"0\" data-spid=\"{0}\">已启用</span>", (object)spid);
                return string.Format("<span class='label label-default'>已停用</span>");
            //return string.Format("<span class=\"action-updateStatus btn btn-xs btn-default\" data-status=\"1\" data-spid=\"{0}\">已停用</span>", (object)spid);
        //return string.Format("<span class=\"action-updateStatus btn btn-xs  btn-success \" data-status=\"0\" data-spid=\"{0}\">已启用</span>", (object)spid);
        return string.Format("<span class='label label-success'>已启用</span>");
    }
    //

@@ -525,10 +533,9 @@
        GwProduct gwProduct = this.ProductList.Find((Predicate<GwProduct>)(bean => productId.Equals(bean.Id) ));
        if (gwProduct != null)
        {
            //return string.Format("{0}-{1}", (object)gwAp.ApID, (object)gwAp.ApName);//2021.2.24.wzp变更,后续可以删除
            return string.Format("{0}", (object)gwProduct.Name);
        }
        return string.Empty;
        return productId;
    }

    private JsonPageResult LoadGwSpPageList(PageContext<SysUser> context)
@@ -598,6 +605,19 @@
        o.Signatures = context.GetString("Signatures");
        o.AuditingMode = context.GetInt("AuditingMode");
        o.DeductPercent = context.GetInt("DeductPercent");
                        
        o.SubPackageNum = context.GetInt("SubPackageNum");
        o.SingleSubmitMinRestrict = context.GetInt("SingleSubmitMinRestrict");
        o.IsDispalyPrice = context.GetInt("IsDispalyPrice");
        o.DeductionMode = context.GetInt("DeductionMode");
        o.IsSendAudit = context.GetInt("IsSendAudit");
        o.BelowNumAudit = context.GetInt("BelowNumAudit");
        o.AboveNumAudit = context.GetInt("AboveNumAudit");
        o.IsCumulativeAudit = context.GetInt("IsCumulativeAudit");
        o.CumulativeAuditNum = context.GetInt("CumulativeAuditNum");
        o.CumulativeAuditTime = context.GetInt("CumulativeAuditTime");
        o.IsSyncChildSendAudit = context.GetInt("IsSyncChildSendAudit");

        if (context.GetInt("RouterType", 1) == 1)
        {
            o.CMOPID = context.GetInt("CMOPID");
@@ -748,6 +768,18 @@
        o.Signatures = context.GetString("signatures");
        string string1 = context.GetString("SpID");
        int @int = context.GetInt("enabled");
            
        o.SubPackageNum = context.GetInt("SubPackageNum");
        o.SingleSubmitMinRestrict = context.GetInt("SingleSubmitMinRestrict");
        o.IsDispalyPrice = context.GetInt("IsDispalyPrice");
        o.DeductionMode = context.GetInt("DeductionMode");
        o.IsSendAudit = context.GetInt("IsSendAudit");
        o.BelowNumAudit = context.GetInt("BelowNumAudit");
        o.AboveNumAudit = context.GetInt("AboveNumAudit");
        o.IsCumulativeAudit = context.GetInt("IsCumulativeAudit");
        o.CumulativeAuditNum = context.GetInt("CumulativeAuditNum");
        o.CumulativeAuditTime = context.GetInt("CumulativeAuditTime");
        o.IsSyncChildSendAudit = context.GetInt("IsSyncChildSendAudit");

        o.VerCodeMode = context.GetInt("VerCodeMode");
        o.ProvincialNetworkMode = context.GetInt("ProvincialNetworkMode");