更新项目配置，新增设备同步模块，优化WebSocket和Swagger配置，增强SCADA系统的免登录接口，支持数据字典项和登录日志的免登录查询与记录。调整Java编译设置，确保更好的开发体验。

2026-04-28 10:23:58 +08:00
parent bbe46dcf2d
commit 142a0bdaba
1013 changed files with 41858 additions and 28 deletions
--- a/yy-admin-master/YY.Admin.Core/Util/SM/Cipher.cs
+++ b/yy-admin-master/YY.Admin.Core/Util/SM/Cipher.cs
@@ -0,0 +1,152 @@
+
+//
+
+//
+
+//
+
+
+
+
+//using Org.BouncyCastle.Crypto;
+//using Org.BouncyCastle.Crypto.Parameters;
+//using Org.BouncyCastle.Math;
+//using Org.BouncyCastle.Math.EC;
+//extern alias OldBC;
+//extern alias NewBC;
+
+//// 使用时通过别名限定
+//OldBC::BouncyCastle.Crypto.ECPoint oldEcPoint;
+//NewBC::BouncyCastle.Cryptography.ECPoint newEcPoint;
+
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Digests;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math.EC;
+
+namespace YY.Admin.Core.Util;
+
+public class Cipher
+{
+    private int ct;
+    private ECPoint p2;
+    private SM3Digest sm3keybase;
+    private SM3Digest sm3c3;
+    private readonly byte[] key;
+    private byte keyOff;
+
+    public Cipher()
+    {
+        ct = 1;
+        key = new byte[32];
+        keyOff = 0;
+    }
+
+    public static byte[] ByteConvert32Bytes(BigInteger n)
+    {
+        if (n == null)
+            return null;
+
+        byte[] tmpd;
+        if (n.ToByteArray().Length == 33)
+        {
+            tmpd = new byte[32];
+            Array.Copy(n.ToByteArray(), 1, tmpd, 0, 32);
+        }
+        else if (n.ToByteArray().Length == 32)
+        {
+            tmpd = n.ToByteArray();
+        }
+        else
+        {
+            tmpd = new byte[32];
+            for (int i = 0; i < 32 - n.ToByteArray().Length; i++)
+            {
+                tmpd[i] = 0;
+            }
+            Array.Copy(n.ToByteArray(), 0, tmpd, 32 - n.ToByteArray().Length, n.ToByteArray().Length);
+        }
+        return tmpd;
+    }
+
+    private void Reset()
+    {
+        sm3keybase = new SM3Digest();
+        sm3c3 = new SM3Digest();
+
+        byte[] p = ByteConvert32Bytes(p2.Normalize().XCoord.ToBigInteger());
+        sm3keybase.BlockUpdate(p, 0, p.Length);
+        sm3c3.BlockUpdate(p, 0, p.Length);
+
+        p = ByteConvert32Bytes(p2.Normalize().YCoord.ToBigInteger());
+        sm3keybase.BlockUpdate(p, 0, p.Length);
+        ct = 1;
+        NextKey();
+    }
+
+    private void NextKey()
+    {
+        var sm3keycur = new SM3Digest(this.sm3keybase);
+        sm3keycur.Update((byte)(ct >> 24 & 0xff));
+        sm3keycur.Update((byte)(ct >> 16 & 0xff));
+        sm3keycur.Update((byte)(ct >> 8 & 0xff));
+        sm3keycur.Update((byte)(ct & 0xff));
+        sm3keycur.DoFinal(key, 0);
+        keyOff = 0;
+        ct++;
+    }
+
+    public ECPoint Init_enc(SM2 sm2, ECPoint userKey)
+    {
+        AsymmetricCipherKeyPair key = sm2.ecc_key_pair_generator.GenerateKeyPair();
+        ECPrivateKeyParameters ecpriv = (ECPrivateKeyParameters)key.Private;
+        ECPublicKeyParameters ecpub = (ECPublicKeyParameters)key.Public;
+        BigInteger k = ecpriv.D;
+        ECPoint c1 = ecpub.Q;
+        p2 = userKey.Multiply(k);
+        Reset();
+        return c1;
+    }
+
+    public void Encrypt(byte[] data)
+    {
+        sm3c3.BlockUpdate(data, 0, data.Length);
+        for (int i = 0; i < data.Length; i++)
+        {
+            if (keyOff == key.Length)
+            {
+                NextKey();
+            }
+            data[i] ^= key[keyOff++];
+        }
+    }
+
+    public void Init_dec(BigInteger userD, ECPoint c1)
+    {
+        p2 = c1.Multiply(userD);
+        Reset();
+    }
+
+    public void Decrypt(byte[] data)
+    {
+        for (int i = 0; i < data.Length; i++)
+        {
+            if (keyOff == key.Length)
+            {
+                NextKey();
+            }
+            data[i] ^= key[keyOff++];
+        }
+
+        sm3c3.BlockUpdate(data, 0, data.Length);
+    }
+
+    public void Dofinal(byte[] c3)
+    {
+        byte[] p = ByteConvert32Bytes(p2.Normalize().YCoord.ToBigInteger());
+        sm3c3.BlockUpdate(p, 0, p.Length);
+        sm3c3.DoFinal(c3, 0);
+        Reset();
+    }
+}
--- a/yy-admin-master/YY.Admin.Core/Util/SM/SM2.cs
+++ b/yy-admin-master/YY.Admin.Core/Util/SM/SM2.cs
@@ -0,0 +1,120 @@
+
+//
+
+//
+
+//
+
+
+
+using Org.BouncyCastle.Crypto.Digests;
+using Org.BouncyCastle.Crypto.Generators;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Security;
+
+namespace YY.Admin.Core.Util;
+
+public class SM2
+{
+    public static SM2 Instance
+    {
+        get
+        {
+            return new SM2();
+        }
+    }
+
+    public static SM2 InstanceTest
+    {
+        get
+        {
+            return new SM2();
+        }
+    }
+
+    public static readonly string[] sm2_param = {
+        "FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFF",// p,0
+        "FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFC",// a,1
+        "28E9FA9E9D9F5E344D5A9E4BCF6509A7F39789F515AB8F92DDBCBD414D940E93",// b,2
+        "FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6B21C6052B53BBF40939D54123",// n,3
+        "32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7",// gx,4
+        "BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0" // gy,5
+    };
+
+    public string[] ecc_param = sm2_param;
+
+    public readonly BigInteger ecc_p;
+    public readonly BigInteger ecc_a;
+    public readonly BigInteger ecc_b;
+    public readonly BigInteger ecc_n;
+    public readonly BigInteger ecc_gx;
+    public readonly BigInteger ecc_gy;
+
+    public readonly ECCurve ecc_curve;
+    public readonly ECPoint ecc_point_g;
+
+    public readonly ECDomainParameters ecc_bc_spec;
+
+    public readonly ECKeyPairGenerator ecc_key_pair_generator;
+
+    private SM2()
+    {
+        ecc_param = sm2_param;
+
+        ecc_p = new BigInteger(ecc_param[0], 16);
+        ecc_a = new BigInteger(ecc_param[1], 16);
+        ecc_b = new BigInteger(ecc_param[2], 16);
+        ecc_n = new BigInteger(ecc_param[3], 16);
+        ecc_gx = new BigInteger(ecc_param[4], 16);
+        ecc_gy = new BigInteger(ecc_param[5], 16);
+
+        ecc_curve = new FpCurve(ecc_p, ecc_a, ecc_b, null, null);
+        ecc_point_g = ecc_curve.CreatePoint(ecc_gx, ecc_gy);
+
+        ecc_bc_spec = new ECDomainParameters(ecc_curve, ecc_point_g, ecc_n);
+
+        ECKeyGenerationParameters ecc_ecgenparam;
+        ecc_ecgenparam = new ECKeyGenerationParameters(ecc_bc_spec, new SecureRandom());
+
+        ecc_key_pair_generator = new ECKeyPairGenerator();
+        ecc_key_pair_generator.Init(ecc_ecgenparam);
+    }
+
+    public virtual byte[] Sm2GetZ(byte[] userId, ECPoint userKey)
+    {
+        var sm3 = new SM3Digest();
+        byte[] p;
+        // userId length
+        int len = userId.Length * 8;
+        sm3.Update((byte)(len >> 8 & 0x00ff));
+        sm3.Update((byte)(len & 0x00ff));
+
+        // userId
+        sm3.BlockUpdate(userId, 0, userId.Length);
+
+        // a,b
+        p = ecc_a.ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+        p = ecc_b.ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+        // gx,gy
+        p = ecc_gx.ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+        p = ecc_gy.ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+
+        // x,y
+        p = userKey.AffineXCoord.ToBigInteger().ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+        p = userKey.AffineYCoord.ToBigInteger().ToByteArray();
+        sm3.BlockUpdate(p, 0, p.Length);
+
+        // Z
+        byte[] md = new byte[sm3.GetDigestSize()];
+        sm3.DoFinal(md, 0);
+
+        return md;
+    }
+}
--- a/yy-admin-master/YY.Admin.Core/Util/SM/SM2Util.cs
+++ b/yy-admin-master/YY.Admin.Core/Util/SM/SM2Util.cs
@@ -0,0 +1,177 @@
+
+//
+
+//
+
+//
+
+
+
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Utilities.Encoders;
+using System.Text;
+
+namespace YY.Admin.Core.Util;
+
+/// <summary>
+/// SM2工具类
+/// </summary>
+public class SM2Util
+{
+    /// <summary>
+    /// 加密
+    /// </summary>
+    /// <param name="publicKey_string"></param>
+    /// <param name="data_string"></param>
+    /// <returns></returns>
+    public static string Encrypt(string publicKey_string, string data_string)
+    {
+        var publicKey = Hex.Decode(publicKey_string);
+        var data = Encoding.UTF8.GetBytes(data_string);
+        return Encrypt(publicKey, data);
+    }
+
+    /// <summary>
+    /// 解密
+    /// </summary>
+    /// <param name="privateKey_string"></param>
+    /// <param name="encryptedData_string"></param>
+    /// <returns></returns>
+    public static string Decrypt(string privateKey_string, string encryptedData_string)
+    {
+        var privateKey = Hex.Decode(privateKey_string);
+        var encryptedData = Hex.Decode(encryptedData_string);
+        var de_str = SM2Util.Decrypt(privateKey, encryptedData);
+        string plainText = Encoding.UTF8.GetString(de_str);
+        return plainText;
+    }
+
+    public static void GenerateKeyPair()
+    {
+        SM2 sm2 = SM2.Instance;
+        AsymmetricCipherKeyPair key = sm2.ecc_key_pair_generator.GenerateKeyPair();
+        ECPrivateKeyParameters ecpriv = (ECPrivateKeyParameters)key.Private;
+        ECPublicKeyParameters ecpub = (ECPublicKeyParameters)key.Public;
+        BigInteger privateKey = ecpriv.D;
+        ECPoint publicKey = ecpub.Q;
+
+        Console.Out.WriteLine("公钥: " + Encoding.ASCII.GetString(Hex.Encode(publicKey.GetEncoded())).ToUpper());
+        Console.Out.WriteLine("私钥: " + Encoding.ASCII.GetString(Hex.Encode(privateKey.ToByteArray())).ToUpper());
+    }
+
+    public static string Encrypt(byte[] publicKey, byte[] data)
+    {
+        if (null == publicKey || publicKey.Length == 0)
+        {
+            return null;
+        }
+        if (data == null || data.Length == 0)
+        {
+            return null;
+        }
+
+        byte[] source = new byte[data.Length];
+        Array.Copy(data, 0, source, 0, data.Length);
+
+        var cipher = new Cipher();
+        SM2 sm2 = SM2.Instance;
+
+        ECPoint userKey = sm2.ecc_curve.DecodePoint(publicKey);
+
+        ECPoint c1 = cipher.Init_enc(sm2, userKey);
+        cipher.Encrypt(source);
+
+        byte[] c3 = new byte[32];
+        cipher.Dofinal(c3);
+
+        string sc1 = Encoding.ASCII.GetString(Hex.Encode(c1.GetEncoded()));
+        string sc2 = Encoding.ASCII.GetString(Hex.Encode(source));
+        string sc3 = Encoding.ASCII.GetString(Hex.Encode(c3));
+
+        return (sc1 + sc2 + sc3).ToUpper();
+    }
+
+    public static byte[] Decrypt(byte[] privateKey, byte[] encryptedData)
+    {
+        if (null == privateKey || privateKey.Length == 0)
+        {
+            return null;
+        }
+        if (encryptedData == null || encryptedData.Length == 0)
+        {
+            return null;
+        }
+
+        string data = Encoding.ASCII.GetString(Hex.Encode(encryptedData));
+
+        byte[] c1Bytes = Hex.Decode(Encoding.ASCII.GetBytes(data.Substring(0, 130)));
+        int c2Len = encryptedData.Length - 97;
+        byte[] c2 = Hex.Decode(Encoding.ASCII.GetBytes(data.Substring(130, 2 * c2Len)));
+        byte[] c3 = Hex.Decode(Encoding.ASCII.GetBytes(data.Substring(130 + 2 * c2Len, 64)));
+
+        SM2 sm2 = SM2.Instance;
+        var userD = new BigInteger(1, privateKey);
+
+        ECPoint c1 = sm2.ecc_curve.DecodePoint(c1Bytes);
+        var cipher = new Cipher();
+        cipher.Init_dec(userD, c1);
+        cipher.Decrypt(c2);
+        cipher.Dofinal(c3);
+
+        return c2;
+    }
+
+    //[STAThread]
+    //public static void Main()
+    //{
+    //    GenerateKeyPair();
+
+    //    String plainText = "ererfeiisgod";
+    //    byte[] sourceData = Encoding.Default.GetBytes(plainText);
+
+    //    //下面的秘钥可以使用generateKeyPair()生成的秘钥内容
+    //    // 国密规范正式私钥
+    //    String prik = "3690655E33D5EA3D9A4AE1A1ADD766FDEA045CDEAA43A9206FB8C430CEFE0D94";
+    //    // 国密规范正式公钥
+    //    String pubk = "04F6E0C3345AE42B51E06BF50B98834988D54EBC7460FE135A48171BC0629EAE205EEDE253A530608178A98F1E19BB737302813BA39ED3FA3C51639D7A20C7391A";
+
+    //    System.Console.Out.WriteLine("加密: ");
+    //    String cipherText = SM2Utils.Encrypt(Hex.Decode(pubk), sourceData);
+    //    System.Console.Out.WriteLine(cipherText);
+    //    System.Console.Out.WriteLine("解密: ");
+    //    plainText = Encoding.Default.GetString(SM2Utils.Decrypt(Hex.Decode(prik), Hex.Decode(cipherText)));
+    //    System.Console.Out.WriteLine(plainText);
+
+    //    Console.ReadLine();
+    //}
+
+    /// <summary>
+    /// SM2加密
+    /// </summary>
+    /// <param name="plainText">明文</param>
+    /// <returns>密文</returns>
+    public static String 加密(String plainText)
+    {
+        // 国密规范正式公钥
+        String pubk = "04F6E0C3345AE42B51E06BF50B98834988D54EBC7460FE135A48171BC0629EAE205EEDE253A530608178A98F1E19BB737302813BA39ED3FA3C51639D7A20C7391A";
+        byte[] sourceData = Encoding.Default.GetBytes(plainText);
+        String cipherText = SM2Util.Encrypt(Hex.Decode(pubk), sourceData);
+        return cipherText;
+    }
+
+    /// <summary>
+    /// SM2解密
+    /// </summary>
+    /// <param name="cipherText">密文</param>
+    /// <returns>明文</returns>
+    public static string 解密(String cipherText)
+    {
+        // 国密规范正式私钥
+        String prik = "3690655E33D5EA3D9A4AE1A1ADD766FDEA045CDEAA43A9206FB8C430CEFE0D94";
+        String plainText = Encoding.Default.GetString(SM2Util.Decrypt(Hex.Decode(prik), Hex.Decode(cipherText)));
+        return plainText;
+    }
+}