diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml index e8534f3..a1cb73a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml @@ -34,9 +34,9 @@ o.org_building_number, o.org_property_type, o.org_building_area, - o.org_province, - o.org_city, - o.org_district, + (select a.`name` from sys_category a where o.org_province = a.id ) as org_province, + (select a.`name` from sys_category a where o.org_city = a.id ) as org_city, + (select a.`name` from sys_category a where o.org_district = a.id ) as org_district, o.contract, o.contract_note, o.franchise_Time, diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java index 0c842c4..3732e55 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java @@ -101,7 +101,7 @@ public class WorkOrderController extends JeecgController edit(@RequestBody WorkOrder workOrder) { workOrderService.updateMqById(workOrder); - return Result.OK("编辑成功!"); + return Result.OK("提交成功!"); } /** diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 49221fe..a8ef5e1 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -87,6 +87,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 + filterChainDefinitionMap.put("/sys/randomInputCode/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/smsCheckCaptcha", "anon"); //短信次数发送太多验证码排除 filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index df201a0..a268a05 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -554,6 +554,39 @@ public class LoginController { return res; } + /** + * 后台生成图形验证码 :有效 + * @param response + * @param key + */ + @ApiOperation("获取验证码") + @GetMapping(value = "/randomInputCode/{key}") + public Result randomInputCode(HttpServletResponse response,@PathVariable("key") String key){ + Result res = new Result(); + try { + //生成验证码 + String code = RandomUtil.randomString(BASE_CHECK_CODES,4); + //存到redis中 + String lowerCaseCode = code.toLowerCase(); + + //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 + // 加入密钥作为混淆,避免简单的拼接,被外部利用,用户自定义该密钥即可 + String origin = lowerCaseCode+key+jeecgBaseConfig.getSignatureSecret(); + String realKey = Md5Util.md5Encode(origin, "utf-8"); + //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 + + redisUtil.set(realKey, lowerCaseCode, 60); + log.info("获取验证码,Redis key = {},checkCode = {}", realKey, code); + res.setSuccess(true); + res.setResult(code); + } catch (Exception e) { + log.error(e.getMessage(), e); + res.error500("获取验证码失败,请检查redis配置!"); + return res; + } + return res; + } + /** * 切换菜单表为vue3的表 */