ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -5,7 +5,9 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUserDept; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.RSAPublicKeyExample; import com.ruoyi.common.utils.SecurityUtils; @@ -15,6 +17,7 @@ import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysMenuService; import com.smartor.mapper.SysUserDeptMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -56,6 +59,9 @@ @Value("${isEncryp}") private Integer isEncryp; @Autowired private SysUserDeptMapper sysUserDeptMapper; /** * 登录方法 @@ -133,6 +139,18 @@ ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); List<SysUserDept> sysUserDeptKSs = null; List<SysUserDept> sysUserDeptBQs = null; SysUserDept sysUserDept = new SysUserDept(); sysUserDept.setUserId(user.getUserId()); sysUserDept.setDeptType("1"); sysUserDept.setOrgid(user.getOrgid()); sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept); ajax.put("belongDepts", sysUserDeptKSs); sysUserDept.setDeptType("2"); sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept); ajax.put("belongWards", sysUserDeptBQs); return ajax; } ruoyi-admin/src/main/resources/application-druid.yml
@@ -48,9 +48,9 @@ # 从库数据源 slave: enabled: true url: jdbc:oracle:thin:@//192.168.100.10:1521/orcl username: healthy password: healthy url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis username: wssf password: Hzsywssf driver-class-name: oracle.jdbc.OracleDriver # enabled: true # url: jdbc:mysql://192.168.100.10:3306/emr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 @@ -86,8 +86,8 @@ # 配置一个连接在池中最大生存的时间,单位是毫秒 maxEvictableIdleTimeMillis: 900000 # 配置检测连接是否有效 # validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 validationQuery: SELECT 1 FROM DUAL #validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -113,12 +113,14 @@ multi-statement-allow: true # redis 配置 redis: host: 192.168.100.10 port: 6020 # 数据库索引 # host: 192.168.100.10 # port: 6020 # database: 0 # password: Smartor host: 127.0.0.1 port: 6379 database: 0 # 密码 password: Smartor password: # 连接超时时间 timeout: 10s lettuce: @@ -231,11 +233,11 @@ #本 地 短信请求地址(这个服务是我们自己写的) #xhsmsPath: http://192.168.2.13:8092/sendSms #新华短信请求地址(这个服务是我们自己写的) xhsmsPath: http://192.16.4.220:8092/sendSms xhsmsPath: http://121.41.98.232:8001/sms/api/sendMessageMass #帐号 xhsmsAccount: 911124 xhsmsAccount: 300044 #接口密码 xhsmsPwd: zW5eXe xhsmsPwd: qj0NHDegxWhj #虚拟接入码 xhsmsjrm: 1069055