From 524a0867c6e8343607d343a4f708498c21baf9d4 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 28 二月 2025 15:25:34 +0800 Subject: [PATCH] 修改药品处方从表里拿处方类型以及sqlserver连接去除ssl --- ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java index 7722c26..db229d3 100644 --- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java +++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java @@ -96,7 +96,7 @@ public String login(String username, String password, Boolean type,String code,String uuid) { String aSwitch = configService.selectConfigByKey("captcha_switch"); - if(null !=aSwitch && aSwitch.equals("Y")){ + if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; String captcha = redisCache.getCacheObject(verifyKey); redisCache.deleteObject(verifyKey); @@ -117,6 +117,7 @@ try { //鐧诲綍瀵嗙爜瑙e瘑 String s = RsaUtils.decryptByPrivateKey(password); +// String s = password; if(username.equals("10001")){ s=username+s; } @@ -217,19 +218,24 @@ */ public String Cuslogin(String username, String password, Boolean type,String code,String uuid) { - String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; - String captcha = redisCache.getCacheObject(verifyKey); - redisCache.deleteObject(verifyKey); - if (captcha == null) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); - throw new CaptchaExpireException(); + String aSwitch = configService.selectConfigByKey("captcha_switch"); + if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){ + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + String captcha = redisCache.getCacheObject(verifyKey); + redisCache.deleteObject(verifyKey); + if (captcha == null) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); + throw new CaptchaException(); + } } - if (!code.equalsIgnoreCase(captcha)) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); - throw new CaptchaException(); - } + + LoginUser loginUser = loadCusByCusname(username, password); if (loginUser == null) { return "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒"; @@ -258,7 +264,7 @@ List<TjCustomer> customerList = customerService.list(wq); if (null == customerList || customerList.size() == 0) { //throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�"); - throw new ServiceException("璐︽埛鎴栧瘑鐮侀敊璇紝璇锋鏌ワ紒"); + throw new ServiceException("璐﹀彿鎴栧瘑鐮侀敊璇紝璇锋鏌ワ紒"); } for (TjCustomer tjCustomer : customerList) { try { -- Gitblit v1.8.0