Merge remote-tracking branch 'origin/master'

giftBook-admin/pom.xml

@@ -75,6 +75,11 @@
             <artifactId>giftBook-job</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.xxzhx.giftBook</groupId>
+            <artifactId>giftBook-main</artifactId>
+        </dependency>
+
         <!-- 代码生成-->
         <dependency>
             <groupId>cn.xxzhx.giftBook</groupId>

giftBook-admin/src/main/java/cn/xxzhx/giftBook/web/controller/AuthController.java

@@ -107,7 +107,7 @@ public class AuthController {
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {
             SseMessageDto dto = new SseMessageDto();
-            dto.setMessage("欢迎登录giftBook后台管理系统");
+            dto.setMessage("欢迎登录礼薄后台管理系统");
             dto.setUserIds(List.of(userId));
             SseMessageUtils.publishMessage(dto);
         }, 5, TimeUnit.SECONDS);

giftBook-admin/src/main/resources/application-dev.yml

@@ -245,3 +245,7 @@ justauth:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitlab
+
+# 字体文件路径
+ttfFile:
+  path: E:\giftBook\MicrosoftYaHei.ttf

giftBook-admin/src/main/resources/application-prod.yml

@@ -63,24 +63,6 @@ spring:
 #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
 #          username:
 #          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
       hikari:
         # 最大连接池数量
         maxPoolSize: 20
@@ -265,3 +247,7 @@ justauth:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitlab
+
+# 字体文件路径
+ttfFile:
+  path: /usr/local/project/giftBook/jar/fonts/MicrosoftYaHei.ttf