0712

src/Shentun.WebPeis.Application.Contracts/UserTokenDto.cs

@@ -30,5 +30,10 @@ namespace Shentun.WebPeis
         /// 会话键值
         /// </summary>
         public string SessionKeyValue { get; set; }
+
+        /// <summary>
+        /// 是否开启个人预约
+        /// </summary>
+        public char IsOpenPersonalAppointment { get; set; }
     }
 }

src/Shentun.WebPeis.Application/Persons/PersonAppService.cs

@@ -38,6 +38,7 @@ using Shentun.Utilities.Enums;
 using Shentun.Sms.Client;
 using Shentun.Utilities;
 using IdentityModel;
+using Shentun.WebPeis.SysParmValues;
 namespace Shentun.WebPeis.Persons
 {
     /// <summary>
@@ -61,6 +62,7 @@ namespace Shentun.WebPeis.Persons
         private readonly CacheService _cacheService;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IRepository<CustomerOrg> _customerOrgRepository;
+        private readonly SysParmValueManager _sysParmValueManager;
         public PersonAppService(IRepository<Person> repository,
              IConfiguration configuration,
              IRepository<Volo.Abp.Identity.IdentityUser, Guid> identityUserRepository,
@@ -74,7 +76,8 @@ namespace Shentun.WebPeis.Persons
              CacheService cacheService,
              IHttpContextAccessor httpContextAccessor,
              IRepository<CustomerOrg> customerOrgRepository,
-             IRepository<QuestionRegister> questionRegisterRepository)
+             IRepository<QuestionRegister> questionRegisterRepository,
+             SysParmValueManager sysParmValueManager)
         {
             _repository = repository;
             _configuration = configuration;
@@ -90,6 +93,7 @@ namespace Shentun.WebPeis.Persons
             _httpContextAccessor = httpContextAccessor;
             _customerOrgRepository = customerOrgRepository;
             _questionRegisterRepository = questionRegisterRepository;
+            _sysParmValueManager = sysParmValueManager;
         }
 
         public async Task<PersonDto> GetByIdAsync(PersonIdInputDto input)
@@ -154,7 +158,10 @@ namespace Shentun.WebPeis.Persons
             _cache.Set(sessionKey, sessionKeyValue, options);
             token.SessionKey = sessionKey;
             token.SessionKeyValue = sessionKeyValue;
-
+            var isOpenPersonalAppointmentStr = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "is_open_personal_appointment");
+            if (string.IsNullOrWhiteSpace(isOpenPersonalAppointmentStr))
+                isOpenPersonalAppointmentStr = "Y";
+            token.IsOpenPersonalAppointment = Convert.ToChar(isOpenPersonalAppointmentStr);
             return token;
 
         }
@@ -765,12 +772,25 @@ namespace Shentun.WebPeis.Persons
 
             var verifySmsValidTimeStr = _configuration.GetSection("Sms")
               .GetSection("VerifySmsValidTime").Value;
+
+            var isTemplateTimeStr = _configuration.GetSection("Sms")
+              .GetSection("IsTemplateTime").Value;
+
             if (!int.TryParse(verifySmsValidTimeStr, out var verifySmsValidTime))
             {
                 throw new Exception("解析校验短信有效时间错误");
             }
 
+            if (isTemplateTimeStr == "N")
+            {
+                createSmsTaskDto.Content = message;
+            }
+            else
+            {
                 createSmsTaskDto.Content = message + "|" + verifySmsValidTime.ToString();
+            }
+
+
             //发送短信
             createSmsTaskDto.TaskCycleType = '0';
             await SmsClientHelper.CreateVerifySmsTask(createSmsTaskDto);

src/Shentun.WebPeis.HttpApi.Host/appsettings.json

@@ -54,6 +54,7 @@
     "Password": "888888",
     "VerifySmsTypeId": "3a12e09d-438a-1d08-d4f0-712aef13708d",
     "VerifySmsValidTime": "1",
+    "IsTemplateTime": "N",
     "SmsAppId": "3a12e09f-8534-ec43-8c46-e61af0964ab6"
   },
   "Redis": {