From 1961452ebc018cf758924f26d9c7aa0b31495227 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 25 十月 2022 16:56:13 +0800
Subject: [PATCH] 开发第三版，主要是修复bug
---
web/Dao/bin/Release/Dao.pdb | 0
web/web/Session.ashx | 20 +++---
web/Dao/bin/Release/Dao.dll | 0
web/Model/bin/Release/Model.dll | 0
web/web/Main.master | 1
web/web/Bin/Common.dll | 0
web/web/GwProduct.aspx | 2
web/Common/bin/Release/Common.pdb | 0
web/Model/bin/Release/Model.pdb | 0
web/UMCLib/bin/Release/UMCLib.dll | 0
web/App_Code/bin/Debug/App_Code.pdb | 0
web/web/Bin/Common.pdb | 0
web/App_Code/bin/Release/App_Code.dll | 0
web/UMCLib/bin/Release/UMCLib.pdb | 0
web/Dao/bin/Release/Model.pdb | 0
web/Model/Model/GwClient.cs | 12 ++--
web/Lib/Dao.dll | 0
web/web/GwClient.ashx | 17 +++--
web/App_Code/bin/Debug/App_Code.dll | 0
web/web/SysRoleMenu.aspx.cs | 5 -
web/.vs/Web/v16/.suo | 0
web/web/GwClient.aspx | 2
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.dll | 0
web/web/GwOrderComplete.aspx | 1
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/web/GwOrder.ashx | 2
web/App_Code/bin/Release/App_Code.pdb | 0
web/Dao/bin/Release/Model.dll | 0
web/web/Bin/Dao.pdb | 0
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/bin/Release/Common.dll | 0
web/web/web.config | 6 +-
web/Lib/Common.dll | 0
web/Common/bin/Release/Common.dll | 0
web/Lib/Model.pdb | 0
web/Model/bin/Release/Common.pdb | 0
web/Dao/GwClientDao.cs | 26 ++++++++
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/UserDao.cs | 77 ++++++++++++-------------
web/Dao/bin/Release/Common.pdb | 0
web/web/Bin/Model.dll | 0
49 files changed, 98 insertions(+), 73 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index f911073..a106e98 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 a02617a..3fe27c7 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 015ea52..251ff8e 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 0cfb1c4..3b45b25 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 315fa9a..f99f566 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/Common/bin/Release/Common.dll b/web/Common/bin/Release/Common.dll
index c17eeb7..75f6ac7 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 8cf945b..caed732 100644
--- a/web/Common/bin/Release/Common.pdb
+++ b/web/Common/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index fe7bc15..661c98b 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -350,12 +350,34 @@
/// <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,AGENT=:AGENT,SALESMAN=:SALESMAN,CUSTOMER_MANAGER=:CUSTOMER_MANAGER,SUPPORT_STAFF=:SUPPORT_STAFF,FINANCIAL_STAFF=:FINANCIAL_STAFF,CHARGE_TYPE=:CHARGE_TYPE,SMS_STATUS_REPORT=:SMS_STATUS_REPORT,MMS_STATUS_REPORT=:MMS_STATUS_REPORT,PERMISSION_DATA=:PERMISSION_DATA, IS_ENABLE_WHITE=:IS_ENABLE_WHITE, IS_ENABLE_BLACK=:IS_ENABLE_BLACK, IS_REMOTE_LOGIN_NOTICE=:IS_REMOTE_LOGIN_NOTICE, IS_MOBILE_CAPTCHA=:IS_MOBILE_CAPTCHA, IS_HIDE_MOBILE=:IS_HIDE_MOBILE, IS_DISPLAY_STATUS=:IS_DISPLAY_STATUS, IS_LOGIN_IP_RESTRICT=:IS_LOGIN_IP_RESTRICT, IS_LOGIN_IP_ALLOW_GATHER=:IS_LOGIN_IP_ALLOW_GATHER, IS_LOGIN_CITY_RESTRICT=:IS_LOGIN_CITY_RESTRICT, IS_LOGIN_CITY_ALLOW_GATHER=:IS_LOGIN_CITY_ALLOW_GATHER,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(":AGENT", (object)item.Agent), new OracleParameter(":SALESMAN", (object)item.Salesman), new OracleParameter(":CUSTOMER_MANAGER", (object)item.CustomerManager), new OracleParameter(":SUPPORT_STAFF", (object)item.SupportStaff), new OracleParameter(":FINANCIAL_STAFF", (object)item.FinancialStaff), new OracleParameter(":CHARGE_TYPE", (object)item.ChargeType), new OracleParameter(":SMS_STATUS_REPORT", (object)item.SmsStatusReport), new OracleParameter(":MMS_STATUS_REPORT", (object)item.MmsStatusReport), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData), new OracleParameter(":IS_ENABLE_WHITE", (object)item.IsEnableWhite), new OracleParameter(":IS_ENABLE_BLACK", (object)item.IsEnableBlack), new OracleParameter(":IS_REMOTE_LOGIN_NOTICE", (object)item.IsRemoteLoginNotice), new OracleParameter(":IS_MOBILE_CAPTCHA", (object)item.IsMobileCaptcha), new OracleParameter(":IS_HIDE_MOBILE", (object)item.IsHideMobile), new OracleParameter(":IS_DISPLAY_STATUS", (object)item.IsDisplayStatus), new OracleParameter(":IS_LOGIN_IP_RESTRICT", (object)item.IsLoginIpRestrict), new OracleParameter(":IS_LOGIN_IP_ALLOW_GATHER", (object)item.IsLoginIpAllowGather), new OracleParameter(":IS_LOGIN_CITY_RESTRICT", (object)item.IsLoginCityRestrict), new OracleParameter(":IS_LOGIN_CITY_ALLOW_GATHER", (object)item.IsLoginCityAllowGather) ) > 0;
+ return OracleHelper.ExecuteSql("UPDATE GW_CLIENT SET CLIENT_ID=:CLIENT_ID,CLIENT_NAME=:CLIENTNAME," +
+ "TELEPHONE=:TELEPHONE,ADDRESS=:ADDRESS,COMPANY=:COMPANY,REMARK=:REMARK,AGENT=:AGENT,SALESMAN=:SALESMAN," +
+ "CUSTOMER_MANAGER=:CUSTOMER_MANAGER,SUPPORT_STAFF=:SUPPORT_STAFF,FINANCIAL_STAFF=:FINANCIAL_STAFF," +
+ "CHARGE_TYPE=:CHARGE_TYPE,SMS_STATUS_REPORT=:SMS_STATUS_REPORT,PERMISSION_DATA=:PERMISSION_DATA, IS_ENABLE_WHITE=:IS_ENABLE_WHITE, IS_ENABLE_BLACK=:IS_ENABLE_BLACK, IS_REMOTE_LOGIN_NOTICE=:IS_REMOTE_LOGIN_NOTICE, IS_MOBILE_CAPTCHA=:IS_MOBILE_CAPTCHA, IS_HIDE_MOBILE=:IS_HIDE_MOBILE, IS_DISPLAY_STATUS=:IS_DISPLAY_STATUS, IS_LOGIN_IP_RESTRICT=:IS_LOGIN_IP_RESTRICT, IS_LOGIN_IP_ALLOW_GATHER=:IS_LOGIN_IP_ALLOW_GATHER, IS_LOGIN_CITY_RESTRICT=:IS_LOGIN_CITY_RESTRICT, IS_LOGIN_CITY_ALLOW_GATHER=:IS_LOGIN_CITY_ALLOW_GATHER,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(":AGENT", (object)item.Agent), new OracleParameter(":SALESMAN", (object)item.Salesman), new OracleParameter(":CUSTOMER_MANAGER", (object)item.CustomerManager), new OracleParameter(":SUPPORT_STAFF", (object)item.SupportStaff), new OracleParameter(":FINANCIAL_STAFF", (object)item.FinancialStaff), new OracleParameter(":CHARGE_TYPE", (object)item.ChargeType), new OracleParameter(":SMS_STATUS_REPORT", (object)item.SmsStatusReport), new OracleParameter(":MMS_STATUS_REPORT", (object)item.MmsStatusReport), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData), new OracleParameter(":IS_ENABLE_WHITE", (object)item.IsEnableWhite), new OracleParameter(":IS_ENABLE_BLACK", (object)item.IsEnableBlack), new OracleParameter(":IS_REMOTE_LOGIN_NOTICE", (object)item.IsRemoteLoginNotice), new OracleParameter(":IS_MOBILE_CAPTCHA", (object)item.IsMobileCaptcha), new OracleParameter(":IS_HIDE_MOBILE", (object)item.IsHideMobile), new OracleParameter(":IS_DISPLAY_STATUS", (object)item.IsDisplayStatus), new OracleParameter(":IS_LOGIN_IP_RESTRICT", (object)item.IsLoginIpRestrict), new OracleParameter(":IS_LOGIN_IP_ALLOW_GATHER", (object)item.IsLoginIpAllowGather), new OracleParameter(":IS_LOGIN_CITY_RESTRICT", (object)item.IsLoginCityRestrict), new OracleParameter(":IS_LOGIN_CITY_ALLOW_GATHER", (object)item.IsLoginCityAllowGather) ) > 0;
}
public bool Add(GwClient item)
{
- return OracleHelper.ExecuteSql("INSERT INTO GW_CLIENT(CLIENT_ID,CLIENT_NAME,TELEPHONE,ADDRESS,AGENT,SALESMAN,CUSTOMER_MANAGER,SUPPORT_STAFF,FINANCIAL_STAFF,CHARGE_TYPE,SMS_STATUS_REPORT,MMS_STATUS_REPORT,COMPANY,REMARK,PASSWORD, SALT, PERMISSION_DATA, IS_ENABLE_WHITE, IS_ENABLE_BLACK, IS_REMOTE_LOGIN_NOTICE, IS_MOBILE_CAPTCHA, IS_HIDE_MOBILE, IS_DISPLAY_STATUS, IS_LOGIN_IP_RESTRICT, IS_LOGIN_IP_ALLOW_GATHER, IS_LOGIN_CITY_RESTRICT, IS_LOGIN_CITY_ALLOW_GATHER,CREATE_TIME,PARENTID,Certification_Status) VALUES(:CLIENTID,:CLIENTNAME,:TELEPHONE,:ADDRESS,:AGENT,:SALESMAN,:CUSTOMER_MANAGER,:SUPPORT_STAFF,:FINANCIAL_STAFF,:CHARGE_TYPE,:SMS_STATUS_REPORT,:MMS_STATUS_REPORT,:COMPANY,:REMARK,:PASSWORD, :SALT,:PERMISSION_DATA, :IS_ENABLE_WHITE, :IS_ENABLE_BLACK, :IS_REMOTE_LOGIN_NOTICE, :IS_MOBILE_CAPTCHA, :IS_HIDE_MOBILE, :IS_DISPLAY_STATUS, :IS_LOGIN_IP_RESTRICT, :IS_LOGIN_IP_ALLOW_GATHER, :IS_LOGIN_CITY_RESTRICT, :IS_LOGIN_CITY_ALLOW_GATHER,SYSDATE,:PARENTID,:Certification_Status)", OracleHelper.Connection, new OracleParameter(":CLIENTID", (object)item.ClientID), new OracleParameter(":CLIENTNAME", (object)item.ClientName), new OracleParameter(":TELEPHONE", (object)item.Telephone), new OracleParameter(":ADDRESS", (object)item.Address), new OracleParameter(":AGENT", (object)item.Agent), new OracleParameter(":SALESMAN", (object)item.Salesman), new OracleParameter(":CUSTOMER_MANAGER", (object)item.CustomerManager), new OracleParameter(":SUPPORT_STAFF", (object)item.SupportStaff), new OracleParameter(":FINANCIAL_STAFF", (object)item.FinancialStaff), new OracleParameter(":CHARGE_TYPE", (object)item.ChargeType), new OracleParameter(":SMS_STATUS_REPORT", (object)item.SmsStatusReport), new OracleParameter(":MMS_STATUS_REPORT", (object)item.MmsStatusReport), new OracleParameter(":COMPANY", (object)item.Company), new OracleParameter(":REMARK", (object)item.Remark), new OracleParameter(":PASSWORD", (object)item.Password), new OracleParameter(":SALT", (object)item.Salt), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData), new OracleParameter(":PARENTID", (object)item.ParentId), new OracleParameter(":Certification_Status", (object)item.Certification_Status), new OracleParameter(":IS_ENABLE_WHITE", (object)item.IsEnableWhite), new OracleParameter(":IS_ENABLE_BLACK", (object)item.IsEnableBlack), new OracleParameter(":IS_REMOTE_LOGIN_NOTICE", (object)item.IsRemoteLoginNotice), new OracleParameter(":IS_MOBILE_CAPTCHA", (object)item.IsMobileCaptcha), new OracleParameter(":IS_HIDE_MOBILE", (object)item.IsHideMobile), new OracleParameter(":IS_DISPLAY_STATUS", (object)item.IsDisplayStatus), new OracleParameter(":IS_LOGIN_IP_RESTRICT", (object)item.IsLoginIpRestrict), new OracleParameter(":IS_LOGIN_IP_ALLOW_GATHER", (object)item.IsLoginIpAllowGather), new OracleParameter(":IS_LOGIN_CITY_RESTRICT", (object)item.IsLoginCityRestrict), new OracleParameter(":IS_LOGIN_CITY_ALLOW_GATHER", (object)item.IsLoginCityAllowGather) ) > 0;
+ return OracleHelper.ExecuteSql("INSERT INTO GW_CLIENT(CLIENT_ID,CLIENT_NAME,TELEPHONE,ADDRESS,AGENT,SALESMAN,CUSTOMER_MANAGER,SUPPORT_STAFF,FINANCIAL_STAFF," +
+ "CHARGE_TYPE,SMS_STATUS_REPORT,COMPANY,REMARK,PASSWORD, SALT, PERMISSION_DATA, IS_ENABLE_WHITE, IS_ENABLE_BLACK, IS_REMOTE_LOGIN_NOTICE, " +
+ "IS_MOBILE_CAPTCHA, IS_HIDE_MOBILE, IS_DISPLAY_STATUS, IS_LOGIN_IP_RESTRICT, IS_LOGIN_IP_ALLOW_GATHER, IS_LOGIN_CITY_RESTRICT, IS_LOGIN_CITY_ALLOW_GATHER," +
+ "CREATE_TIME,CLIENT_PARENTID,Certification_Status) VALUES (:CLIENTID,:CLIENTNAME,:TELEPHONE,:ADDRESS,:AGENT,:SALESMAN,:CUSTOMER_MANAGER,:SUPPORT_STAFF,:FINANCIAL_STAFF," +
+ ":CHARGE_TYPE,:SMS_STATUS_REPORT,:COMPANY,:REMARK,:PASSWORD, :SALT,:PERMISSION_DATA, :IS_ENABLE_WHITE, :IS_ENABLE_BLACK, :IS_REMOTE_LOGIN_NOTICE, " +
+ ":IS_MOBILE_CAPTCHA, :IS_HIDE_MOBILE, :IS_DISPLAY_STATUS, :IS_LOGIN_IP_RESTRICT, :IS_LOGIN_IP_ALLOW_GATHER, :IS_LOGIN_CITY_RESTRICT, :IS_LOGIN_CITY_ALLOW_GATHER,SYSDATE," +
+ ":CLIENT_PARENTID,:Certification_Status)", OracleHelper.Connection, new OracleParameter(":CLIENTID", (object)item.ClientID), new OracleParameter(":CLIENTNAME",
+ (object)item.ClientName), new OracleParameter(":TELEPHONE", (object)item.Telephone), new OracleParameter(":ADDRESS", (object)item.Address),
+ new OracleParameter(":AGENT", (object)item.Agent), new OracleParameter(":SALESMAN", (object)item.Salesman),
+ new OracleParameter(":CUSTOMER_MANAGER", (object)item.CustomerManager), new OracleParameter(":SUPPORT_STAFF", (object)item.SupportStaff),
+ new OracleParameter(":FINANCIAL_STAFF", (object)item.FinancialStaff), new OracleParameter(":CHARGE_TYPE", (object)item.ChargeType),
+ new OracleParameter(":SMS_STATUS_REPORT", (object)item.SmsStatusReport),
+ new OracleParameter(":COMPANY", (object)item.Company), new OracleParameter(":REMARK", (object)item.Remark), new OracleParameter(":PASSWORD", (object)item.Password),
+ new OracleParameter(":SALT", (object)item.Salt), new OracleParameter(":PERMISSION_DATA", (object)item.PermissionData), new OracleParameter(":CLIENT_PARENTID", (object)item.Client_Parentid),
+ new OracleParameter(":Certification_Status", (object)item.Certification_Status), new OracleParameter(":IS_ENABLE_WHITE", (object)item.IsEnableWhite),
+ new OracleParameter(":IS_ENABLE_BLACK", (object)item.IsEnableBlack), new OracleParameter(":IS_REMOTE_LOGIN_NOTICE", (object)item.IsRemoteLoginNotice),
+ new OracleParameter(":IS_MOBILE_CAPTCHA", (object)item.IsMobileCaptcha), new OracleParameter(":IS_HIDE_MOBILE", (object)item.IsHideMobile),
+ new OracleParameter(":IS_DISPLAY_STATUS", (object)item.IsDisplayStatus), new OracleParameter(":IS_LOGIN_IP_RESTRICT", (object)item.IsLoginIpRestrict),
+ new OracleParameter(":IS_LOGIN_IP_ALLOW_GATHER", (object)item.IsLoginIpAllowGather), new OracleParameter(":IS_LOGIN_CITY_RESTRICT", (object)item.IsLoginCityRestrict),
+ new OracleParameter(":IS_LOGIN_CITY_ALLOW_GATHER", (object)item.IsLoginCityAllowGather) ) > 0;
}
public GwClient Get(string clientID)
diff --git a/web/Dao/UserDao.cs b/web/Dao/UserDao.cs
index 3e8e6d3..8cc8cd8 100644
--- a/web/Dao/UserDao.cs
+++ b/web/Dao/UserDao.cs
@@ -1,4 +1,4 @@
-锘�
+锘�
using Common;
using Model;
using Oracle.DataAccess.Client;
@@ -14,7 +14,7 @@
//璐﹀彿澶勭悊
public class UserDao : IDisposable
{
- public bool CheckLogin(string account, string password, SysUser user)//鐢ㄦ埛鐧诲綍
+ public bool CheckLogin(string account, string password,SysUser user)//鐢ㄦ埛鐧诲綍
{
string str1 = ConfigurationManager.AppSettings["CopyID"];
string str2 = "my@smgw" + str1.Substring(str1.Length - 6);
@@ -52,7 +52,7 @@
recordCount = this.ReadCount(reader);
}
//using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * from Sys_User").ToString(), OracleHelper.Connection))
- using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString() ).ToString(), OracleHelper.Connection))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString()).ToString(), OracleHelper.Connection))
{
while (((DbDataReader)reader).Read())
{
@@ -81,7 +81,7 @@
return dictionary;
}
- public Dictionary<string, SysUserMenu> LoadUserRoleMenuList(int userID)
+ public Dictionary<string, SysUserMenu> LoadUserRoleMenuList(int userID)
{
StringBuilder stringBuilder = new StringBuilder();
@@ -95,11 +95,11 @@
stringBuilder.Append(" select sm.* from sys_menu sm ");
stringBuilder.Append(" left join ( ");
stringBuilder.Append(" select distinct * from ( ");
- stringBuilder.Append(" select * from sys_role_menu where role_id = " + list[0] + " ");
+ stringBuilder.Append(" select * from sys_role_menu where role_id ='" + list[0] + "' ");
for (int i = 1; i < list.Count; i++)
{
- stringBuilder.Append(" union (select * from sys_role_menu where role_id = " + list[i] + ") ");
+ stringBuilder.Append(" union (select * from sys_role_menu where role_id = '" + list[i] + "') ");
}
stringBuilder.Append(" ) bb ");
@@ -153,40 +153,40 @@
}
//鏂板姞鐧婚檰鏃ュ織
- public List<SysMenu> LoadSysMenuIDList(int menuid, int menulv)
- {
- List<SysMenu> list = new List<SysMenu>();
- using (OracleDataReader reader = OracleHelper.ExecuteReader("select * from SYS_MENU WHERE MENU_LV=1 ORDER BY MENU_ID", OracleHelper.Connection))
- {
- while (reader != null)
+ public List<SysMenu> LoadSysMenuIDList(int menuid, int menulv)
{
- if (((DbDataReader) reader).Read())
- list.Add(this.ReadSysMenu(reader));
- else
- break;
+ List<SysMenu> list = new List<SysMenu>();
+ using (OracleDataReader reader = OracleHelper.ExecuteReader("select * from SYS_MENU WHERE MENU_LV=1 ORDER BY MENU_ID", OracleHelper.Connection))
+ {
+ while (reader != null)
+ {
+ if (((DbDataReader)reader).Read())
+ list.Add(this.ReadSysMenu(reader));
+ else
+ break;
+ }
+ }
+ return list;
}
- }
- return list;
- }
- public SysMenu GetMenuID(int refid)
- {
- SysMenu sysMenu = new SysMenu();
- using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from SYS_MENU WHERE MENU_ID=:MENU_ID"), OracleHelper.Connection, new OracleParameter(":MENU_ID", (object)refid)))
- {
- if (((DbDataReader)reader).Read())
- {
- sysMenu = this.ReadSysMenu(reader);
- return sysMenu;
- }
- }
- return sysMenu;
- }
+ public SysMenu GetMenuID(int refid)
+ {
+ SysMenu sysMenu = new SysMenu();
+ using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from SYS_MENU WHERE MENU_ID=:MENU_ID"), OracleHelper.Connection, new OracleParameter(":MENU_ID", (object)refid)))
+ {
+ if (((DbDataReader)reader).Read())
+ {
+ sysMenu = this.ReadSysMenu(reader);
+ return sysMenu;
+ }
+ }
+ return sysMenu;
+ }
-//
+ //
private SysMenu ReadSysMenu(OracleDataReader reader)
{
@@ -210,7 +210,6 @@
e.Salt = oracleReaderWrapper.GetString("SALT", "");
e.UserName = oracleReaderWrapper.GetString("USER_NAME", "");
e.UserType = oracleReaderWrapper.GetString("USER_TYPE", "");
- e.RoleNames = oracleReaderWrapper.GetString("ROLE_NAMES", "");
e.ExpireTime = oracleReaderWrapper.GetDateTime("EXPIRE_TIME");
e.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
e.Remark = oracleReaderWrapper.GetString("REMARK", "");
@@ -297,14 +296,14 @@
{
//return Convert.ToInt32(OracleHelper.ExecuteScalar("select COUNT(*) from SYS_USER WHERE USER_NAME=:USER_NAME AND USER_ID!=:USER_ID", OracleHelper.Connection, new OracleParameter(":USER_NAME", (object)userName), new OracleParameter(":USER_ID", (object)userId))) > 0;
- using (OracleDataReader reader = OracleHelper.ExecuteReader("select * from SYS_USER WHERE USER_NAME=:USER_NAME ", OracleHelper.Connection, new OracleParameter(":USER_NAME", (object)userName) ))
+ using (OracleDataReader reader = OracleHelper.ExecuteReader("select * from SYS_USER WHERE USER_NAME=:USER_NAME ", OracleHelper.Connection, new OracleParameter(":USER_NAME", (object)userName)))
{
while (((DbDataReader)reader).Read())
{
SysUser e = new SysUser();
if (this.ReadInfo(reader, e))
{
- if(e.UserID!= userId)
+ if (e.UserID != userId)
{
return true;
}
@@ -317,7 +316,7 @@
public bool Update(SysUser o)//淇敼璐﹀彿
{
- return OracleHelper.ExecuteSql("update SYS_USER SET ACCOUNT=:ACCOUNT, USER_NAME=:USER_NAME,USER_TYPE=:USER_TYPE,EXPIRE_TIME=:EXPIRE_TIME,REMARK=:REMARK,MOBILE=:MOBILE,EMAIL=:EMAIL,MOBILE_FLAG=:MOBILE_FLAG,EMAIL_FLAG=:EMAIL_FLAG,ISENCRYPTION=:ISENCRYPTION,ISVERIFICATION=:ISVERIFICATION,CLIENTIP=:CLIENTIP,CREATE_TIME=:CREATE_TIME WHERE USER_ID=:USER_ID", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)o.Account), new OracleParameter(":USER_NAME", (object)o.UserName), new OracleParameter(":USER_TYPE", (object)o.UserType), new OracleParameter(":EXPIRE_TIME", (object)o.ExpireTime), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":USER_ID", (object)o.UserID), new OracleParameter(":MOBILE", (object)o.Mobile), new OracleParameter(":EMAIL", (object)o.Email), new OracleParameter(":MOBILE_FLAG", (object)o.MobileFlag), new OracleParameter(":EMAIL_FLAG", (object)o.EmailFlag), new OracleParameter(":ISENCRYPTION", (object)o.IsEncryption), new OracleParameter(":ISVERIFICATION", (object)o.IsVerification), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CREATE_TIME", (object)o.CreateTime) ) > 0;
+ return OracleHelper.ExecuteSql("update SYS_USER SET ACCOUNT=:ACCOUNT, USER_NAME=:USER_NAME,USER_TYPE=:USER_TYPE,EXPIRE_TIME=:EXPIRE_TIME,REMARK=:REMARK,MOBILE=:MOBILE,EMAIL=:EMAIL,MOBILE_FLAG=:MOBILE_FLAG,EMAIL_FLAG=:EMAIL_FLAG,ISENCRYPTION=:ISENCRYPTION,ISVERIFICATION=:ISVERIFICATION,CLIENTIP=:CLIENTIP,CREATE_TIME=:CREATE_TIME WHERE USER_ID=:USER_ID", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)o.Account), new OracleParameter(":USER_NAME", (object)o.UserName), new OracleParameter(":USER_TYPE", (object)o.UserType), new OracleParameter(":EXPIRE_TIME", (object)o.ExpireTime), new OracleParameter(":REMARK", (object)o.Remark), new OracleParameter(":USER_ID", (object)o.UserID), new OracleParameter(":MOBILE", (object)o.Mobile), new OracleParameter(":EMAIL", (object)o.Email), new OracleParameter(":MOBILE_FLAG", (object)o.MobileFlag), new OracleParameter(":EMAIL_FLAG", (object)o.EmailFlag), new OracleParameter(":ISENCRYPTION", (object)o.IsEncryption), new OracleParameter(":ISVERIFICATION", (object)o.IsVerification), new OracleParameter(":CLIENTIP", (object)o.ClientIp), new OracleParameter(":CREATE_TIME", (object)o.CreateTime)) > 0;
}
//鏇存柊鐘舵��
@@ -328,7 +327,7 @@
public bool Add(SysUser e)//娣诲姞璐﹀彿
{
- return OracleHelper.ExecuteSql("INSERT INTO SYS_USER(USER_ID,ACCOUNT,PASSWORD, SALT, USER_NAME, USER_TYPE, EXPIRE_TIME,REMARK,MOBILE,EMAIL,MOBILE_FLAG,EMAIL_FLAG,ISENCRYPTION,ISVERIFICATION,CLIENTIP,CREATE_TIME) VALUES(SYS_USER_ID_SEQ.NextVal,:ACCOUNT,:PASSWORD, :SALT, :USER_NAME,:USER_TYPE,:EXPIRE_TIME,:REMARK,:MOBILE,:EMAIL,:MOBILE_FLAG,:EMAIL_FLAG,:ISENCRYPTION,:ISVERIFICATION,:CLIENTIP,:CREATE_TIME)", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)e.Account), new OracleParameter(":PASSWORD", (object)e.Password), new OracleParameter(":SALT", (object)e.Salt), new OracleParameter(":USER_NAME", (object)e.UserName), new OracleParameter(":USER_TYPE", (object)e.UserType), new OracleParameter(":EXPIRE_TIME", (object)e.ExpireTime), new OracleParameter(":REMARK", (object)e.Remark), new OracleParameter(":MOBILE", (object)e.Mobile), new OracleParameter(":EMAIL", (object)e.Email), new OracleParameter(":MOBILE_FLAG", (object)e.MobileFlag), new OracleParameter(":EMAIL_FLAG", (object)e.EmailFlag), new OracleParameter(":ISENCRYPTION", (object)e.IsEncryption), new OracleParameter(":ISVERIFICATION", (object)e.IsVerification), new OracleParameter(":CLIENTIP", (object)e.ClientIp), new OracleParameter(":CREATE_TIME", (object)e.CreateTime) ) > 0;
+ return OracleHelper.ExecuteSql("INSERT INTO SYS_USER(USER_ID,ACCOUNT,PASSWORD, SALT, USER_NAME, USER_TYPE, EXPIRE_TIME,REMARK,MOBILE,EMAIL,MOBILE_FLAG,EMAIL_FLAG,ISENCRYPTION,ISVERIFICATION,CLIENTIP,CREATE_TIME) VALUES(SYS_USER_ID_SEQ.NextVal,:ACCOUNT,:PASSWORD, :SALT, :USER_NAME,:USER_TYPE,:EXPIRE_TIME,:REMARK,:MOBILE,:EMAIL,:MOBILE_FLAG,:EMAIL_FLAG,:ISENCRYPTION,:ISVERIFICATION,:CLIENTIP,:CREATE_TIME)", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)e.Account), new OracleParameter(":PASSWORD", (object)e.Password), new OracleParameter(":SALT", (object)e.Salt), new OracleParameter(":USER_NAME", (object)e.UserName), new OracleParameter(":USER_TYPE", (object)e.UserType), new OracleParameter(":EXPIRE_TIME", (object)e.ExpireTime), new OracleParameter(":REMARK", (object)e.Remark), new OracleParameter(":MOBILE", (object)e.Mobile), new OracleParameter(":EMAIL", (object)e.Email), new OracleParameter(":MOBILE_FLAG", (object)e.MobileFlag), new OracleParameter(":EMAIL_FLAG", (object)e.EmailFlag), new OracleParameter(":ISENCRYPTION", (object)e.IsEncryption), new OracleParameter(":ISVERIFICATION", (object)e.IsVerification), new OracleParameter(":CLIENTIP", (object)e.ClientIp), new OracleParameter(":CREATE_TIME", (object)e.CreateTime)) > 0;
}
public bool UpdatePassword(int userID, string oldPassword, string newPassword)
@@ -339,7 +338,7 @@
//鍔犲瘑鐩愪慨鏀瑰瘑鐮�
public bool UpdatePwd(string account, string password)
{
- return OracleHelper.ExecuteSql("UPDATE SYS_USER SET PASSWORD=:PASSWORD WHERE ACCOUNT=:ACCOUNT", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)account), new OracleParameter(":PASSWORD", (object)password) ) > 0;
+ return OracleHelper.ExecuteSql("UPDATE SYS_USER SET PASSWORD=:PASSWORD WHERE ACCOUNT=:ACCOUNT", OracleHelper.Connection, new OracleParameter(":ACCOUNT", (object)account), new OracleParameter(":PASSWORD", (object)password)) > 0;
}
public void UpdatePermission(int userid, string[] menuIDArray)
diff --git a/web/Dao/bin/Release/Common.dll b/web/Dao/bin/Release/Common.dll
index a695c6b..debaf88 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 1d5053e..be293b9 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 90d8df9..7b8c177 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 3b547a3..3a3a475 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 26cc210..7264827 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 af09172..a844b84 100644
--- a/web/Dao/bin/Release/Model.pdb
+++ b/web/Dao/bin/Release/Model.pdb
Binary files differ
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index 361c7d2..debaf88 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 2a0f9a6..be293b9 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 1aa6c6d..704ba26 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 2232ca0..1f3f2f6 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 c090599..07ff7c1 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 8c37feb..bb7012a 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index 4a167aa..75fdb7f 100644
--- a/web/Model/Model/GwClient.cs
+++ b/web/Model/Model/GwClient.cs
@@ -24,7 +24,7 @@
public string Salt { get; set; } //瀵嗙爜鍔犲瘑鐩�
- private string _parentId;//涓婄骇ID
+ //private string _parentId;//涓婄骇ID //浣滃簾浜�
private Decimal _totalAmount;
private Decimal _balance;
private int _id;
@@ -179,11 +179,11 @@
}
}
- public string ParentId
- {
- get { return this._parentId; }
- set { this._parentId = value; }
- }
+ //public string ParentId
+ //{
+ // get { return this._parentId; }
+ // set { this._parentId = value; }
+ //}
public Decimal TotalAmount
{
diff --git a/web/Model/bin/Release/Common.dll b/web/Model/bin/Release/Common.dll
index a695c6b..debaf88 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 1d5053e..be293b9 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 26cc210..7264827 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 af09172..a844b84 100644
--- a/web/Model/bin/Release/Model.pdb
+++ b/web/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.dll b/web/UMCLib/bin/Debug/UMCLib.dll
index 20b79d8..7b4e055 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 d7fc5d0..dec77ed 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 67a8f18..a3cc276 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 fdd37a0..4c26267 100644
--- a/web/UMCLib/bin/Release/UMCLib.pdb
+++ b/web/UMCLib/bin/Release/UMCLib.pdb
Binary files differ
diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll
index a02617a..3fe27c7 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 015ea52..251ff8e 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 361c7d2..debaf88 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 2a0f9a6..be293b9 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 1aa6c6d..704ba26 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 2232ca0..1f3f2f6 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 c090599..07ff7c1 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 8c37feb..bb7012a 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index 20b79d8..de922c5 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 d7fc5d0..dec77ed 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 d7bd4e7..f4b5ef3 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -158,9 +158,9 @@
str += @"鐧藉悕鍗�";
str += @"</a> ";
- str += string.Format(@"<a class=""action-modal-black btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
- str += @"榛戝悕鍗�";
- str += @"</a> ";
+ //str += string.Format(@"<a class=""action-modal-black btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ //str += @"榛戝悕鍗�";
+ //str += @"</a> ";
//str += string.Format(@"<a class=""action-modal-resetPwd btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
//str += @"閲嶇疆瀵嗙爜";
@@ -419,7 +419,7 @@
string financialStaff = context.GetString("financialStaff");
string chargeType = context.GetString("chargeType");
string smsStatusReport = context.GetString("smsStatusReport");
- string mmsStatusReport = context.GetString("mmsStatusReport");
+
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.MmsStatusReport = string.IsNullOrEmpty(mmsStatusReport) ? 0 : int.Parse(mmsStatusReport);
+
client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
@@ -594,6 +594,11 @@
if (string.IsNullOrEmpty(clientID))
{
throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛屼笖蹇呴』涓哄叕鍙稿悕绉帮紒");
+ }
+
+ if (string.IsNullOrEmpty(company))
+ {
+ throw new AggregateException("鍏徃鍚嶇О涓嶈兘涓虹┖锛屼笖蹇呴』鏄叏绉�");
}
if (string.IsNullOrEmpty(password) || !System.Text.RegularExpressions.Regex.IsMatch(password, @"[a-zA-Z0-9]{4,10}"))
@@ -710,7 +715,7 @@
client.Telephone = telephone;
client.Agent = agent;
client.PermissionData = permissionData;
- client.ParentId = context.OperatorID;
+ client.Client_Parentid = context.OperatorID;
client.Certification_Status = 1;
client.Company = company;
client.CustomerManager = customerManager;
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index a355801..277511f 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -716,7 +716,7 @@
<select name="smsStatusReport" id="smsStatusReport" class="form-control">
<option value="0" >涓嶆樉绀�</option>
<option value="1" >鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</option>
- <option value="2" >鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�</option>
+ <option value="2" >鏄剧ず鍏ㄩ儴鐘舵��</option>
</select>
</div>
</div>
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 041cf20..69e25ce 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -111,7 +111,7 @@
//str1 = str1 + "<td>" + bean.Remark + "</td>";
str1 += "<td class=\"text-right\">";
- str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
+ str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
str1 += "</td>";
str1 += "</tr>";
}
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 5134d50..403c9d4 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -209,7 +209,6 @@
<div id="pagination">
</div>
<div class="footBar">
-
</div>
<div class="modal inmodal fade" id="orderDialog" tabindex="-1" role="dialog" aria-hidden="true">
diff --git a/web/web/GwProduct.aspx b/web/web/GwProduct.aspx
index 516ac10..0551957 100644
--- a/web/web/GwProduct.aspx
+++ b/web/web/GwProduct.aspx
@@ -370,7 +370,7 @@
</div>
<span class="help-block m-b-none">涓�у寲瀹㈡埛鏄寚鐗规畩鎺ㄩ�佺粰瀹㈡埛锛涚郴缁熼粯璁ゆ槸鎸囩郴缁熼粯璁ゅ彲鎺ㄩ�佹墍鏈夊鎴枫��</span>
</div>
- <input type="hidden" class="form-control" name="isDefault" id="isDefault" value="1" />
+ <%--<input type="hidden" class="form-control" name="isDefault" id="isDefault" value="1" />--%>
<div class="form-group">
<label class="col-sm-2 control-label">
鏄惁鍚敤</label>
diff --git a/web/web/Main.master b/web/web/Main.master
index 260f809..6289e78 100644
--- a/web/web/Main.master
+++ b/web/web/Main.master
@@ -44,6 +44,7 @@
<script type="text/javascript" src="/js/jquery-form.js"></script>
<script type="text/javascript" src="/js/jquery.numberedtextarea.js"></script>
<script type="text/javascript" src="/js/mytek-pager.js"></script>
+
<!--缃戦〉鍛戒护鎿嶄綔锛氬澶嶅埗-->
<script type="text/javascript" src="/js/clipboard.min.js"></script>
<script type="text/javascript" src="/js/plugins/layui/layui.js"></script>
diff --git a/web/web/Session.ashx b/web/web/Session.ashx
index cb47d97..f4ad021 100644
--- a/web/web/Session.ashx
+++ b/web/web/Session.ashx
@@ -107,25 +107,25 @@
private JsonPageResult Login(PageContext<SysUser> context)
{
- string a = context.Session["Code"] as string;
- string string1 = context.GetString("code");
- string string2 = context.GetString("account");
- string string3 = context.GetString("password");
+ string sessionCode = context.Session["Code"] as string;
+ string code = context.GetString("code");
+ string account = context.GetString("account");
+ string password = context.GetString("password");
string str = "鐧诲綍鎴愬姛锛�";
int num = 2;
- if (string.IsNullOrEmpty(string2))
+ if (string.IsNullOrEmpty(account))
return new JsonPageResult(false, (object) new
{
Content = "璇疯緭鍏ヨ处鍙峰悗鍐嶇櫥褰曪紒",
Tstatus = num
});
- if (string.IsNullOrEmpty(string3))
+ if (string.IsNullOrEmpty(password))
return new JsonPageResult(false, (object) new
{
Content = "璇疯緭鍏ュ瘑鐮佸悗鍐嶇櫥褰曪紒",
Tstatus = num
});
- if (!string.Equals(a, string1, StringComparison.OrdinalIgnoreCase))
+ if (!string.Equals(sessionCode, code, StringComparison.OrdinalIgnoreCase))
return new JsonPageResult(false, (object) new
{
Content = "楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏ワ紒",
@@ -135,9 +135,9 @@
try
{
- user = this.dao.GetUser(string2);
- string3 += user.Salt;
- if (!this.dao.CheckLogin(string2, string3, user))
+ user = this.dao.GetUser(account);
+ password += user.Salt;
+ if (!this.dao.CheckLogin(account, password, user))
return new JsonPageResult(false, (object)new
{
Content = "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛�",
diff --git a/web/web/SysRoleMenu.aspx.cs b/web/web/SysRoleMenu.aspx.cs
index 6749382..c7a764e 100644
--- a/web/web/SysRoleMenu.aspx.cs
+++ b/web/web/SysRoleMenu.aspx.cs
@@ -1,4 +1,4 @@
-锘�
+锘�
using Common;
using Dao;
using Model;
@@ -18,7 +18,7 @@
protected List<SysDictData> UserRoleList;
protected void Page_Load(object sender, EventArgs e)
- {
+ {
//鏉冮檺鎺у埗
this.CheckRight("112", FailedOperation.ErrorMsgOnly);
@@ -80,4 +80,3 @@
}
}
-
\ No newline at end of file
diff --git a/web/web/web.config b/web/web/web.config
index 6a26f98..7eec02f 100644
--- a/web/web/web.config
+++ b/web/web/web.config
@@ -18,7 +18,7 @@
<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="clientPort" value="6789"/>
<!--IP杞崲鍦板潃杩斿洖鐨勭被鍒細0-鍏ㄥ湴鍧�锛�1-鍥藉缂栫爜锛� 2-鍥藉锛�3-鍦板尯缂栫爜锛�4-鍦板尯鍚嶇О锛�5-鍩庡競鍚嶇О-->
<add key="addressClasses" value="3"/>
<!--鍒濆瀵嗙爜锛氱敤浜庣郴缁熺敤鎴凤紝瀹㈡埛-->
@@ -27,8 +27,8 @@
<!--
<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"/>
-->
- <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=smgwtest;Password=smgwtest"/>
-
+ <!--<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=smgwtest;Password=smgwtest"/>-->
+ <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=ZJUNCLOUD)));User ID=ZJUNCLOUD;Password=Zjun#2022"/>
</appSettings>
<connectionStrings/>
<system.web>
--
Gitblit v1.9.1