consume fieldsForUseCommonConfig in real run

packages/geek-auto-start-chat-with-boss/index.mjs

@@ -112,7 +112,15 @@ export async function initPuppeteer () {
   }
 }
 
-const targetCompanyList = readConfigFile('target-company-list.json').filter(it => !!it.trim());
+const commonJobConditionConfig = readConfigFile('common-job-condition-config.json')
+const fieldsForUseCommonConfig = readConfigFile('boss.json').fieldsForUseCommonConfig ?? {}
+
+const targetCompanyList = (
+  !fieldsForUseCommonConfig.expectCompanies ?
+    readConfigFile('target-company-list.json')
+    :
+    commonJobConditionConfig.expectCompanies
+).filter(it => !!it.trim());
 const combineRecommendJobFilterType = readConfigFile('boss.json').combineRecommendJobFilterType ?? CombineRecommendJobFilterType.ANY_COMBINE
 
 const anyCombineRecommendJobFilter = readConfigFile('boss.json').anyCombineRecommendJobFilter
@@ -125,14 +133,34 @@ const expectJobRegExpStr = readConfigFile('boss.json').expectJobRegExpStr
 const jobNotMatchStrategy = readConfigFile('boss.json').jobNotMatchStrategy ?? MarkAsNotSuitOp.MARK_AS_NOT_SUIT_ON_BOSS
 
 const expectCityNotMatchStrategy = readConfigFile('boss.json').expectCityNotMatchStrategy ?? MarkAsNotSuitOp.NO_OP
-const expectCityList = readConfigFile('boss.json').expectCityList ?? []
+const expectCityList = (
+  !fieldsForUseCommonConfig.city ?
+    readConfigFile('boss.json').expectCityList
+    :
+    commonJobConditionConfig.expectCityList
+) ?? []
 
 const strategyScopeOptionWhenMarkJobCityNotMatch = readConfigFile('boss.json').strategyScopeOptionWhenMarkJobCityNotMatch ?? StrategyScopeOptionWhenMarkJobNotMatch.ONLY_COMPANY_MATCHED_JOB
 
 // salary
-const expectSalaryLow = parseFloat(readConfigFile('boss.json').expectSalaryLow) || null
+const expectSalaryLow = parseFloat(
-const expectSalaryHigh = parseFloat(readConfigFile('boss.json').expectSalaryHigh) || null
+  !fieldsForUseCommonConfig.salary ? 
-const expectSalaryCalculateWay = readConfigFile('boss.json').expectSalaryCalculateWay ?? SalaryCalculateWay.MONTH_SALARY
+    readConfigFile('boss.json').expectSalaryLow
+    :
+    commonJobConditionConfig.expectSalaryLow
+) || null
+const expectSalaryHigh = parseFloat(
+  !fieldsForUseCommonConfig.salary ? 
+    readConfigFile('boss.json').expectSalaryHigh
+    :
+    commonJobConditionConfig.expectSalaryHigh
+) || null
+const expectSalaryCalculateWay = (
+  !fieldsForUseCommonConfig.salary ?
+    readConfigFile('boss.json').expectSalaryCalculateWay
+    :
+    commonJobConditionConfig.expectSalaryCalculateWay
+) ?? SalaryCalculateWay.MONTH_SALARY
 const expectSalaryNotMatchStrategy = readConfigFile('boss.json').expectSalaryNotMatchStrategy ?? MarkAsNotSuitOp.NO_OP
 const isSalaryFilterEnabled = expectSalaryLow || expectSalaryHigh
 const strategyScopeOptionWhenMarkSalaryNotMatch = readConfigFile('boss.json').strategyScopeOptionWhenMarkSalaryNotMatch ?? StrategyScopeOptionWhenMarkJobNotMatch.ONLY_COMPANY_MATCHED_JOB
@@ -153,7 +181,12 @@ expectWorkExpList = Array.from(expectWorkExpListSet)
 const expectWorkExpNotMatchStrategy = readConfigFile('boss.json').expectWorkExpNotMatchStrategy ?? MarkAsNotSuitOp.NO_OP
 const strategyScopeOptionWhenMarkJobWorkExpNotMatch = readConfigFile('boss.json').strategyScopeOptionWhenMarkJobWorkExpNotMatch ?? StrategyScopeOptionWhenMarkJobNotMatch.ONLY_COMPANY_MATCHED_JOB
 
-let jobDetailRegExpMatchLogic = readConfigFile('boss.json').jobDetailRegExpMatchLogic ?? JobDetailRegExpMatchLogic.EVERY
+let jobDetailRegExpMatchLogic = (
+  !fieldsForUseCommonConfig.jobDetail ?
+    readConfigFile('boss.json').jobDetailRegExpMatchLogic
+    :
+    commonJobConditionConfig.jobDetailRegExpMatchLogic
+) ?? JobDetailRegExpMatchLogic.EVERY
 
 const markAsNotActiveSelectedTimeRange = (() => {
   let n = readConfigFile('boss.json').markAsNotActiveSelectedTimeRange
@@ -176,8 +209,9 @@ let {
   expectJobNameRegExpStr,
   expectJobTypeRegExpStr,
   expectJobDescRegExpStr,
-} = readConfigFile('boss.json')
+} = !fieldsForUseCommonConfig.jobDetail ? readConfigFile('boss.json') : commonJobConditionConfig
 if (
+  !fieldsForUseCommonConfig.jobDetail &&
   expectJobRegExpStr &&
   !expectJobNameRegExpStr &&
   !expectJobTypeRegExpStr &&
@@ -247,7 +281,12 @@ const recommendJobPageUrl = `https://www.zhipin.com/web/geek/jobs`
 
 const expectCompanySet = new Set(targetCompanyList)
 const enableCompanyAllowList = Boolean(expectCompanySet.size)
-const blockCompanyNameRegExpStr = readConfigFile('boss.json').blockCompanyNameRegExpStr ?? ''
+const blockCompanyNameRegExpStr = (
+  !fieldsForUseCommonConfig.blockCompanyNameRegExpStr ?
+    readConfigFile('boss.json').blockCompanyNameRegExpStr
+    :
+    commonJobConditionConfig.blockCompanyNameRegExpStr
+) ?? ''
 const blockCompanyNameRegExp = (() => {
   if (!blockCompanyNameRegExpStr?.trim()) {
     return null

packages/geek-auto-start-chat-with-boss/runtime-file-utils.mjs

@@ -73,6 +73,27 @@ if (
         }
       }
     )
+    let {
+      expectJobRegExpStr,
+      expectJobNameRegExpStr,
+      expectJobTypeRegExpStr,
+      expectJobDescRegExpStr,
+    } = bossConfig
+    if (
+      expectJobRegExpStr &&
+      !expectJobNameRegExpStr &&
+      !expectJobTypeRegExpStr &&
+      !expectJobDescRegExpStr
+    ) {
+      expectJobNameRegExpStr = expectJobRegExpStr
+      expectJobTypeRegExpStr = expectJobRegExpStr
+      expectJobDescRegExpStr = expectJobRegExpStr
+    }
+    Object.assign(defaultCommonJobConditionConfig, {
+      expectJobNameRegExpStr,
+      expectJobTypeRegExpStr,
+      expectJobDescRegExpStr
+    })
   }
   let targetCompanyList = null
   if (

packages/ui/src/main/flow/READ_NO_REPLY_AUTO_REMINDER_MAIN/index.ts

@@ -58,12 +58,21 @@ const rechatLlmFallback =
   readConfigFile('boss.json').autoReminder?.rechatLlmFallback ??
   RECHAT_LLM_FALLBACK.SEND_LOOK_FORWARD_EMOTION
 
-const expectJobTypeRegExpStr = readConfigFile('boss.json').expectJobTypeRegExpStr
+const fieldsForUseCommonConfig = readConfigFile('boss.json').fieldsForUseCommonConfig ?? {}
+const commonJobConditionConfig = readConfigFile('common-job-condition-config.json') ?? {}
+const expectJobTypeRegExpStr =
+  (!fieldsForUseCommonConfig.jobDetail ? readConfigFile('boss.json') : commonJobConditionConfig)
+    ?.expectJobTypeRegExpStr ?? ''
 const onlyRemindBossWithExpectJobType =
   readConfigFile('boss.json').autoReminder?.onlyRemindBossWithExpectJobType ??
   !!expectJobTypeRegExpStr
 
-const blockCompanyNameRegExpStr = readConfigFile('boss.json').blockCompanyNameRegExpStr ?? ''
+const blockCompanyNameRegExpStr =
+  (!fieldsForUseCommonConfig.blockCompanyNameRegExpStr
+    ? readConfigFile('boss.json')
+    : commonJobConditionConfig
+  )?.blockCompanyNameRegExpStr ?? ''
+
 const blockCompanyNameRegExp = (() => {
   if (!blockCompanyNameRegExpStr?.trim()) {
     return null