生产BUG修改
This commit is contained in:
@@ -8,6 +8,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using 全自动水压检测仪;
|
||||
using 全自动水压检测仪.DATA;
|
||||
|
||||
namespace 材料热传导系数
|
||||
{
|
||||
@@ -149,12 +150,12 @@ namespace 材料热传导系数
|
||||
|
||||
public ConductivityRepository()
|
||||
{
|
||||
_connectionString = "Server=localhost;Database=fullautowaterpressure;User=root;Password=123456;port=3306;charset=utf8;";
|
||||
_connectionString = DatabaseConnectionManager.ConnectionString;
|
||||
}
|
||||
|
||||
public void InsertReportItems(ConductivityTestData data)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO normaltemperature (
|
||||
@@ -197,7 +198,7 @@ VALUES
|
||||
}
|
||||
public void InsertScanItems(ScanData data)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"INSERT INTO scandata
|
||||
@@ -223,7 +224,7 @@ standarderror)
|
||||
|
||||
public void DeleteScanItems(int id)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"delete from scandata where id=@id
|
||||
@@ -234,7 +235,7 @@ standarderror)
|
||||
|
||||
public List<ScanData> GetScanData()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM scandata
|
||||
@@ -246,7 +247,7 @@ standarderror)
|
||||
|
||||
public List<ConductivityTestData> GetTestData()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM normaltemperature
|
||||
@@ -259,7 +260,7 @@ standarderror)
|
||||
|
||||
public void DeleteTestAllItems()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"delete from normaltemperature
|
||||
@@ -271,7 +272,7 @@ standarderror)
|
||||
|
||||
public void DeleteTestAllItems(int id)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"delete from normaltemperature where id=@id
|
||||
@@ -282,7 +283,7 @@ standarderror)
|
||||
|
||||
public List<ScanData> GetScanDataBylldh_jh(string jh)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM scandata
|
||||
@@ -298,7 +299,7 @@ standarderror)
|
||||
/// <param name="scanData">要更新的扫描数据</param>
|
||||
public void UpdateScanItem(ScanData scanData)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"UPDATE scandata SET
|
||||
@@ -342,7 +343,7 @@ standarderror)
|
||||
/// <returns>扫描数据对象</returns>
|
||||
public ScanData GetScanDataById(int id)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM scandata WHERE id = @id";
|
||||
@@ -354,7 +355,7 @@ standarderror)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
return connection.State == ConnectionState.Open;
|
||||
@@ -373,7 +374,7 @@ standarderror)
|
||||
/// </summary>
|
||||
public ConductivityTestData GetTestDataById(int id)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"SELECT * FROM normaltemperature WHERE id = @id";
|
||||
@@ -386,7 +387,7 @@ standarderror)
|
||||
/// </summary>
|
||||
public void UpdateTestData(ConductivityTestData testData)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
var sql = @"UPDATE normaltemperature SET
|
||||
|
||||
82
全自动水压检测仪/DATA/DatabaseConnectionManager.cs
Normal file
82
全自动水压检测仪/DATA/DatabaseConnectionManager.cs
Normal file
@@ -0,0 +1,82 @@
|
||||
using MySql.Data.MySqlClient;
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
namespace 全自动水压检测仪.DATA
|
||||
{
|
||||
internal static class DatabaseConnectionManager
|
||||
{
|
||||
private const string ConnectionStringName = "FullAutoWaterPressure";
|
||||
private const string DefaultConnectionString = "Server=localhost;Database=fullautowaterpressure;User=root;Password=123456;port=3306;charset=utf8;";
|
||||
|
||||
private static readonly Lazy<string> _connectionString = new Lazy<string>(BuildConnectionString);
|
||||
|
||||
public static string ConnectionString => _connectionString.Value;
|
||||
|
||||
public static MySqlConnection CreateConnection()
|
||||
{
|
||||
return new MySqlConnection(ConnectionString);
|
||||
}
|
||||
|
||||
private static string BuildConnectionString()
|
||||
{
|
||||
string configuredConnectionString = ConfigurationManager.ConnectionStrings[ConnectionStringName]?.ConnectionString;
|
||||
string rawConnectionString = string.IsNullOrWhiteSpace(configuredConnectionString)
|
||||
? DefaultConnectionString
|
||||
: configuredConnectionString;
|
||||
|
||||
try
|
||||
{
|
||||
var builder = new MySqlConnectionStringBuilder(rawConnectionString);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(builder.Server))
|
||||
{
|
||||
builder.Server = "localhost";
|
||||
}
|
||||
|
||||
if (builder.Port == 0)
|
||||
{
|
||||
builder.Port = 3306;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(builder.Database))
|
||||
{
|
||||
builder.Database = "fullautowaterpressure";
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(builder.UserID))
|
||||
{
|
||||
builder.UserID = "root";
|
||||
}
|
||||
|
||||
if (builder.ConnectionTimeout == 0)
|
||||
{
|
||||
builder.ConnectionTimeout = 5;
|
||||
}
|
||||
|
||||
if (builder.DefaultCommandTimeout == 0)
|
||||
{
|
||||
builder.DefaultCommandTimeout = 30;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(builder.CharacterSet))
|
||||
{
|
||||
builder.CharacterSet = "utf8";
|
||||
}
|
||||
|
||||
builder.Pooling = true;
|
||||
|
||||
if (builder.MaximumPoolSize == 0)
|
||||
{
|
||||
builder.MaximumPoolSize = 50;
|
||||
}
|
||||
|
||||
return builder.ConnectionString;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return DefaultConnectionString;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// </summary>
|
||||
public static class DatabaseInitializer
|
||||
{
|
||||
private static readonly string _connectionString = "Server=localhost;Database=fullautowaterpressure;User=root;Password=123456;port=3306;charset=utf8;";
|
||||
private static readonly string _connectionString = DatabaseConnectionManager.ConnectionString;
|
||||
|
||||
/// <summary>
|
||||
/// 初始化用户表和默认管理员账户
|
||||
@@ -34,7 +34,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// </summary>
|
||||
public static void ForceResetDefaultUsers()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// </summary>
|
||||
private static void CreateUsersTable()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -100,7 +100,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// </summary>
|
||||
private static void CreateDefaultAdminIfNotExists()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// </summary>
|
||||
public static class LoginDebugHelper
|
||||
{
|
||||
private static readonly string _connectionString = "Server=localhost;Database=fullautowaterpressure;User=root;Password=123456;port=3306;charset=utf8;";
|
||||
private static readonly string _connectionString = DatabaseConnectionManager.ConnectionString;
|
||||
|
||||
/// <summary>
|
||||
/// 测试密码加密和验证
|
||||
@@ -49,7 +49,7 @@ namespace 全自动水压检测仪.DATA
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace 全自动水压检测仪.DATA
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace 全自动水压检测仪.DATA
|
||||
|
||||
public UserRepository()
|
||||
{
|
||||
_connectionString = "Server=localhost;Database=fullautowaterpressure;User=root;Password=123456;port=3306;charset=utf8;";
|
||||
_connectionString = DatabaseConnectionManager.ConnectionString;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -26,7 +26,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>用户对象,不存在返回null</returns>
|
||||
public User GetUserByUsername(string username)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -72,7 +72,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>用户对象,不存在返回null</returns>
|
||||
public User GetUserById(int userId)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -102,7 +102,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否创建成功</returns>
|
||||
public bool CreateUser(User user, string plainPassword)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -134,7 +134,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否更新成功</returns>
|
||||
public bool UpdateUser(User user)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
string sql = @"UPDATE sys_users
|
||||
@@ -160,7 +160,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否删除成功</returns>
|
||||
public bool DeleteUser(int userId)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
string sql = @"DELETE FROM sys_users WHERE id = @id";
|
||||
@@ -175,7 +175,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>用户列表</returns>
|
||||
public List<User> GetAllUsers()
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -206,7 +206,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否修改成功</returns>
|
||||
public bool ChangePassword(int userId, string oldPassword, string newPassword)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -246,7 +246,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否重置成功</returns>
|
||||
public bool ResetPassword(int userId, string newPassword)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
|
||||
@@ -276,7 +276,7 @@ namespace 全自动水压检测仪.DATA
|
||||
/// <returns>是否更新成功</returns>
|
||||
public bool UpdateLastLoginTime(string username)
|
||||
{
|
||||
using (var connection = new MySqlConnection(_connectionString))
|
||||
using (var connection = DatabaseConnectionManager.CreateConnection())
|
||||
{
|
||||
connection.Open();
|
||||
string sql = @"UPDATE sys_users
|
||||
|
||||
Reference in New Issue
Block a user