Merge branch 'master' of https://code.bailuntec.com/Discuz/WeiPanAPI

# Conflicts: # src/console/Bailun.Discuz.ConsoleApp.Publish/appsettings.json

Merge branch 'master' of https://code.bailuntec.com/Discuz/WeiPanAPI
# Conflicts: # src/console/Bailun.Discuz.ConsoleApp.Publish/appsettings.json
97df4693 · xiongyuwen · 89252924 · 3c12c646 · 97df4693
Commit 97df4693 authored Feb 27, 2021 by xiongyuwen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

appsettings.Production.json ...lun.Discuz.ConsoleApp.Publish/appsettings.Production.json +4 -0

No files found.
--- a/src/console/Bailun.Discuz.ConsoleApp.Publish/appsettings.Production.json
+++ b/src/console/Bailun.Discuz.ConsoleApp.Publish/appsettings.Production.json
@@ -9,7 +9,11 @@
    "Defaultdatabase": 1
  },
  "PublishWeiPanWorkerRunTime": {
+<<<<<<< .merge_file_a66784
    "minute": "60"
+=======
+    "minute": "180"
+>>>>>>> .merge_file_a62564
  },
  "QYWeChat": {
    "AppId": "ww833808f6b8dc0745",