Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService

qwj

2023-08-28 f99c1becb0bbde82796e15d27e11ac4965c56468

Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService

 .gitignore

@@ -31,3 +31,4 @@
/DocumentServiceAPI.Services/obj
ZcPayCore/obj/
DocumentServiceApi.InitQMessage/obj/
DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml

 DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml

File was deleted

 DocumentServiceAPI.Application/UserAndLogin/LogInController.cs

@@ -1,5 +1,7 @@
using DocumentServiceAPI.Application.UserAndLogin.Services;
using DocumentServiceAPI.Application.UserAndLogin.ViewMode;
using DocumentServiceAPI.Model.cyDocumentModel;
using DocumentServiceAPI.Model.UserInfoModel;
using DocumentServiceAPI.Utility;
using Furion.DynamicApiController;
using Furion.JsonSerialization;
@@ -74,7 +76,7 @@
                        case 0:
                            throw Oops.Oh($"账户或者密码错误");
                        case 1:
                        if (!needtoken)
                        if (!IsTokenPass)
                        {
                            needtoken = await _userService.CheckPsw(Tender[0].TenderId, Tender[0].EmployeeID, Parma.PassWord);

@@ -193,34 +195,33 @@

        }






     

        /// <summary>
        /// 获取公司列表
        /// 是否是用户租户，或者是员工
        /// </summary>
        /// <returns>登录信息</returns>      
        public bool GetUnitList()
        /// <param name="ITCode">账号</param>
        /// <returns>  返回true 代表是， false代表不是</returns>
        [HttpGet("IDIsEmployee")]
        public async Task<bool> IDIsEmployee(string ITCode, [FromServices] ISqlSugarClient db)
        {
          var ad=  ITCode.TryValidate(ValidationTypes.PhoneNumber);
            if(!ad.IsValid)
            {
                throw Oops.Oh("请输入正确的账号");
            }

          var count= await db.Queryable<TenantInfo>().Where(x=>x.ItCode==ITCode&&x.IsEn==true&&x.IsDel==false).WithCache(600).CountAsync();
            if (count > 0)
            return true;
        }
        /// <summary>
        /// 获取公司列表
        /// </summary>
        /// <returns>登录信息</returns>
        public bool GetTenantInfoList()
        {
            count=await db.Queryable<Document_EmployeeInfo>().Where(x=>x.UserName==ITCode).WithCache(600).CountAsync();
            if (count > 0)
                return true;
            return false;

            return true;
        }
        public string Get()
        {
            return $"Hello {nameof(Furion)}";
        }





    }
}

 DocumentServiceAPI.Application/applicationsettings.json

@@ -56,10 +56,10 @@
  },
  "ZCUserInfoJwtOP": { //zc用户中心jwt配置 用于解析zc的token

      "Issuer": "http://zc",
      "Audience": "http://zc",
      "Expires": 86400,
      "weixinExpires": 1296000, // 86400,
    "Issuer": "http://localhost",
    "Audience": "http://localhost",
    "Expires": 10800,
    "weixinExpires": 1296000,
      "SecurityKey": "superSecretKey@345",
      "RefreshTokenExpires": 86400,
      "LoginPath": "/_Framework/Redirect401"

 DocumentServiceAPI.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\DocServiceAPI</_PublishTargetUrl>
    <History>True|2023-08-03T03:23:49.7155745Z;True|2023-08-03T10:57:12.3860490+08:00;True|2023-08-02T17:29:04.8984231+08:00;True|2023-08-02T14:24:54.6607875+08:00;True|2023-08-02T13:12:00.3228236+08:00;</History>
    <History>True|2023-08-25T08:28:37.8668025Z;True|2023-08-25T15:17:17.9212851+08:00;True|2023-08-25T11:21:18.2228201+08:00;True|2023-08-03T11:23:49.7155745+08:00;True|2023-08-03T10:57:12.3860490+08:00;True|2023-08-02T17:29:04.8984231+08:00;True|2023-08-02T14:24:54.6607875+08:00;True|2023-08-02T13:12:00.3228236+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 DocumentServiceAPI.Web.Entry/appsettings.json

@@ -32,7 +32,7 @@
  //消息队列配置 为了独立部署，这里单独配置
  "InitQRedisConfig": {
    // 如果采用容器化部署Service 要写成redis的服务名，否则写地址
    "ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串
    "ConnectionString": "127.0.0.1:6379,password=,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=7" //redis数据库连接字符串

  },