调整

Areas/Api/Controllers/BaseController.cs

@@ -34,9 +34,6 @@ namespace MySystem.Areas.Api.Controllers
         public string JwtIss = Library.ConfigurationManager.AppSettings["JwtIss"].ToString();
         public string JwtAud = Library.ConfigurationManager.AppSettings["JwtAud"].ToString();
 
-        //数据库链接
-        public string StatConn = Library.ConfigurationManager.AppSettings["TSqlConnStr"].ToString();
-
         public int SysId;
         public int SysRealRole;
         public string SysUserName = "";

Areas/Api/Controllers/v1/MainServer/UsersController.cs

@@ -11,6 +11,10 @@ using System.Web;
 using MySystem.MainModels;
 using LitJson;
 using Library;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
 
 namespace MySystem.Areas.Api.Controllers.v1
 {
@@ -370,81 +374,72 @@ namespace MySystem.Areas.Api.Controllers.v1
             value = DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             string Mobile = data["Mobile"].ToString(); //手机号
-            string LoginPwd = data["LoginPwd"].ToString(); //登录密码
+            string NickName = data["NickName"].ToString();
+            string HeadPhoto = data["HeadPhoto"].ToString();
+            string KxsOpenId = data["KxsOpenId"].ToString();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            UserForMobile query = maindb.UserForMobile.FirstOrDefault(m => m.Mobile == Mobile);
-            if (query == null)
+            Users user = maindb.Users.FirstOrDefault(m => m.Mobile == Mobile && m.Tags == KxsOpenId);
+            if (user == null)
             {
-                return Json(new AppResultJson() { Status = "-1", Info = "手机号不存在", Data = Obj });
-            }
-            Users user = maindb.Users.FirstOrDefault(m => m.Id == query.UserId) ?? new Users();
-            if (user.Status == -1)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "账号已注销，请联系码牌客服", Data = Obj });
-            }
-            if (user.Status == 1)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "账号已锁定，请联系码牌客服", Data = Obj });
-            }
-            if (LoginPwd != "ke#xiao@s_2022")
-            {
-                if (user.LoginPwd != function.MD532(LoginPwd))
-                {
-                    return Json(new AppResultJson() { Status = "-1", Info = "登录密码不正确", Data = Obj });
-                }
-                UserLoginRecord rec = new UserLoginRecord()
+                user = maindb.Users.Add(new Users()
                 {
                     CreateDate = DateTime.Now,
-                    UserId = user.Id,
-                    Kind = 1,
-                };
-            }
-            maindb.SaveChanges();
-            Obj.Add("Id", user.Id);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
-        }
-        public JsonResult Login2(string value)
-        {
-            value = DesDecrypt(value);
-            JsonData data = JsonMapper.ToObject(value);
-            string Mobile = data["Mobile"].ToString(); //手机号
-            string LoginPwd = data["LoginPwd"].ToString(); //登录密码
-            string DeviceId = data["DeviceId"].ToString();//设备Id
-            string DeviceType = data["DeviceType"].ToString();//设备类型（ios,android）
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            UserForMobile query = maindb.UserForMobile.FirstOrDefault(m => m.Mobile == Mobile);
-            if (query == null)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "手机号不存在", Data = Obj });
-            }
-            Users user = maindb.Users.FirstOrDefault(m => m.Id == query.UserId) ?? new Users();
-            if (user.Status == -1)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "账号已注销，请联系码牌客服", Data = Obj });
+                    Tags = KxsOpenId,
+                    NickName = NickName,
+                    HeadPhoto = HeadPhoto,
+                    Mobile = Mobile,
+                }).Entity;
+                maindb.SaveChanges();
             }
-            if (user.Status == 1)
+            else
             {
-                return Json(new AppResultJson() { Status = "-1", Info = "账号已锁定，请联系码牌客服", Data = Obj });
+                user.UpdateDate = DateTime.Now;
+                user.NickName = NickName;
+                user.HeadPhoto = HeadPhoto;
+                maindb.SaveChanges();
             }
-            if (LoginPwd != "ke#xiao@s_2022")
+            UserForMobile query = maindb.UserForMobile.FirstOrDefault(m => m.Mobile == Mobile);
+            if (query == null)
             {
-                if (user.LoginPwd != function.MD532(LoginPwd))
+                query = maindb.UserForMobile.Add(new UserForMobile()
                 {
-                    return Json(new AppResultJson() { Status = "-1", Info = "登录密码不正确", Data = Obj });
-                }
-                UserLoginRecord rec = new UserLoginRecord()
-                {
-                    CreateDate = DateTime.Now,
+                    Mobile = Mobile,
                     UserId = user.Id,
-                    Kind = 1,
-                };
+                }).Entity;
+                maindb.SaveChanges();
+            }
+            else
+            {
+                query.UserId = user.Id;
+                maindb.SaveChanges();
             }
-            user.DeviceId = DeviceId;
-            user.DeviceType = DeviceType;
-            maindb.SaveChanges();
             Obj.Add("Id", user.Id);
+            Obj.Add("Token", AppToken(user.Id.ToString()));
             return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
         }
+        public string AppToken(string u)
+        {
+            string test = function.get_Random(10);
+            var securityKey = new SigningCredentials(new SymmetricSecurityKey(Encoding.ASCII.GetBytes(JwtSecret)), SecurityAlgorithms.HmacSha256);
+            var claims = new Claim[] {
+                new Claim(JwtRegisteredClaimNames.Iss,JwtIss),
+                new Claim(JwtRegisteredClaimNames.Aud,test),
+                new Claim("Guid", Guid.NewGuid().ToString("D")),
+                new Claim(ClaimTypes.Role, "system"),
+                new Claim(ClaimTypes.Role, "admin"),
+            };
+            SecurityToken securityToken = new JwtSecurityToken(
+                signingCredentials: securityKey,
+                expires: DateTime.Now.AddDays(10),//过期时间
+                claims: claims,
+                audience: test,
+                issuer: u
+            );
+            RedisDbconn.Instance.Set("utoken:" + u, test);
+            RedisDbconn.Instance.SetExpire("utoken:" + u, 3600 * 24 * 10);
+            //生成jwt令牌
+            return new JwtSecurityTokenHandler().WriteToken(securityToken);
+        }
         #endregion
 
 

Program.cs

@@ -22,7 +22,7 @@ namespace MySystem
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
-                    .UseUrls("http://*:5045")
+                    .UseUrls("http://*:5301")
                     .UseKestrel()
                     .UseContentRoot(Directory.GetCurrentDirectory())
                     .UseIISIntegration()

Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://127.0.0.1:5045"
+      "applicationUrl": "http://127.0.0.1:5301"
     }
   }
 }

Startup.cs

@@ -97,8 +97,6 @@ namespace MySystem
             //services.AddHttpContextAccessor();
 
             MySystemLib.SystemPublicFuction.appcheck = "success";
-            InitMain();
-            InitBs();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -112,6 +110,7 @@ namespace MySystem
             {
                 app.UseHsts();
             }
+            Library.ConfigurationManager.EnvironmentFlag = 2;
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
             
             app.UseStaticFiles();
@@ -146,6 +145,10 @@ namespace MySystem
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
 
+            
+            InitMain();
+            InitBs();
+
         }
 
         private void InitMain()

appsettings.json

@@ -9,10 +9,10 @@
   "AllowedHosts": "*",
   "Setting": {
     "ConnectionStrings": "",
-    "Host": "http://localhost:5301/",
-    "SourceHost": "http://localhost:5301/",
+    "Host": "http://test.mpap.kexiaoshuang.com/",
+    "SourceHost": "http://test.mpap.kexiaoshuang.com/",
     "OssHost": "http://oss.qrcodeplate.com",
-    "QrCodeHost": "http://localhost:5301/",
+    "QrCodeHost": "http://test.mpap.kexiaoshuang.com/",
     "Database": "ApServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateBsServer;password=ld5Px33wvhyEz44P;database=QrCodePlateBsServer;charset=utf8;",