From 1341ab9e6490647490da86b170bf1951f4935395 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 15 May 2019 14:50:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E5=88=86=E7=A6=BBdbslave=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++++- .../src/main/resources/application-docker.properties | 8 ++++++-- .../src/main/resources/application-prod.properties | 6 +++++- .../src/main/resources/application-test.properties | 6 +++++- 4 files changed, 21 insertions(+), 5 deletions(-) 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 e9668be..c35e513 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -183,4 +183,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 From 144e86dd90431cf0d41832edbba06ffbb0497189 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 15 May 2019 14:53:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0=E5=AF=86=E7=8B=97=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-apiservice/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) 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 + From b826dec8b45abc89abc3e00519cb69713d0fad7d Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 16 May 2019 17:16:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/base/WhiteController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 11c8e99..19e045c 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); + } + } } From 561f28b06fae24ff9a84243e52d8075535e36604 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 16 May 2019 17:35:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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