Merge branch 'master' of https://gitee.com/yiliuyang/newgaokao

New_College.Api/Controllers/Front/CustomerController.cs

@@ -53,6 +53,7 @@ namespace New_College.Api.Controllers.Front
                     }
                     TokenModelJwt tokenModel = new TokenModelJwt { Uid = response.Id, Role = "users" };
                     response.Token = JwtHelper.IssueJwt(tokenModel);
+                    response.session_key = result.session_key;
                     return new MessageModel<CustomerInfoResult>()
                     {
                         success = true,
@@ -90,7 +91,8 @@ namespace New_College.Api.Controllers.Front
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<MessageModel<bool>> WeixinDecryptUserInfo(DecryptUserInfoRequest request)
+        [AllowAnonymous]
+        public async Task<MessageModel<string>> WeixinDecryptUserInfo(DecryptUserInfoRequest request)
         {
             var phoneinfo = _services.GetWeixinPhone(new GetPhoneInfo()
             {
@@ -107,12 +109,25 @@ namespace New_College.Api.Controllers.Front
             customerinfo.Gender = request.gender;
             customerinfo.Phone = phoneinfo;
             var result = await _services.Update(customerinfo);
-            return new MessageModel<bool>()
+            if (result)
             {
-                msg = result ? "修改成功" : "保存失败",
-                response = result,
-                success = result
-            };
+                return new MessageModel<string>()
+                {
+                    msg = result ? "修改成功" : "保存失败",
+                    response = phoneinfo,
+                    success = result
+                };
+            }
+            else
+            {
+                return new MessageModel<string>()
+                {
+                    msg = result ? "修改成功" : "保存失败",
+                    response = "0",
+                    success = result
+                };
+
+            }
 
         }
 

New_College.Model/Models/V_CustomerInfo.cs

@@ -29,7 +29,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 用户名
         /// </summary>
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(ColumnDataType = "varchar", Length = 191, IsNullable = true, IsTranscoding = true)]
         public string NickName { get; set; }
 
         /// <summary>

New_College.Model/Request/DecryptUserInfoRequest.cs

@@ -1,4 +1,5 @@
-using System;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -12,7 +13,6 @@ namespace New_College.Model.Request
         /// </summary>
         public string avatarUrl { get; set; }
 
-
         public string nickName { get; set; }
 
         public int gender { get; set; }

New_College.Model/ViewModels/Result/CustomerInfoResult.cs

@@ -7,6 +7,9 @@ namespace New_College.Model.ViewModels
 {
     public class CustomerInfoResult
     {
+
+        public string session_key { get; set; }
+
         public string Token { get; set; }
         /// <summary>
         /// 返回状态1成功  2验证码错误  3失败