diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index cc40a99..1dbd51f 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -146,6 +146,18 @@
2.5.0
+
+ com.adc
+ report-activity
+ 2.5.0
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
index c96a8c7..2a3e8c7 100644
--- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
+++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
@@ -1,12 +1,13 @@
package com.adc.da;
+import org.activiti.spring.boot.SecurityAutoConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.ComponentScan;
-@SpringBootApplication
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
@ServletComponentScan
@ComponentScan("com.adc")
public class AdcDaApplication {
diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java
index bc3ddfe..d908d0d 100644
--- a/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java
+++ b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java
@@ -87,9 +87,9 @@ public class WebConfig {
return registration;
}
- /**
+/* *//**
* 防伪造jsessionid
- */
+ *//*
@Bean
public FilterRegistrationBean fakeJSessionIdFilter() {
FilterRegistrationBean registration = new FilterRegistrationBean();
@@ -98,6 +98,6 @@ public class WebConfig {
registration.setName("fakeJSessionIdFilter");
registration.setOrder(5);
return registration;
- }
+ }*/
}
\ No newline at end of file
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 458e4cc..4231dbe 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -35,7 +35,7 @@
#spring.datasource.mysql.password = root
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
spring.datasource.username = root
spring.datasource.password = hzwlsoft.com
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index ccbbc0b..b958990 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -71,4 +71,8 @@ queue.capacity=8
mybatis-plus.configuration.map-underscore-to-camel-case=true
+spring.activiti.database-schema-update=true
+# ????????:true-???????false-??
+spring.activiti.check-process-definitions=false
+
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
index 308fd24..c1d4c69 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
@@ -3,6 +3,8 @@ package com.adc.da.sys.vo;
import java.util.ArrayList;
import java.util.List;
+import com.adc.da.sys.entity.OrgEO;
+import com.adc.da.sys.entity.RoleEO;
import com.adc.da.sys.vo.iam.OrgsShortVoIAM;
import lombok.Data;
@@ -43,12 +45,11 @@ public class UserVO {
/**
* 角色ID列表
*/
- private List roleIdList = new ArrayList<>();
-
+ private List roleEOList = new ArrayList<>();
/**
* 部门列表
*/
- private List orgList = new ArrayList();
+ private List orgList = new ArrayList();
}
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
index e1d96be..acb4d10 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
@@ -58,6 +58,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
u.*, r.id as id,
@@ -115,9 +136,26 @@
-