From 12610a45e90f37fab0aad1365ae22cc1d866723b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 24 Jul 2019 19:20:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 002d12e..22d3fd4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -69,6 +69,7 @@ public class SysDepartmentService implements ISysDepartmentService { SysOrganize organize = organizeRDao.getById(department.getOrganizeId()); ValidatorBean.checkNotNull(organize); + department.setOrganizeCode(organize.getOrganizeCode()); department.setOrganizeNameRdd(organize.getName()); LOGGER.info("部门信息 DEPARTMENT {}", department); @@ -161,6 +162,7 @@ public class SysDepartmentService implements ISysDepartmentService { ValidatorBean.checkNotNull(organize); department.setOrganizeNameRdd(organize.getName()); + department.setOrganizeCode(organize.getOrganizeCode()); // 新增部门 LOGGER.info("部门信息 DEPARTMENT department:{}", department); From 88894c8245cf762ea080fb4f517e0fb7e91af497 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 24 Jul 2019 20:26:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/IPersonnelService.java | 2 ++ .../controller/busi/SysDepartmentController.java | 14 ++++++++++---- .../apiservice/controller/busi/SysPositionController.java | 15 ++++++++++----- .../apiservice/serviceimpl/busi/CoreMemTreeService.java | 8 ++++---- .../serviceimpl/busi/PersonnelServiceService.java | 10 ++++++++++ .../apiservice/serviceimpl/busi/SysDepartmentService.java | 2 +- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index f794aef..09eaf34 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -136,6 +136,8 @@ public interface IPersonnelService { List findSysRefUserInfoDepartmentByDepartmentIdList(List departmentIdList); + List findSysDepartmentByOrganizeIdList(List organizeIdList); + @ApiOperation(value = "查询用户部门关系") List findSysUserInfoDepartmentByInfoId(Long infoId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index a97ab1d..6244617 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -109,13 +109,19 @@ public class SysDepartmentController extends CoreBaseController { .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); + SysDepartment sysDepartment = departmentService.getSysDepartmentById(department.getId()); + sysDepartment.setName(department.getName()); + sysDepartment.setDepartmentCode(department.getDepartmentCode()); + sysDepartment.setDepartmentSort(department.getDepartmentSort()); + sysDepartment.setParentId(department.getParentId()); + ConvertBean.modelUpdate(department, user); - if(department.getParentId() == null || department.getParentId() <= 0){ - department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - department.setParentNameRdd("顶级部门"); + if(sysDepartment.getParentId() == null || department.getParentId() <= 0){ + sysDepartment.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysDepartment.setParentNameRdd("顶级部门"); } - departmentService.updateSysDepartment(department); + departmentService.updateSysDepartment(sysDepartment); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index c25f392..0804218 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -106,14 +106,19 @@ public class SysPositionController extends CoreBaseController { .notNull("name", position.getName()) .notNull("positionCode", position.getPositionCode()); + SysPosition sysPosition = positionService.getSysPositionById(position.getId()); + sysPosition.setName(position.getName()); + sysPosition.setPositionCode(position.getPositionCode()); + sysPosition.setParentId(position.getParentId()); + //修改初始化 - ConvertBean.modelUpdate(position, user); - if (position.getParentId() == null || position.getParentId() <= 0) { - position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - position.setParentNameRdd("顶级岗位"); + ConvertBean.modelUpdate(sysPosition, user); + if (sysPosition.getParentId() == null || position.getParentId() <= 0) { + sysPosition.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysPosition.setParentNameRdd("顶级岗位"); } - positionService.updateSysPosition(position); + positionService.updateSysPosition(sysPosition); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 2c84304..90aca8c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -399,10 +399,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { // 通过组织获取部门信息 if (organizeId != null && organizeId > 0) { List organizeIdList = findSysOrganizeChildIdList(organizeId); - List refUserDepartmentList = personnelService.findSysRefUserDepartmentByOrganizeIdList(organizeIdList); - if (refUserDepartmentList != null && refUserDepartmentList.size() > 0) { - for (SysRefUserDepartment ref : refUserDepartmentList) { - refIdList.add(ref.getDepartmentId()); + List departmentList = personnelService.findSysDepartmentByOrganizeIdList(organizeIdList); + if (departmentList != null && departmentList.size() > 0) { + for (SysDepartment department : departmentList) { + refIdList.add(department.getId()); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index d26c41c..d924e31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -446,6 +446,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysDepartmentByOrganizeIdList(List organizeIdList) { + LOGGER.info("平台账号部门 SysRefUserInfoDepartment organizeIdList:{}", organizeIdList); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean); + + return departmentRDao.findByHqlWhere(packBean); + } + + @Override @ApiOperation(value = "查询用户部门关系") public List findSysUserInfoDepartmentByInfoId(Long infoId) { LOGGER.info("平台用户部门 SysDepartment infoId:{}", infoId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 22d3fd4..069f5a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -159,7 +159,7 @@ public class SysDepartmentService implements ISysDepartmentService { // 查询所属组织名称 LOGGER.info("组织信息 ORGANIZE organizeId:{}", department.getOrganizeId()); SysOrganize organize = organizeRDao.getById(department.getOrganizeId()); - ValidatorBean.checkNotNull(organize); + ValidatorBean.checkNotNull(organize,"不存的组织信息"); department.setOrganizeNameRdd(organize.getName()); department.setOrganizeCode(organize.getOrganizeCode()); From 6699347729e1546e54f0781b34e773052e5890ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 29 Jul 2019 16:41:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20YFAS=20=E5=AE=81?= =?UTF-8?q?=E5=BE=B7=E5=B7=A5=E5=8E=82=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application-docker-yfas-nd.properties | 188 +++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties new file mode 100644 index 0000000..6fe376f --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties @@ -0,0 +1,188 @@ +#本机ip +impp.server.ip=imppcore +#项目端口 +server.port=8100 +#链路追踪zipkin控制台ip地址 +impp.console.ip=http://console:8010 +#服务注册中心(多注册中心逗号分隔) +impp.cluster.regist.center=http://register:8000/eureka/ +#日志默认使用log4j2 +logging.config=classpath:log4j2-spring.xml + +########平台相关参数########## +#是否开启redis缓存 +impp.config.redis=true +#是否开启rabbitMQ +impp.config.rabbitmq=true +#是否开启swagger +impp.config.swagger=true +#是否开启websocket +impp.config.websocket=true +#是否开启文件服务 +impp.config.fastdfs=true +#是否对发布服务进行详细日志分析 +impp.log.detail.controller=true +#是否对调用服务进行详细日志分析 +impp.log.detail.service=true +#是否开启微服 +eureka.client.enabled=true +#打开feign的熔断 +feign.hystrix.enabled=true + +################ 队列处理 ################ +#站内信 +impp.mq.queue.letter=true +#邮件 +impp.mq.queue.mail=true +#定时任务 +impp.mq.queue.schedule=true +#SWEB通知处理队列 +impp.mq.queue.sweb.notice=true + +################################ 数据库相关设置 ################################ +# mysql +spring.datasource.validationQuery=SELECT 1 + +################ 数据池设置 ################ +spring.datasource.maximum-pool-size=10 +spring.datasource.max-active=5 +spring.datasource.max-idle=5 +spring.datasource.min-idle=1 +spring.datasource.initial-size=1 +spring.datasource.max-wait=10000 +spring.datasource.validation-query=SELECT 1 +spring.datasource.test-on-borrow=false +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=300000 + +##主数据源，读写 +#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource +impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver +impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=wmslogin +impp.write.datasource.password=Wmslogin$%^&7654 + +#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://dbslave:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=wmsreadonly +impp.read.datasource.password=Wmsreadonly8090!! + +################ 日志数据源 ################ +spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.uri=mongodb:27017 +spring.data.mongodb.username=sa +spring.data.mongodb.password=i3plus +spring.data.mongodb.port=27017 + +################ JPA设置设置 ################ +# mysql +spring.jpa.database=MYSQL +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect +#是否显示sql +spring.jpa.show-sql=true +#表关系create,create-drop,update,validate +spring.jpa.properties.hibernate.hbm2ddl.auto=update + +##############定时任务持久化############## +impp.schedule.open=true +impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver +impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd +impp.schedule.datasource.max-connections=20 +#定时任务在服务启动后多少秒执行 +impp.schedule.start.after-second=20 +#是否集群部署 +impp.schedule.datasource.is-clustered=true +#执行检测（毫秒），若宕机由其他定时器执行 +impp.schedule.datasource.cluster-checkin-interval=30000 +#线程数 +impp.schedule.thread-count=10 +#线程优先级（1-10）默认为5 +impp.schedule.thread-priority=5 + + +################################ 其他功能设置 ################################ +#redisIP +redis.hostName=redis +#端口号 +redis.port=6379 +#如果有密码 +redis.password= +##其他redis配置需要调整的加在此处 +################## rabbitMQ配置 #################### +spring.rabbitmq.vhost=/ +spring.rabbitmq.host=rabbitmq +spring.rabbitmq.port=5672 +spring.rabbitmq.username=estsh +spring.rabbitmq.password=estsh123 +##其他rabbitMq配置需要调整的加在此处 + + +################ 微服配置 ################ +#是否进行健康检查 +eureka.client.healthcheck.enabled=true +#若无法连接注册中心，是否需要一直检测加入 +impp.cluster.fetch=true +#集群名 +eureka.instance.metadata-map.cluster=impp_cluster +#（参数配置）注册中心地址 -》 i3plus-ics，多个用逗号分隔 +eureka.client.service-url.defaultZone=${impp.cluster.regist.center} +#本服务主机ip（若多个网卡，则需要设置本服务ip） +eureka.instance.ip-address=${impp.server.ip} +#本服务实例ID +eureka.instance.instance-id=${impp.server.ip}:${server.port} +#本服务主机名 +eureka.instance.hostname=${impp.server.ip} +#本服务状态页面 +eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html +#将自己的IP注册到Eureka Server。若不配置或设置为false，表示注册微服务所在操作系统的hostname到Eureka Server +eureka.instance.prefer-ip-address=true + +################ 检测机制 ################ +#心跳间隔周期，宕机限制（秒），30秒没反应视为宕机 +eureka.instance.lease-expiration-duration-in-seconds=30 +#心跳周期 +eureka.instance.lease-renewal-interval-in-seconds=20 + +################ 熔断配置 ################ +#重试 +ribbon.maxAutoRetries=2 +#读取数据时长 +ribbon.ReadTimeout=30000 +#连接时长 +ribbon.ConnectTimeout=50000 +#响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长） +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 + +################ 链路追踪 ################ +#使用web方式传输信息 +spring.zipkin.sender.type=web +#链路追踪服务的地址 +spring.zipkin.base-url=${impp.console.ip} +#追踪深度，百分比，1是全部 +spring.sleuth.sampler.probability=1.0 + +################ FastDfs 配置 ################ +#tracker服务器ip +fastdfs.tracker_servers=tracker:22122 +# tracker的http端口 +fastdfs.http_tracker_http_port=22122 +# 使用自定义工具获取文件展示地址 +fastdfs.http.ui.host=http://tracker:22122 +#密码 +#fastdfs.http.secret_key= + +#连接超时 +fastdfs.connect_timeout_in_seconds=10000 +#传输超时 +fastdfs.network_timeout_in_seconds=10000 +fastdfs.charset=UTF-8 +# token 防盗链功能 +fastdfs.http_anti_steal_token=no + +################ 授权配置 ################ +slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 +slm.app.id=10000 From 9381d57d2604db64c170eb212348b1d85930b09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 29 Jul 2019 18:47:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-docker-yfas-nd.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties index 6fe376f..cd00a7a 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties @@ -89,9 +89,9 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update impp.schedule.open=true impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=impp_i3_schedule_user -impp.schedule.datasource.password=impp_i3_schedule_pwd -impp.schedule.datasource.max-connections=20 +impp.schedule.datasource.username=wmslogin +impp.schedule.datasource.password=Wmslogin$%^&7654 +impp.schedule.datasource.max-connections=50 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 #是否集群部署 @@ -99,7 +99,7 @@ impp.schedule.datasource.is-clustered=true #执行检测（毫秒），若宕机由其他定时器执行 impp.schedule.datasource.cluster-checkin-interval=30000 #线程数 -impp.schedule.thread-count=10 +impp.schedule.thread-count=50 #线程优先级（1-10）默认为5 impp.schedule.thread-priority=5 From eea8c23503ed17a464fab6afa2cebec307e96821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Tue, 30 Jul 2019 15:24:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/application-docker-yfas-nd.properties | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties index cd00a7a..c650419 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties @@ -65,9 +65,17 @@ impp.write.datasource.password=Wmslogin$%^&7654 #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://dbslave:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=wmsreadonly -impp.read.datasource.password=Wmsreadonly8090!! +impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=wmslogin +impp.read.datasource.password=Wmslogin$%^&7654 + +##############定时任务持久化############## +impp.schedule.open=true +impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver +impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=wmslogin +impp.schedule.datasource.password=Wmslogin$%^&7654 +impp.schedule.datasource.max-connections=50 ################ 日志数据源 ################ spring.data.mongodb.database=mongoDBSource @@ -85,13 +93,6 @@ spring.jpa.show-sql=true #表关系create,create-drop,update,validate spring.jpa.properties.hibernate.hbm2ddl.auto=update -##############定时任务持久化############## -impp.schedule.open=true -impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=wmslogin -impp.schedule.datasource.password=Wmslogin$%^&7654 -impp.schedule.datasource.max-connections=50 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 #是否集群部署 From c4fd04af0686d4cb21919c7d5e5b8476b4e6950c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 30 Jul 2019 19:34:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/WhiteController.java | 6 ++---- .../i3plus/core/apiservice/controller/busi/PersonnelController.java | 1 + .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 2 ++ .../src/main/resources/application-docker-yfas-nd.properties | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) 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 4fe7530..03d3ba8 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 @@ -74,9 +74,6 @@ public class WhiteController extends CoreBaseController { private ISysDictionaryService dictionaryService; @Autowired - private FastDFSClient dfsClient; - - @Autowired private ISysOrderNoRuleService sysOrderNoRuleService; @Autowired @@ -116,7 +113,8 @@ public class WhiteController extends CoreBaseController { @GetMapping(value="/auth/login") @ApiOperation(value="登陆",notes="登陆") - public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode, + public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, + @RequestParam(required = false) String languageCode, @RequestParam(required = false) String ipAddr, @RequestParam(required = false) String deviceId){ startMultiService(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 4c912bb..86a82f6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -695,6 +695,7 @@ public class PersonnelController extends CoreBaseController { user.setDepartmentId(Long.parseLong(model.getUserDepartmentId())); user.setUserEmail(model.getUserEmail()); user.setUserPhone(model.getUserPhone()); + user.setLanguageCode(model.getUserLanguageCode()); if (!StringUtils.isAnyBlank(model.getUserLoginPassword())) { // 使用新密码 user.setUserLoginPassword(EncryptTool.hexMD5(model.getUserLoginPassword())); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index fce464a..d292abc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -599,6 +599,8 @@ public class SysUserService implements ISysUserService { sessionUser.setToken(AuthUtil.getSession().getId().toString()); sessionUser.setUser(user); + AuthUtil.setDeviceId(deviceId); + return sessionUser; } diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties index cd00a7a..a1c7de1 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties @@ -58,14 +58,14 @@ spring.datasource.time-between-eviction-runs-millis=300000 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.write.datasource.username=wmslogin impp.write.datasource.password=Wmslogin$%^&7654 #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://dbslave:3306/impp_i3_wms?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=wmsreadonly impp.read.datasource.password=Wmsreadonly8090!!