From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.yml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0565f5d..cc56ee9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,10 +13,10 @@
 
 spring:
   datasource:
-    #driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver
     #driver-class-name: oracle.jdbc.OracleDriver
-    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     druid:
       # MySql、PostgreSQL、SqlServer校验
       validation-query: select 1
@@ -196,6 +196,22 @@
       - /recruitment/**
       - /dispatcherUnit/**
       - /dispatcher/**
+      - /equipage/**
+      - /car/**
+      - /gun/**
+      - /trainingRegistration/**
+      - /workReport/**
+      - /examSubjectChoices/**
+      - /exampaper/**
+      - /examScore/**
+      - /exampaper/**
+      - /apply/**
+      - /trainExam/**
+      - /blade-desk/**
+      - /directive/**
+      - /blade-system/**
+      - /blade-resource/**
+      - /liveLocation/**
     #授权认证配置
     auth:
       - method: ALL

--
Gitblit v1.9.3