From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.yml |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 720ccf4..72074fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,7 +48,30 @@
         session-stat-max-count: 10
   main:
     allow-circular-references: true
+  #邮件配置
+  mail:
+    # 配置 SMTP 服务器地址
+    host: smtp.qq.com
+    # 发送者邮箱
+    username: 503*****@qq.com
+    # 配置密码,注意不是真正的密码,而是刚刚申请到的授权码
+    password: apbpxb****bwtbiha
+    # 端口号465或587
+    port: 587
+    # 默认的邮件编码为UTF-8
+    default-encoding: UTF-8
+    # 配置SSL 加密工厂
+    properties:
+      mail:
+        smtp:
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+        #表示开启 DEBUG 模式,这样,邮件发送过程的日志会在控制台打印出来,方便排查错误
+        debug: true
+    protocol: smtps
 
+#  jackson:
+#    date-format: yyyy-MM-dd HH:mm:ss
+#    time-zone: GMT+8
 # mybatis
 mybatis-plus:
   mapper-locations: classpath:org/springblade/**/mapper/*Mapper.xml
@@ -125,17 +148,18 @@
 
 #报表配置
 report:
-  enabled: false
+  enabled: true
   database:
     provider:
       prefix: blade-
+  file-store-dir: D:/myfile/ureportDbfiles
 
 #oss默认配置
 oss:
   enabled: true
   name: qiniu
   tenant-mode: true
-  endpoint: http://prt1thnw3.bkt.clouddn.com
+  endpoint: https://srgdjczzxtpt.com:2080/gminio/jczz/
   access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h
   secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS
   bucket-name: bladex
@@ -170,6 +194,7 @@
   token:
     #是否有状态
     state: false
+    sign-key: CJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJ1c2VyX25hbWUiOiIxNTE3MDcyMDY5NSIsInJlYWxfbmFtZSI6Inpob25nIiwidG9rZW5fdHlwZSI6ImFjY2Vzc190b2tlbiIsInJvbGVfbmFtZSI
   #redis序列化方式
   redis:
     serializer-type: protostuff
@@ -198,17 +223,48 @@
       - /blade-chat/weixin
       - /blade-desk/notice/submit
       - /blade-flow/model/submit
+      - /blade-article/article/submit
   #安全框架配置
   secure:
     #接口放行
     skip-url:
       - /blade-test/**
+      - /sse/**
+      - /blade-doorplateAddress/doorplateAddress/getFuncList
+      - /blade-rotation/rotation/page
+      - /blade-article/article/page
+      - /blade-article/article/detail
+      - /blade-articleComment/articleComment/page
+      - /public_discuss/publicDiscuss/detail
+      - /blade-userPublicEnroll/userPublicEnroll/page
+      - /blade-topics/topics/lists
+      - /blade-household/household/getHouseholdOtherInfo
+      - /blade-resource/oss/endpoint/put-file
+      - /blade-resource/oss/endpoint/put-file-attach-by-prefix-path
+      - /blade-hiddenDangerRecord/**
+      - /blade-system/user/getPoliceUser
+      - /blade-policeAlarmRecords/policeAlarmRecords/save
+#      - /blade-householdLabel/**
+#      - /blade-placeRel/**
 #      - /blade-doorplateAddress/doorplateAddress/**
-      - /blade-house/house/**
-      - /blade-label/label/**
-      - /blade-houseRental/houseRental/**
-      - /blade-resource/oss/**
-      - /blade-place/**
+#      - /blade-house/house/**
+#      - /blade-household/household/**
+#      - /blade-label/label/**
+#      - /blade-houseRental/houseRental/**
+#      - /blade-resource/oss/**
+#      - /blade-place/**
+#      - /blade-taskReportForRepairs/**
+#      - /blade-placeExt/**
+#      - /blade-grid/**
+#      - /blade-community/**
+#      - /blade-gridman/**
+#      - /blade-propertyCompany/**
+#      - /blade-eCallEvent/**
+#      - /blade-system/**
+#      - /blade-propertyCompanyComment/**
+#      - /blade-policeStation/**
+#      - /blade-policeAffairsGrid/**
+#      - /blade-category/**
     #授权认证配置
     auth:
       - method: ALL

--
Gitblit v1.9.3