Merge branch 'master' of https://gitee.com/cquni-wcs/wcs

2024-06-25 13:49:02 +08:00
parent 7228b74cb5 4c0146b7c1
commit b6f6e24f45
2 changed files with 26 additions and 5 deletions
--- a/WCS.WebApi/Program.cs
+++ b/WCS.WebApi/Program.cs
@ -20,6 +20,9 @@ namespace WebApi
    {
        public static void Main(string[] args)
        {
+<<<<<<< HEAD
+            WebSoceketManager.InitWebSocket();
+=======
            try
            {
                //<2F><>ʼ<EFBFBD><CABC>websocket
@ -27,6 +30,7 @@ namespace WebApi

                //<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>
                DbInit.InitDb();
+>>>>>>> 7f35077c07959e9571515ee1a1f88123f9e20bd5

                //<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
                LocalFile.SaveConfig();