diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml
index e0f2844b..6da188bf 100644
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -99,7 +99,10 @@
org.springframework.session
spring-session-data-redis
-
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
mysql
mysql-connector-java
diff --git a/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java b/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java
index 74970022..1b8bf70b 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/BoeServerAllApplication.java
@@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.system.ApplicationPid;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
@Configuration
@SpringBootApplication
diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
index 8eda0bfe..bc5c04b3 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
@@ -121,6 +121,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
accountDao.saveOrUpdate(a);
userDao.saveOrUpdate(u);
+ userDao.flush();
if(org!=null) {
orgDao.saveOrUpdate(org);
log.info("更新用户对应的机构信息");
diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java
index 60d20cc4..4acf33a0 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java
@@ -2,14 +2,16 @@ package com.xboe.school.api;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
-import com.xboe.common.PageList;
import com.xboe.common.Pagination;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties
index b04b459c..ce18d282 100644
--- a/servers/boe-server-all/src/main/resources/application-pro.properties
+++ b/servers/boe-server-all/src/main/resources/application-pro.properties
@@ -48,6 +48,14 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=root
spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
+## 使用 hikari 连接池
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.auto-commit: true
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.idle-timeout=60000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.maximum-pool-size=20
logging.level.org.hibernate.SQL=ERROR
# logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
diff --git a/servers/boe-server-all/src/main/resources/log/logback-dev.xml b/servers/boe-server-all/src/main/resources/log/logback-dev.xml
index 4a26a112..036f3ab7 100644
--- a/servers/boe-server-all/src/main/resources/log/logback-dev.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-dev.xml
@@ -50,5 +50,6 @@
+