diff --git a/servers/org-user-sync/pom.xml b/servers/org-user-sync/pom.xml
index 7ace7330..bbdc4229 100644
--- a/servers/org-user-sync/pom.xml
+++ b/servers/org-user-sync/pom.xml
@@ -22,11 +22,6 @@
xboe-core
1.0.0
-
- com.xboe
- xboe-redis
- 1.0.0
-
com.auth0
@@ -57,20 +52,12 @@
org.springframework.boot
spring-boot-starter-data-jpa
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
+
org.springframework.boot
spring-boot-starter-web
-
- org.springframework.session
- spring-session-data-redis
-
-
-
+
mysql
mysql-connector-java
5.1.27
diff --git a/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java b/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java
index fed402a0..25c72f08 100644
--- a/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java
+++ b/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java
@@ -58,6 +58,7 @@ public class StartRunner implements ApplicationRunner {
}
mainOrgMap.put(org.getKid(),mainOrg.getId());//
}
+ //本地的检查 ,如果老库中没有,新库中有,也要设置为删除
List localList=mainService.getAllSysIdAndId();
for(MainOrganization mainOrg : localList) {
if(!oldIds.contains(mainOrg.getSysId())) {
@@ -105,6 +106,8 @@ public class StartRunner implements ApplicationRunner {
//
// }
// }
+
+ System.exit(0);
} catch (Exception e) {
log.error("执行失败",e);
diff --git a/servers/org-user-sync/src/main/resources/application-dev.properties b/servers/org-user-sync/src/main/resources/application-dev.properties
index 4c9fd28e..0fd09e24 100644
--- a/servers/org-user-sync/src/main/resources/application-dev.properties
+++ b/servers/org-user-sync/src/main/resources/application-dev.properties
@@ -1,12 +1,8 @@
-# redis
-spring.redis.database=2
-spring.redis.host=127.0.0.1
-spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
-spring.redis.port=6379
+
# datasource config
# basic数据库
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=none
spring.jpa.open-in-view=false
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
@@ -14,7 +10,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
# 当前数据库 basic 对应的数据库
spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/boeu_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/boe_old?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.db1.username=root
spring.datasource.db1.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
@@ -23,27 +19,23 @@ spring.datasource.db1.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
# 主数据库 all 对应的数据库
spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/boe_base3?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.db2.username=root
spring.datasource.db2.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
-logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+logging.level.org.hibernate.SQL=ERROR
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
# 设置logback.xml位置
-logging.config=classpath:log/logback-dev.xml
+logging.config=classpath:log/logback-pro.xml
-## 静态文件目录,默认是在static下面,以后独立到nginx下面配置
-spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
## 上传相磁的路径配置
-xboe.upload.file.temp_path=E:/Projects/BOE/java/static/temp
-xboe.upload.file.save_path=E:/Projects/BOE/java/static/upload
-xboe.upload.file.http_path=http://localhost:9090/cdn/upload
+xboe.upload.file.temp_path=
+xboe.upload.file.save_path=
+xboe.upload.file.http_path=
-## 新系统的内部地址,可以不通过nginx调用
-xboe.inner.data.sync.baseurl=http://localhost:9090
#加密盐
#jasypt.encryptor.password=jasypt