wangmh 7 سال پیش
والد
کامیت
d2f80d60ff

+ 0 - 3
sso-server/src/main/java/com/uas/sso/controller/LogoutController.java

@@ -60,9 +60,6 @@ public class LogoutController extends BaseController {
     @RequestMapping(value = "/login/logout", method = RequestMethod.GET)
     @ResponseBody
     public ModelMap logout() throws IOException {
-        System.err.print(request.getContextPath());
-        System.err.print(request.getHeaderNames().toString());
-        System.err.print(request.getCookies());
         String callback = request.getParameter("callback");
         String returnURL = request.getParameter("returnURL") == null ? HOME_PAGE : request.getParameter("returnURL");
         String baseUrl = request.getParameter("baseUrl");

+ 2 - 2
sso-server/src/main/java/com/uas/sso/controller/UserspaceRegisterController.java

@@ -208,7 +208,7 @@ public class UserspaceRegisterController extends BaseController {
             SSOToken st = new SSOToken(request, userAccount.getMobile());
             st.setData(JSON.toJSONString(userAccount));
             SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户({})注册并登录成功,时间:{}", user.getUserUU(), System.currentTimeMillis());
+            LOGGER.info("用户({})注册并登录成功,时间:{}", admin.getUserUU(), System.currentTimeMillis());
             return success(data);
         } else if ("city".equals(appId) || "city".equals(app.getUserControl())) {
             UserAccount userAccount = userAccountService.findOneByUserUU(appId, admin.getUserUU(), userspace.getSpaceUU());
@@ -223,7 +223,7 @@ public class UserspaceRegisterController extends BaseController {
             SSOToken st = new SSOToken(request, userAccount.getMobile());
             st.setData(JSON.toJSONString(userAccount));
             SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户({})注册并登录成功,时间:{}", user.getUserUU(), System.currentTimeMillis());
+            LOGGER.info("用户({})注册并登录成功,时间:{}", admin.getUserUU(), System.currentTimeMillis());
             return success(data);
         }
         LOGGER.info("用户({})注册成功,时间:{}", user.getUserUU(), System.currentTimeMillis());

+ 1 - 1
sso-server/src/main/java/com/uas/sso/service/impl/LoginServiceImpl.java

@@ -123,7 +123,7 @@ public class LoginServiceImpl implements LoginService {
         // 校验密码强度,如果和存储的不同,则保存
         int strength = PasswordLevelUtils.checkPasswordLevel(loginParam.getPassword()).getValue();
         if (strength != user.getPasswordLevel()) {
-            LOGGER.info("用户密码等级修改:{} -> {}",user.getPasswordLevel(), strength);
+            LOGGER.info("用户({})密码等级修改:{} -> {}", user.getUserUU(), user.getPasswordLevel(), strength);
             user.setPasswordLevel(strength);
             userService.save(user);
         }

+ 2 - 2
sso-server/src/main/java/com/uas/sso/util/MessageUtils.java

@@ -53,7 +53,7 @@ public class MessageUtils {
             }
             messageUtils.smsService.send(smsTplId.getValue(), mobile, data);
         } catch (Exception e) {
-            messageUtils.logger.warn("短信发送失败,{}, 模板:{},手机号:{}", e.getMessage(), templateId, mobile);
+            messageUtils.logger.warn("短信发送失败,{}, 模板:{},手机号:{}", e.getMessage(), templateId, mobile, e);
         }
     }
 
@@ -74,7 +74,7 @@ public class MessageUtils {
             }
             messageUtils.mailService.send(mailTplId.getValue(), email, data);
         } catch (Exception e) {
-            messageUtils.logger.warn("邮箱发送失败, {},模板:{},邮箱:{}", e.getMessage(), templateId, email);
+            messageUtils.logger.warn("邮箱发送失败, {},模板:{},邮箱:{}", e.getMessage(), templateId, email, e);
         }
     }
 

+ 1 - 1
sso-server/src/main/java/com/uas/sso/web/advice/ExceptionHandlerAdvice.java

@@ -42,7 +42,7 @@ public class ExceptionHandlerAdvice {
 	 */
 	@ExceptionHandler(VisibleError.class)
 	public ResponseEntity<ModelMap> handleVisibleError(VisibleError ex) {
-        logger.warn("{}: {}", ex.getClass().getName(), ex.getMessage());
+        logger.warn("{}: {}", ex.getClass().getName(), ex.getMessage(), ex);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<ModelMap>(error(ex.getMessage()), headers, HttpStatus.OK);

+ 1 - 1
sso-server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 23232
+  port: 8081
 
 spring:
   main: