From 1c1761d54822e8bc89744e8e4e5c9d22db4a461d Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 09 九月 2025 15:29:40 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Web.Entry/Startup.cs | 4 +-
FlexJobApi.Core/FlexJobApi.Core.xml | 2
FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs | 6 +-
FlexJobApi.Web.Entry/appsettings.json | 49 +++++++++++++-----------
4 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 4ac2ebe..3b520b0 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4957,7 +4957,7 @@
<param name="taskIds"></param>
<returns></returns>
</member>
- <member name="M:FlexJobApi.Core.CompleteTaskSettlementT1Job.GetTasks(System.String)">
+ <member name="M:FlexJobApi.Core.CompleteTaskSettlementT1Job.GetTasks">
<summary>
鏌ヨ浠诲姟
</summary>
diff --git a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
index 2c9c5a5..debb6b7 100644
--- a/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
+++ b/FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs
@@ -43,7 +43,7 @@
var env = App.GetConfig<string>("Environment");
if (env != "Local")
{
- var tasks = await GetTasks(env);
+ var tasks = await GetTasks();
var enterpriseIds = tasks.DistinctSelect(it => it.EnterpriseId);
var taskIds = tasks.DistinctSelect(it => it.Id);
var taskUsers = await GetTaskUsers(taskIds);
@@ -333,13 +333,13 @@
/// </summary>
/// <param name="env"></param>
/// <returns></returns>
- private async Task<List<TaskInfo>> GetTasks(string env)
+ private async Task<List<TaskInfo>> GetTasks()
{
var now = DateTime.Now;
var q = rep.AsQueryable()
.Include(it => it.Enterprise)
.Where(it => it.SettlementStatus == EnumTaskSettlementStatus.InProcess);
- var minTime = env == "Test"
+ var minTime = App.GetConfig<string>("Task:SettlementTime") == "T0"
? now.AddMinutes(-5)
: now.AddDays(-1);
q = q.Where(it => it.SettlementStartTime.HasValue && it.SettlementStartTime < minTime);
diff --git a/FlexJobApi.Web.Entry/Startup.cs b/FlexJobApi.Web.Entry/Startup.cs
index 2b71e1b..850fd57 100644
--- a/FlexJobApi.Web.Entry/Startup.cs
+++ b/FlexJobApi.Web.Entry/Startup.cs
@@ -62,8 +62,8 @@
options.AddJob<CalcTaskSatusByDateJob>(Triggers.Hourly());
options.AddJob<CalcUserAgeByIdCardJob>(Triggers.Daily());
options.AddJob<RefreshEnterpriseWalletStatusJob>(Triggers.PeriodMinutes(5));
- options.AddJob<RefreshEnterpriseWalletTransactionStatusJob>(Triggers.PeriodMinutes(2));
- options.AddJob<CompleteTaskSettlementT1Job>(Triggers.PeriodMinutes(2));
+ options.AddJob<RefreshEnterpriseWalletTransactionStatusJob>(Triggers.PeriodMinutes(5));
+ options.AddJob<CompleteTaskSettlementT1Job>(Triggers.PeriodMinutes(5));
});
services.AddSpecificationDocuments(options =>
diff --git a/FlexJobApi.Web.Entry/appsettings.json b/FlexJobApi.Web.Entry/appsettings.json
index 8343c46..c3a81e1 100644
--- a/FlexJobApi.Web.Entry/appsettings.json
+++ b/FlexJobApi.Web.Entry/appsettings.json
@@ -3,15 +3,15 @@
"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": {
@@ -55,6 +55,9 @@
}
]
},
+ "Task": {
+ "SettlementTime": "T0"
+ },
"AliPay": {
"ServerUrl": "https://openapi.alipay.com/gateway.do",
"AppId": "2021004171602214",
@@ -70,32 +73,32 @@
"AlipayPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDrOheetqHkE1RYaNhogP/iHVXEtGZW4A/JJnwpJs+6eLXfpXf/ecuywplDpgc/BXSUEnDaktUwceLXO8vdIf8h0y8yqWwYdgzC0xELYpTroK3dlNiShgVkUEeMXi+n3Mhjp9OVrqieggDI3YGzDBLY4UAWsXCcXnD+r/xIpT8keVMtb/LrUmL5XLvBVcn5MkJTAoeFt18EQXOLFN1+ldpaf9k+iyM2fbgXCc6InNSgHGSHZwhzm9t+cGqNd1ju/nQN9lHwKCDQPMn6cor2lsP1nsEfpHp2vdfNEdccVSRZB/kdtFzXEUpTFznz8+zK2D0Ra+B0G1nSxus9xsD3HmwIDAQAB"
},
"Aliyun": {
- //"OSS": {
- // "AccessKeyId": "LTAI4GAdJ88mUMMFBHHiyDmS",
- // "AccessSecret": "NX3AmjOcGkJ8bncQfIVxqmifBWkI0E",
- // "RegionId": "cn-hangzhou",
- // "Endpoint": "http://oss-cn-hangzhou.aliyuncs.com",
- // "BucketName": "waterdroptest2",
- // "Url": "https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/",
- // "RoleArn": "acs:ram::1483797030072898:role/boleoss",
- // "RoleSessionName": "SessionTest",
- // "Policy": "{\"Version\":\"1\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"oss:PutObject\",\"Resource\":[\"acs:oss:*:*:waterdroptest2/*\",\"acs:oss:*:*:parkmanagement/*\",\"acs:oss:*:*:jurenlian/*\"]}]}",
- // "DurationSeconds": 3600
- //},
-
"OSS": {
"AccessKeyId": "LTAI4GAdJ88mUMMFBHHiyDmS",
"AccessSecret": "NX3AmjOcGkJ8bncQfIVxqmifBWkI0E",
"RegionId": "cn-hangzhou",
"Endpoint": "http://oss-cn-hangzhou.aliyuncs.com",
- "BucketName": "parkmanagement",
- "Url": "https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/",
+ "BucketName": "waterdroptest2",
+ "Url": "https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/",
"RoleArn": "acs:ram::1483797030072898:role/boleoss",
"RoleSessionName": "SessionTest",
"Policy": "{\"Version\":\"1\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"oss:PutObject\",\"Resource\":[\"acs:oss:*:*:waterdroptest2/*\",\"acs:oss:*:*:parkmanagement/*\",\"acs:oss:*:*:jurenlian/*\"]}]}",
"DurationSeconds": 3600
},
+ //"OSS": {
+ // "AccessKeyId": "LTAI4GAdJ88mUMMFBHHiyDmS",
+ // "AccessSecret": "NX3AmjOcGkJ8bncQfIVxqmifBWkI0E",
+ // "RegionId": "cn-hangzhou",
+ // "Endpoint": "http://oss-cn-hangzhou.aliyuncs.com",
+ // "BucketName": "parkmanagement",
+ // "Url": "https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/",
+ // "RoleArn": "acs:ram::1483797030072898:role/boleoss",
+ // "RoleSessionName": "SessionTest",
+ // "Policy": "{\"Version\":\"1\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\"oss:PutObject\",\"Resource\":[\"acs:oss:*:*:waterdroptest2/*\",\"acs:oss:*:*:parkmanagement/*\",\"acs:oss:*:*:jurenlian/*\"]}]}",
+ // "DurationSeconds": 3600
+ //},
+
"SMS": {
"Enable": true,
"WithoutVerifyCode": true,
--
Gitblit v1.9.1