diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 77af224..3e4de62 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -66,6 +66,10 @@
i3plus.platform
i3plus-platform-common
+
+ i3plus.platform
+ i3plus-platform-plugin
+
@@ -163,6 +167,7 @@
poi-ooxml
+
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index 032bb1b..3983853 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
@@ -10,6 +10,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -303,4 +305,17 @@ public class WhiteController extends CoreBaseController {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
+
+ @PostMapping(value = "/sys-find-user/list")
+ @ApiOperation(value = "查询用户列表信息",notes = "查询用户列表信息")
+ public ResultBean findSysUserInfoList(UserDetailModel model){
+ try {
+ List userList = personnelService.querySysUserByUserDetailModelOrIds(model, new ArrayList<>());
+ return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userList);
+ }catch(ImppBusiException busExcep){
+ return ResultBean.fail(busExcep);
+ }catch(Exception e){
+ return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+ }
+ }
}
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index 9666fb2..4537466 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -185,4 +185,8 @@ fastdfs.connect_timeout_in_seconds=5
fastdfs.network_timeout_in_seconds=60
fastdfs.charset=UTF-8
# token 防盗链功能
-fastdfs.http_anti_steal_token=no
\ No newline at end of file
+fastdfs.http_anti_steal_token=no
+
+################ 授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
index 386e0cd..8856ec8 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
@@ -65,7 +65,7 @@ impp.write.datasource.password=impp_i3_core_pwd
##辅数据源,只读
#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd
@@ -181,4 +181,8 @@ fastdfs.connect_timeout_in_seconds=5
fastdfs.network_timeout_in_seconds=60
fastdfs.charset=UTF-8
# token 防盗链功能
-fastdfs.http_anti_steal_token=no
\ No newline at end of file
+fastdfs.http_anti_steal_token=no
+
+################ 授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index 1655b14..fbc61c1 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -185,4 +185,8 @@ fastdfs.connect_timeout_in_seconds=5
fastdfs.network_timeout_in_seconds=60
fastdfs.charset=UTF-8
# token 防盗链功能
-fastdfs.http_anti_steal_token=no
\ No newline at end of file
+fastdfs.http_anti_steal_token=no
+
+################ 授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
index fdd2276..4d9681b 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -185,4 +185,8 @@ fastdfs.connect_timeout_in_seconds=5
fastdfs.network_timeout_in_seconds=60
fastdfs.charset=UTF-8
# token 防盗链功能
-fastdfs.http_anti_steal_token=no
\ No newline at end of file
+fastdfs.http_anti_steal_token=no
+
+################ 授权配置 ################
+slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
+slm.app.id=20190513
diff --git a/pom.xml b/pom.xml
index 636c3f8..6bbb5aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,13 @@
i3plus-platform-common
${project.version}
+
+
+ i3plus.platform
+ i3plus-platform-plugin
+ ${project.version}
+
+
i3plus.pojo
i3plus-pojo-platform