feat:开发

sunpengfei

1 天以前 67d5dbb966df4af4304b4168378c68ce83ad01b1

feat:开发

 FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs

@@ -75,14 +75,14 @@
        /// <summary>
        /// 企业全称
        /// </summary>
        [Required]
        [Required(ErrorMessage = "请填写企业名称")]
        [MaxLength(128)]
        public string EnterpriseName { get; set; }

        /// <summary>
        /// 统一社会信用代码
        /// </summary>
        [Required]
        [Required(ErrorMessage = "请填写统一社会信用代码")]
        [MaxLength(18)]
        public string SocietyCreditCode { get; set; }


 FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs

@@ -79,12 +79,17 @@
        public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
        {
            UnifyContext.Fill(metadata.ValidationResult);
            var errors = "参数错误";
            if (metadata.ValidationResult is Dictionary<string, string[]> result && result != null && result.Count > 0)
            {
                errors = result.SelectMany(it => it.Value).FirstOrDefault() ?? "参数错误";
            }
            return new JsonResult(
                GetResult(
                    metadata.StatusCode ?? StatusCodes.Status400BadRequest,
                    data: metadata.Data,
                    errorCode: "s400",
                    errors: "参数错误"),
                    errors: errors),
                UnifyContext.GetSerializerSettings(context));
        }


 FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs

@@ -42,9 +42,8 @@
        {
            var now = DateTime.Now;
            var logier = JwtUtils.GetCurrentLogier();
            var q = repTaskInfo.AsQueryable().AsNoTracking()
                .OrderBy(it => it.CreatedTime)
                .Where(it => it.BeginTime <= now.Date && now.Date <= it.EndTime);
            IQueryable<TaskInfo> q = repTaskInfo.AsQueryable().AsNoTracking()
                .OrderBy(it => it.CreatedTime);

            if (logier.Type == EnumUserType.Personal)
            {

 FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs

@@ -76,7 +76,8 @@
                        ExternalAgreementNo = entity.Code,
                        ThirdPartyType = entity.ThirdPartyType,
                    });
                    if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                    if (!response.IsError)
                    {
                    entity.AgreementNo = response.AgreementNo;
                    entity.SignTime = response.SignTime.ToDateTime();
                    entity.ValidTime = response.ValidTime.ToDateTime();
@@ -96,6 +97,7 @@
                    entity.CreditAuthMode = response.CreditAuthMode;
                    update = true;
                }
                }

                if (entity.SignStatus == EnumEnterpriseWalletSignStatus.Normal && entity.AccountBookStatus != EnumEnterpriseWalletAccountBookStatus.Normal)
                {

 FlexJobApi.Web.Entry/appsettings.json

@@ -3,16 +3,16 @@
  "Environment": "Local",
  "ConnectionStrings": {

    //"FlexJobApi": "Server=120.26.58.240; Database=Dev_FlexJobApi; User=bole;Password=Bole1472589;Encrypt=false;",
    //"FlexJobApiLog": "Server=120.26.58.240; Database=Dev_FlexJobApiLog; User=bole;Password=Bole1472589;Encrypt=false;",
    //"HumanResources": "Server=120.26.58.240; Database=Dev_12333; User=bole;Password=Bole1472589;Encrypt=false;",
    //"SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"

    "FlexJobApi": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;",
    "FlexJobApiLog": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApiLog; User=bole;Password=Blcs20@%27;Encrypt=false;",
    "HumanResources": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_12333; User=bole;Password=Blcs20@%27;Encrypt=false;",
    "FlexJobApi": "Server=120.26.58.240; Database=Dev_FlexJobApi; User=bole;Password=Bole1472589;Encrypt=false;",
    "FlexJobApiLog": "Server=120.26.58.240; Database=Dev_FlexJobApiLog; User=bole;Password=Bole1472589;Encrypt=false;",
    "HumanResources": "Server=120.26.58.240; Database=Dev_12333; User=bole;Password=Bole1472589;Encrypt=false;",
    "SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"

    //"FlexJobApi": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;",
    //"FlexJobApiLog": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApiLog; User=bole;Password=Blcs20@%27;Encrypt=false;",
    //"HumanResources": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_12333; User=bole;Password=Blcs20@%27;Encrypt=false;",
    //"SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"

  },
  "Consul": {
    "Address": "http://localhost:8500/",