Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

 Conflicts:

	sql/ruoyi-vue-pro.sql

	yudao-admin-server/src/main/resources/application.yaml

	yudao-admin-server/src/test/resources/sql/clean.sql

	yudao-admin-server/src/test/resources/sql/create_tables.sql

	yudao-admin-ui/src/utils/dict.js

	yudao-user-server/src/main/resources/application-local.yaml

yudao-user-server/src/main/resources/application-local.yaml

@@ -63,6 +63,11 @@ spring:
 
 --- #################### 定时任务相关配置 ####################
 
+# Quartz 配置项，对应 QuartzProperties 配置类
+spring:
+  quartz:
+    auto-startup: false # 无需使用 Quartz，交给 yudao-admin-server 环境
+
 --- #################### 配置中心相关配置 ####################
 
 # Apollo 配置中心
@@ -156,3 +161,24 @@ yudao:
     pay-notify-url: http://jg6rde.natappfree.cc/api/pay/order/notify
     refund-notify-url: http://jg6rde.natappfree.cc/api/pay/refund/notify
     pay-return-url: http://jg6rde.natappfree.cc/api/pay/order/return
+
+justauth:
+  enabled: true
+  type:
+    WECHAT_MP: # 微信公众平台 - 移动端 H5 https://www.yuque.com/docs/share/a795bef6-ee8a-494a-8dc4-2ef41927743b?#%20%E3%80%8A%E5%BE%AE%E4%BF%A1%E5%85%AC%E4%BC%97%E5%8F%B7%E6%B5%8B%E8%AF%95%E3%80%8B
+      client-id: wxa5a05b85ac361f96
+      client-secret: 247073c7cebb67f27f0e769195c2a57e
+#      client-id: wx5b23ba7a5589ecbb # TODO 芋艿：自己的测试，后续可以删除
+#      client-secret: 2a7b3b20c537e52e74afd395eb85f61f
+      ignore-check-redirect-uri: true
+    WECHAT_MINI_PROGRAM: # 微信小程序 https://www.yuque.com/docs/share/88e3d30a-6830-45fc-8c25-dae485aef3aa?#%20%E3%80%8A%E5%B0%8F%E7%A8%8B%E5%BA%8F%E6%8E%88%E6%9D%83%E7%99%BB%E5%BD%95%E3%80%8B
+      client-id: wx44d047d87e6284d8
+      client-secret: 21c3b7a8a51ee1b8f5cf875848ed4466
+      #        client-id: wx63c280fe3248a3e7  # TODO 芋艿：自己的测试，后续可以删除
+      #        client-secret: 6f270509224a7ae1296bbf1c8cb97aed
+      ignore-check-redirect-uri: true
+      ignore-check-state: true
+  cache:
+    type: REDIS
+    prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
+    timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟