diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
index b44568a8..ce812254 100644
--- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
+++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
@@ -40,6 +40,9 @@
+
+
diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
index ff190898..1631c4f9 100644
--- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
+++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
@@ -43,7 +43,15 @@ namespace FineUIPro.Web.Personal
this.btnCustomQuery.Hidden = false;
this.lbSystemVersion.Hidden = false;
this.lbSystemVersion.Text = Funs.SystemVersion;
+ this.btnPassRefresh.Hidden = false;
}
+ if (this.CurrUser.UserId == Const.sysglyId)
+ {
+ this.lbSystemVersion.Hidden = false;
+ this.lbSystemVersion.Text = Funs.SystemVersion;
+ this.btnPassRefresh.Hidden = false;
+ }
+
}
}
@@ -154,5 +162,34 @@ namespace FineUIPro.Web.Personal
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/CustomQuery.aspx"), "鏌ヨ"));
}
+
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected void btnPassRefresh_Click(object sender, EventArgs e)
+ {
+ var getUsers = from x in Funs.DB.Sys_User
+ where x.RawPassword == null
+ select x;
+ foreach (var item in getUsers)
+ {
+ string password = Funs.getInitialPassword(item.UnitId, item.IdentityCard);
+ UserService.UpdatePassword(item.UserId, password);
+ }
+
+ var getPersons = from x in Funs.DB.SitePerson_Person
+ where x.RawPassword == null
+ select x;
+ foreach (var item in getPersons)
+ {
+ string password = Funs.getInitialPassword(item.UnitId, item.IdentityCard);
+ PersonService.UpdateSitePersonPassword(item.PersonId, password);
+ }
+
+ ShowNotify("閲嶇疆鎴愬姛锛", MessageBoxIcon.Success);
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs
index 111ddc5e..cb7fe79e 100644
--- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs
@@ -7,11 +7,13 @@
// 鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.Personal {
-
-
- public partial class PersonalInfo {
-
+namespace FineUIPro.Web.Personal
+{
+
+
+ public partial class PersonalInfo
+ {
+
///
/// form1 鎺т欢銆
///
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 鎺т欢銆
///
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// Panel2 鎺т欢銆
///
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Panel Panel2;
-
+
///
/// TabStrip1 鎺т欢銆
///
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TabStrip TabStrip1;
-
+
///
/// Tab1 鎺т欢銆
///
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Tab Tab1;
-
+
///
/// Toolbar1 鎺т欢銆
///
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// lbSystemVersion 鎺т欢銆
///
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Label lbSystemVersion;
-
+
///
/// btnSave 鎺т欢銆
///
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Button btnSave;
-
+
///
/// btnCustomQuery 鎺т欢銆
///
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Button btnCustomQuery;
-
+
+ ///
+ /// btnPassRefresh 鎺т欢銆
+ ///
+ ///
+ /// 鑷姩鐢熸垚鐨勫瓧娈点
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
+ ///
+ protected global::FineUIPro.Button btnPassRefresh;
+
///
/// SimpleForm1 鎺т欢銆
///
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
/// Panel3 鎺т欢銆
///
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Panel Panel3;
-
+
///
/// Panel1 鎺т欢銆
///
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Panel Panel1;
-
+
///
/// txtUserName 鎺т欢銆
///
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtUserName;
-
+
///
/// txtUserCode 鎺т欢銆
///
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtUserCode;
-
+
///
/// drpSex 鎺т欢銆
///
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpSex;
-
+
///
/// dpBirthDay 鎺т欢銆
///
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox dpBirthDay;
-
+
///
/// drpMarriage 鎺т欢銆
///
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpMarriage;
-
+
///
/// drpNation 鎺т欢銆
///
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpNation;
-
+
///
/// drpUnit 鎺т欢銆
///
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpUnit;
-
+
///
/// Panel4 鎺т欢銆
///
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Panel Panel4;
-
+
///
/// txtAccount 鎺т欢銆
///
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtAccount;
-
+
///
/// txtIdentityCard 鎺т欢銆
///
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtIdentityCard;
-
+
///
/// txtEmail 鎺т欢銆
///
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtEmail;
-
+
///
/// txtTelephone 鎺т欢銆
///
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtTelephone;
-
+
///
/// drpEducation 鎺т欢銆
///
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpEducation;
-
+
///
/// txtHometown 鎺т欢銆
///
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox txtHometown;
-
+
///
/// drpPosition 鎺т欢銆
///
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextBox drpPosition;
-
+
///
/// Panel5 鎺т欢銆
///
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Panel Panel5;
-
+
///
/// Image1 鎺т欢銆
///
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Image Image1;
-
+
///
/// Form7 鎺т欢銆
///
@@ -281,7 +292,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Form Form7;
-
+
///
/// txtPerformance 鎺т欢銆
///
@@ -290,7 +301,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.TextArea txtPerformance;
-
+
///
/// Tab2 鎺т欢銆
///
@@ -299,7 +310,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Tab Tab2;
-
+
///
/// SimpleForm2 鎺т欢銆
///
@@ -308,7 +319,7 @@ namespace FineUIPro.Web.Personal {
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲
///
protected global::FineUIPro.Form SimpleForm2;
-
+
///
/// Window1 鎺т欢銆
///
diff --git a/SGGL/FineUIPro.Web/SysManage/UpdatePassword.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UpdatePassword.aspx.cs
index 25998fbe..df43b5f5 100644
--- a/SGGL/FineUIPro.Web/SysManage/UpdatePassword.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UpdatePassword.aspx.cs
@@ -105,7 +105,12 @@
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
- BLL.UserService.UpdatePassword(rowID, BLL.Const.Password);
+ var getUser = UserService.GetUserByUserId(rowID);
+ if (getUser != null)
+ {
+ string password = Funs.getInitialPassword(getUser.UnitId, getUser.IdentityCard);
+ BLL.UserService.UpdatePassword(rowID, password);
+ }
}
BindGrid();
ShowNotify("瀵嗙爜宸查噸缃负鍘熷瀵嗙爜!", MessageBoxIcon.Success);
diff --git a/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx.cs
index 02191048..8fe7e222 100644
--- a/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx.cs
@@ -89,6 +89,22 @@ namespace FineUIPro.Web.SysManage
return;
}
+ if (this.txtNewPassword.Text.Length < 8)
+ {
+ Alert.ShowInParent("瀵嗙爜闀垮害鑷冲皯8浣嶏紒");
+ return;
+ }
+ if (this.txtNewPassword.Text != this.txtConfirmPassword.Text)
+ {
+ Alert.ShowInParent("纭瀵嗙爜杈撳叆涓嶄竴鑷达紒");
+ return;
+ }
+
+ if (!Funs.IsValIDPassword(this.txtNewPassword.Text))
+ {
+ Alert.ShowInParent("瀵嗙爜蹇呴』鍖呭惈瀛楁瘝銆佹暟瀛椼佺壒娈婄鍙凤紒");
+ return;
+ }
BLL.UserService.UpdatePassword(user.UserId, this.txtNewPassword.Text);
BLL.LogService.AddSys_Log(this.CurrUser, "淇敼瀵嗙爜", string.Empty, BLL.Const.UserMenuId, Const.BtnModify);
diff --git a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
index 7dafa755..006086d3 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
@@ -366,7 +366,8 @@ namespace FineUIPro.Web.SysManage
var getUser = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == userViews[i].Account);
if (getUser == null)
{
- newUser.Password = Funs.EncryptionPassword(Const.Password);
+ newUser.RawPassword = Funs.getInitialPassword(newUser.UnitId, newUser.IdentityCard);
+ newUser.Password = Funs.EncryptionPassword(newUser.RawPassword);
BLL.UserService.AddUser(newUser);
insertCount++;
}
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
index 0e3f3929..be42ecc9 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
@@ -235,8 +235,9 @@ namespace FineUIPro.Web.SysManage
}
if (string.IsNullOrEmpty(this.UserId))
{
- newUser.Password = Funs.EncryptionPassword(Const.Password);
- newUser.UserId = SQLHelper.GetNewID(typeof(Model.Sys_User));
+ newUser.RawPassword = Funs.getInitialPassword(newUser.UnitId, newUser.IdentityCard);
+ newUser.Password = Funs.EncryptionPassword(newUser.RawPassword);
+ newUser.UserId = SQLHelper.GetNewID();
newUser.DataSources = this.CurrUser.LoginProjectId;
UserService.AddUser(newUser);
LogService.AddSys_Log(this.CurrUser, newUser.UserCode, newUser.UserId, BLL.Const.UserMenuId, BLL.Const.BtnAdd);
@@ -324,10 +325,12 @@ namespace FineUIPro.Web.SysManage
///
protected void btnArrowRefresh_Click(object sender, EventArgs e)
{
- if (!string.IsNullOrEmpty(this.UserId))
+ var getUser = UserService.GetUserByUserId(this.UserId);
+ if (getUser != null)
{
- BLL.UserService.UpdatePassword(this.UserId, BLL.Const.Password);
- ShowNotify("瀵嗙爜宸查噸缃负鍘熷瀵嗙爜!", MessageBoxIcon.Success);
+ string passWord = Funs.getInitialPassword(getUser.UnitId, getUser.IdentityCard);
+ BLL.UserService.UpdatePassword(this.UserId, passWord);
+ ShowNotify("瀵嗙爜宸查噸缃负鍘熷瀵嗙爜!瀵嗙爜涓" + passWord, MessageBoxIcon.Success);
}
else
{
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index bc0fdc67..10385b46 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -255428,7 +255428,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")]
public string Address
{
get
@@ -255492,7 +255492,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaName
{
get
@@ -257937,6 +257937,8 @@ namespace Model
private System.Nullable
_IsCardNoOK;
+ private string _RawPassword;
+
private EntitySet _Accident_AccidentPersonRecord;
private EntitySet _Accident_AccidentReportOtherItem;
@@ -258117,6 +258119,8 @@ namespace Model
partial void OnRealNameUpdateTimeChanged();
partial void OnIsCardNoOKChanging(System.Nullable value);
partial void OnIsCardNoOKChanged();
+ partial void OnRawPasswordChanging(string value);
+ partial void OnRawPasswordChanged();
#endregion
public SitePerson_Person()
@@ -259365,6 +259369,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RawPassword", DbType="NVarChar(100)")]
+ public string RawPassword
+ {
+ get
+ {
+ return this._RawPassword;
+ }
+ set
+ {
+ if ((this._RawPassword != value))
+ {
+ this.OnRawPasswordChanging(value);
+ this.SendPropertyChanging();
+ this._RawPassword = value;
+ this.SendPropertyChanged("RawPassword");
+ this.OnRawPasswordChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
public EntitySet Accident_AccidentPersonRecord
{
@@ -274254,6 +274278,8 @@ namespace Model
private string _WorkNo;
+ private string _RawPassword;
+
private EntitySet _Comprehensive_NCRManagement;
private EntitySet _Comprehensive_PressurePipe;
@@ -274998,6 +275024,8 @@ namespace Model
partial void OnViceCNProfessionalIdChanged();
partial void OnWorkNoChanging(string value);
partial void OnWorkNoChanged();
+ partial void OnRawPasswordChanging(string value);
+ partial void OnRawPasswordChanged();
#endregion
public Sys_User()
@@ -276322,6 +276350,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RawPassword", DbType="NVarChar(100)")]
+ public string RawPassword
+ {
+ get
+ {
+ return this._RawPassword;
+ }
+ set
+ {
+ if ((this._RawPassword != value))
+ {
+ this.OnRawPasswordChanging(value);
+ this.SendPropertyChanging();
+ this._RawPassword = value;
+ this.SendPropertyChanged("RawPassword");
+ this.OnRawPasswordChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
public EntitySet Comprehensive_NCRManagement
{
@@ -337439,7 +337487,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")]
public string Address
{
get
@@ -337455,7 +337503,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaName
{
get
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index 3f8eebc9..5ffc1bab 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -38,8 +38,8 @@
False
bin\Debug\AOP.Common.dll
-
- ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
@@ -76,6 +76,7 @@
+
diff --git a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
index 4eedd9f9..e187ab33 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
@@ -192,59 +192,62 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
- var getTestPlan = Funs.DB.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now);
- if (getTestPlan != null)
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
- var person = PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
- if (person != null )
+ var getTestPlan = db.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now);
+ if (getTestPlan != null)
{
- //2-鑰冭瘯涓紱鐢熸垚鑰冭瘯璇曞嵎
- if (getTestPlan.States == "2" )
+ var person = PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
+ if (person != null)
{
- var testRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue);
- if (testRecord != null)
+ //2-鑰冭瘯涓紱鐢熸垚鑰冭瘯璇曞嵎
+ if (getTestPlan.States == "2")
{
- string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord.TestRecordId, person);
- responeData.code = 2;
- responeData.data = new { testRecordId };
- }
- }
- else
- {
- if (string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(person.UnitId) && (getTestPlan.WorkPostIds == null || getTestPlan.WorkPostIds.Contains(person.WorkPostId)))
- {
- //0-寰呮彁浜わ紱1-宸插彂甯冩湭鑰冭瘯 灏嗕汉鍛樻坊鍔犺繘鑰冭瘯璁板綍
- var testTRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId);
- if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId))
+ var testRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue);
+ if (testRecord != null)
{
- Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord
+ string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord.TestRecordId, person);
+ responeData.code = 2;
+ responeData.data = new { testRecordId };
+ }
+ }
+ else
+ {
+ if (string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(person.UnitId) && (getTestPlan.WorkPostIds == null || getTestPlan.WorkPostIds.Contains(person.WorkPostId)))
+ {
+ //0-寰呮彁浜わ紱1-宸插彂甯冩湭鑰冭瘯 灏嗕汉鍛樻坊鍔犺繘鑰冭瘯璁板綍
+ var testTRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId);
+ if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId))
{
- TestRecordId = SQLHelper.GetNewID(),
- ProjectId = getTestPlan.ProjectId,
- TestPlanId = getTestPlan.TestPlanId,
- TestManId = personId,
- };
- if (string.IsNullOrEmpty(newTestRecord.TestType))
- {
- var getTrainTypeName = Funs.DB.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == newTestRecord.TestPlanId);
- if (getTrainTypeName != null)
+ Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord
{
- newTestRecord.TestType = getTrainTypeName.PlanName;
+ TestRecordId = SQLHelper.GetNewID(),
+ ProjectId = getTestPlan.ProjectId,
+ TestPlanId = getTestPlan.TestPlanId,
+ TestManId = personId,
+ };
+ if (string.IsNullOrEmpty(newTestRecord.TestType))
+ {
+ var getTrainTypeName = db.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == newTestRecord.TestPlanId);
+ if (getTrainTypeName != null)
+ {
+ newTestRecord.TestType = getTrainTypeName.PlanName;
+ }
}
+ TestRecordService.AddTestRecord(newTestRecord);
+ responeData.code = 3;
+ responeData.message = "鎮ㄥ凡鍔犲叆鑰冭瘯璁″垝锛";
}
- TestRecordService.AddTestRecord(newTestRecord);
- responeData.code = 3;
- responeData.message = "鎮ㄥ凡鍔犲叆鑰冭瘯璁″垝锛";
}
}
}
- }
- }
+ }
- if (responeData.code == 1)
- {
- //鍏朵粬鐘舵佹椂 鏌ョ湅鑰冭瘯璁″垝璇︾粏椤
- responeData.data = APITestPlanService.getTestPlanByTestPlanId(testPlanId);
+ if (responeData.code == 1)
+ {
+ //鍏朵粬鐘舵佹椂 鏌ョ湅鑰冭瘯璁″垝璇︾粏椤
+ responeData.data = APITestPlanService.getTestPlanByTestPlanId(testPlanId);
+ }
}
}
catch (Exception ex)
diff --git a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
index 34a3540a..303ca136 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
@@ -321,7 +321,7 @@ namespace WebAPI.Controllers
var getItem = TestRecordItemService.GetTestRecordItemTestRecordItemId(testRecordItemId);
if (getItem != null)
{
- APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
+ APITestRecordService.getTestRecordItemAnswerBySelectedItem(testRecordItemId, selectedItem);
var testRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == getItem.TestRecordId && x.TestStartTime.Value.AddMinutes(x.Duration) < DateTime.Now);
if (testRecord != null)
{
diff --git a/SGGL/WebAPI/Controllers/HSSE/TestingController.cs b/SGGL/WebAPI/Controllers/HSSE/TestingController.cs
index 164ae619..bab6c1bc 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TestingController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TestingController.cs
@@ -298,27 +298,16 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
- var getItem = TestRecordItemService.GetTestRecordItemTestRecordItemId(testRecordItemId);
- if (getItem != null)
+ if (!string.IsNullOrEmpty(testRecordItemId) && !string.IsNullOrEmpty(selectedItem))
{
- APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
- var testRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == getItem.TestRecordId && x.TestStartTime.Value.AddMinutes(x.Duration) < DateTime.Now);
- if (testRecord != null)
- {
- //鏇存柊娌℃湁缁撴潫鏃堕棿涓旇秴鏃剁殑鑰冭瘯璁板綍
- int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
- if (closeCount > 0)
- {
- responeData.code = 2;
- responeData.message = "鏈鑰冭瘯宸茬粨鏉燂紝绯荤粺鑷姩浜ゅ嵎锛";
- }
- }
+ APITestRecordService.getTestRecordItemAnswerBySelectedItem(testRecordItemId, selectedItem);
}
else
{
responeData.code = 0;
- responeData.message = "璇曢鏈夐棶棰橈紒";
+ responeData.message = "绛旈涓虹┖閫夐」锛";
}
+
}
catch (Exception ex)
{
@@ -340,36 +329,82 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
- var getTestRecord = Funs.DB.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId);
- if (getTestRecord != null)
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string returnTestRecordId = string.Empty;
- ////鑰冭瘯鍒嗘暟
- decimal getTestScores = APITestRecordService.getSubmitTestRecord(getTestRecord);
- ////鍙婃牸鍒嗘暟
- int getPassScores = SysConstSetService.getPassScore();
- if (getTestScores <= getPassScores)
- {
- int testCount = Funs.DB.Training_TestRecord.Where(x => x.TestPlanId == getTestRecord.TestPlanId && x.TestManId == getTestRecord.TestManId).Count();
- if (testCount < 2)
+ decimal getTestScores = 0;
+ var getTestRecord =db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId);
+ if (getTestRecord != null)
+ {
+ if (getTestRecord.TestStartTime.HasValue)
{
- ////閲嶆柊鐢熸垚涓鏉¤冭瘯璁板綍 浠ュ強鑰冭瘯璇曞嵎
- returnTestRecordId = APITestRecordService.getResitTestRecord(getTestRecord);
- responeData.message = "鑰冭瘯涓嶅悎鏍硷紒鎮ㄧ殑鎴愮哗涓猴細銆" + getTestScores.ToString() + "銆戯紝鎮ㄥ皢杩涘叆琛ヨ冦";
+ getTestRecord.TestEndTime = DateTime.Now;
+ var getRItem = db.Training_TestRecordItem.Where(x => x.TestRecordId == testRecordId);
+ if (getRItem.Count() > 0)
+ {
+ getTestRecord.TestScores = getRItem.Sum(x => x.SubjectScore ?? 0);
+ }
+ db.SubmitChanges();
+ getTestScores = getTestRecord.TestScores ?? 0;
+ }
+
+ ////鑰冭瘯鍒嗘暟
+ int getPassScores = SysConstSetService.getPassScore();
+ if (getTestScores <= getPassScores)
+ {
+ int testCount = db.Training_TestRecord.Where(x => x.TestPlanId == getTestRecord.TestPlanId && x.TestManId == getTestRecord.TestManId).Count();
+ if (testCount < 2)
+ {
+ ////閲嶆柊鐢熸垚涓鏉¤冭瘯璁板綍 浠ュ強鑰冭瘯璇曞嵎
+ returnTestRecordId = APITestRecordService.getResitTestRecord(getTestRecord);
+ responeData.message = "鑰冭瘯涓嶅悎鏍硷紒鎮ㄧ殑鎴愮哗涓猴細銆" + getTestScores.ToString() + "銆戯紝鎮ㄥ皢杩涘叆琛ヨ冦";
+ }
+ else
+ {
+ // APITestRecordService.updateAll(getTestRecord.TestPlanId);
+ responeData.message = "鑰冭瘯涓嶅悎鏍硷紒鎮ㄧ殑鎴愮哗涓猴細銆" + getTestScores.ToString() + "銆戯紝璇峰啀娆″弬鍔犲煿璁悗琛ヨ冦";
+ }
}
else
{
- // APITestRecordService.updateAll(getTestRecord.TestPlanId);
- responeData.message = "鑰冭瘯涓嶅悎鏍硷紒鎮ㄧ殑鎴愮哗涓猴細銆" + getTestScores.ToString() + "銆戯紝璇峰啀娆″弬鍔犲煿璁悗琛ヨ冦";
+ // APITestRecordService.updateAll(getTestRecord.TestPlanId);
+ responeData.message = "鎭枩鑰冭瘯閫氳繃锛佹偍鐨勬垚缁╀负锛氥" + getTestScores.ToString() + "銆戙";
}
- }
- else
- {
- // APITestRecordService.updateAll(getTestRecord.TestPlanId);
- responeData.message = "鎭枩鑰冭瘯閫氳繃锛佹偍鐨勬垚缁╀负锛氥" + getTestScores.ToString() + "銆戙";
- }
- responeData.data = new { getTestScores, getPassScores, returnTestRecordId };
+ responeData.data = new { getTestScores, getPassScores, returnTestRecordId };
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = ex.Message;
+ }
+
+ return responeData;
+ }
+
+ #endregion
+
+ ///
+ /// 閲嶈
+ ///
+ /// 璇曞嵎ID
+ public Model.ResponeData getRetakeTestRecordByTestRecordId(string testRecordId)
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ string returnTestRecordId = string.Empty;
+ var getTestRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId);
+ if (getTestRecord != null)
+ {
+ ////閲嶆柊鐢熸垚涓鏉¤冭瘯璁板綍 浠ュ強鑰冭瘯璇曞嵎
+ returnTestRecordId = APITestRecordService.getResitTestRecord(getTestRecord);
+ responeData.data = new { returnTestRecordId };
+ }
}
}
catch (Exception ex)
@@ -380,6 +415,5 @@ namespace WebAPI.Controllers
return responeData;
}
- #endregion
}
}
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index 22836e09..71118084 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -885,21 +885,45 @@ namespace WebAPI.Controllers
}
db.SubmitChanges();
}
+ }
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = ex.Message;
+ ErrLogInfo.WriteLog(ex, "WX鎺ュ彛-鏇存柊浜哄憳鏁版嵁浜ゆ崲鏃堕棿", "PersonController.getUpdatePersonExchangeTime");
+ }
+ return responeData;
+ }
- var getPersonb = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId);
- if (getPersonb != null && !string.IsNullOrEmpty(type))
+ ///
+ /// 鏇存柊浜哄憳鏁版嵁浜ゆ崲鏃堕棿
+ ///
+ ///
+ ///
+ ///
+ ///
+ public Model.ResponeData getUpdatePersonExchangeTime(string projectId, string idCard, string type)
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ var getPerson = db.SitePerson_Person.FirstOrDefault(e => e.ProjectId == projectId && e.IdentityCard ==idCard);
+ if (getPerson != null && !string.IsNullOrEmpty(type))
{
if (type == "1")
{
- getPersonb.ExchangeTime2 = DateTime.Now;
- if (!getPersonb.ExchangeTime.HasValue)
+ getPerson.ExchangeTime2 = DateTime.Now;
+ if (!getPerson.ExchangeTime.HasValue)
{
- getPersonb.ExchangeTime = DateTime.Now;
+ getPerson.ExchangeTime = DateTime.Now;
}
}
else
{
- getPersonb.ExchangeTime = DateTime.Now;
+ getPerson.ExchangeTime = DateTime.Now;
}
db.SubmitChanges();
}
@@ -909,7 +933,7 @@ namespace WebAPI.Controllers
{
responeData.code = 0;
responeData.message = ex.Message;
- ErrLogInfo.WriteLog(ex, "WX鎺ュ彛-鏇存柊浜哄憳鏁版嵁浜ゆ崲鏃堕棿", "PersonController.getUpdatePersonExchangeTime");
+ ErrLogInfo.WriteLog(ex, "WX鎺ュ彛-鏇存柊浜哄憳鏁版嵁浜ゆ崲鏃堕棿", "PersonController.getUpdatePersonExchangeTime");
}
return responeData;
}
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index 026d6437..cd13ab3f 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,13 +10,13 @@
Release
Any CPU
- True
- False
- F:\Package\涓寲浜旂幆\SGGLAPI
- True
- True
- True
- False
+ true
+ false
+ E:\Package\涓浗浜旂幆宸ョ▼鏈夐檺鍏徃\SGGLAPI
+ true
+ true
+ true
+ false
DonotMerge
\ No newline at end of file
diff --git a/寮鍙戦渶姹/OA瀵规帴瀵嗛挜.txt b/寮鍙戦渶姹/OA瀵规帴瀵嗛挜.txt
deleted file mode 100644
index 10cc8999..00000000
--- a/寮鍙戦渶姹/OA瀵规帴瀵嗛挜.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-publickey
-
-rnq6pYDFkcrpzVtMrLbf2dvDPs2FDo5yeDub6YCnl0hXov3MVEVMbVe3NCnC5Thl3dwm14yI9/vNIGdH5M4getAkMnkG8tNA60NPjtHUzyoZSpVYCUOmB30s5vx+4IBkPh8R4ynkJYyUxkl61/0h6y7A86qz4jNivxAKt2a0vQxk=AQAB
-
-
-privatekey锛
-
-1oowM965L1r9NM10IruHI+4v4cF8cMrZ1PMaG/D1oNOww8YGEYjKiQ2iAjAtJi4OQX6sxI7BHJad/CGNKeE12ywplO18J8vL/YvEq38DMen22ungNAjSmC6zmIngvBrIiyW2Cyws/9JQKxT02I1tZlEQ9q4ZxCc3PLFazTD0sIk=AQAB2K+KCTgEGJAvPzB6pYcDmE2n/gIIy6dOiaNQtTWRUrttC+DaU8ZlORlYH6+lWcekYhGnf+dVjfuGE3w45JVKxw==
/Xb6T/4tizVbVpjLd47SN+c1yEcCubLhv7HHd/9E2K5olboWvOGxUbr53F4FOmTu9CWpybbCKLReJWPQxq5aLw==
eA1Ztx3X9xv7cVEUwpz5OurbhnnuEZdShiN71comB+Zb1lbv37Zt4qLOFlAklodr5gHOAalT12Rhtm3+v3aPhQ==5VjUNK+1PEKijGAjs+I627TN2JRQpgFz/gX6jN0hycM/BURmMLEzxtWeI0W8C1OrWKX/1XMWishya/i+wBihpw==wE16uAx/ztTMObpArwC2eGhh+oCwXsnUPoFSQtLHeEbxx/Cf424wKr2ceV/Fe9YKQp5XLdOpJkCDDAF+2k4X1A==0rF/yVEQeQtY5ERpq7qTa5v99i448eSlrVbZ61rnP3zmej29s/atQY/b7V422OoeIgAv2BGCYXshyH2CzwBYDAtGkz+qvaZtPvWIYPadTvgU5W/QgX8r/ozqFBHu17APSSBmJWulShxj6r9kOmgxW4HzwVQ/iQgyQ5Z+qgpf50k=
\ No newline at end of file
diff --git a/寮鍙戦渶姹/浜旂幆淇敼闇姹8.16-1.docx b/寮鍙戦渶姹/浜旂幆淇敼闇姹8.16-1.docx
deleted file mode 100644
index 6efb3a22..00000000
--- a/寮鍙戦渶姹/浜旂幆淇敼闇姹8.16-1.docx
+++ /dev/null
@@ -1,13 +0,0 @@
-
-1銆
-
-2銆佸彟澶栵紝鍦ㄦ墜鍔ㄨ冨嫟鐨勪笅鎷夎彍鍗曚腑锛屽凡鍑哄満浜哄憳搴旇涓嶈嚜鍔ㄦ樉绀
-
-3銆
-
-4銆
-
-
-
-5銆
-
diff --git a/寮鍙戦渶姹/浜旂幆鍏徃鍦ㄥ矖浜哄憳(1).xlsx b/寮鍙戦渶姹/浜旂幆鍏徃鍦ㄥ矖浜哄憳(1).xlsx
deleted file mode 100644
index 0785b7b7..00000000
Binary files a/寮鍙戦渶姹/浜旂幆鍏徃鍦ㄥ矖浜哄憳(1).xlsx and /dev/null differ
diff --git a/寮鍙戦渶姹/鏅烘収宸ュ湴涓庝簲鐜疧A闆嗘垚璇存槑鏂囨。(1).docx b/寮鍙戦渶姹/鏅烘収宸ュ湴涓庝簲鐜疧A闆嗘垚璇存槑鏂囨。(1).docx
deleted file mode 100644
index e71dbdbf..00000000
--- a/寮鍙戦渶姹/鏅烘収宸ュ湴涓庝簲鐜疧A闆嗘垚璇存槑鏂囨。(1).docx
+++ /dev/null
@@ -1,38 +0,0 @@
- 鍗曠偣鐧诲綍鐨勬柟寮
- 浜旂幆绯荤粺鐐瑰嚮閾炬帴锛歨ttps://zhgd.cwcec.com/Login.html?data=****&basedata=****
- 鍏嶇櫥褰曡繘鍏ユ櫤鎱у伐鍦扮殑绯荤粺
- data鍙傛暟璇存槑
- data瀛楃涓叉槸鐢ㄦ埛鍚嶅拰鏃堕棿鎴崇敤RSA鍏挜鍔犲瘑鍚庣殑瀛楃涓层備緥濡傦細
- userName=zhangsan×pan=1256015312鐢ㄥ叕閽ュ姞瀵嗗悗鐢熸垚****
- basedata鍙傛暟璇存槑
- basedata瀛楃涓叉槸鐢ㄦ埛鍚嶅拰鏃堕棿鎴崇敤RSA鍏挜鍔犲瘑鍚庡啀鐢˙ase64鍔犲瘑涓娆
- 鐢熸垚鐨勫姞瀵嗗瓧绗︿覆銆備緥濡傦細
- userName=zhangsan×pan=1256015312鐢ㄥ叕閽ュ姞瀵嗗悗鍐嶇敤Base64鍔犲瘑
- 涓轰簡瑙e喅鏈夌殑瑙e瘑杩囩▼涓嚭鐜"+"鎴栬"="杩欐牱鐨勭壒娈婂瓧绗︺傛帹鑽愭埅鍙朾asedata鐨
- 瀛楃涓茶В瀵嗐
-
- 瑙e瘑鏂瑰紡
- data鎴栬卋asedata閮芥槸鐢ㄥ叕閽ヨ繘琛孯SA鍔犲瘑锛岄渶瑕佺敤鎴戜滑鎻愪緵鐨勭閽ュ鍔犲瘑鏂囦欢杩涜瑙e瘑锛屽垽鏂敤鎴峰悕鏄惁鍦ㄧ郴缁熶腑骞朵笖褰撳墠鏃堕棿-鏃堕棿鎴<30绉掗挓锛屾墠鑳界櫥褰曞埌绯荤粺涓紝鍚﹀垯闇瑕佽緭鍏ヨ处鍙峰瘑鐮
-涓夈.net瑙e瘑鐨勫嚱鏁板弬鑰
-string userdata = context.Request["database"].ToString();
-string privatekey = ****锛堟垜浠細鎻愪緵锛
-string result = RSADecrypt(privatekey, userdata); //缁忚繃RSA瑙e瘑鍚庤幏寰楃殑鍩熺櫥褰曞悕+鏃堕棿鎴
-
-
-///
-///
-/// 鐢ㄧ閽ュ鏁版嵁杩涜RSA瑙e瘑
-///
-///
-///
-///
-public static string RSADecrypt(string privatekey, string content)
-{
-
-RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
-byte[] cipherbytes;
-rsa.FromXmlString(privatekey);
-//瀵瑰弬鏁癱ontent杩涜涓ゆbase64瑙e瘑
-cipherbytes = rsa.Decrypt(Convert.FromBase64String(Encoding.UTF8.GetString(Convert.FromBase64String(content))), false);
-return Encoding.UTF8.GetString(cipherbytes);
-}