日志修改

sso-server/src/main/java/com/uas/sso/controller/BaseController.java

@@ -319,9 +319,6 @@ public class BaseController {
     }
 
     protected String[] getFrontAllUrl() {
-        System.out.println(request.getHeader("X-Forwarded-Proto"));
-        System.out.println(request.getHeader("X-Forwarded-For"));
-        System.out.println(request.getHeader("X-Forwarded-Host"));
         String url = SSOConfig.getSSOProperties().get("sso.front.url");
         return url.split(",");
     }

sso-server/src/main/java/com/uas/sso/controller/LoginController.java

@@ -172,6 +172,7 @@ public class LoginController extends BaseController {
         Token oldToken = tokenService.findOne(token);
         if (oldToken == null) {
             LOGGER.warn("token({})已过期，更新token失败", token);
+            return error("token过期");
         }
         oldToken.setExpires_in(7*24*60*60);
         tokenService.save(oldToken);

sso-server/src/main/java/com/uas/sso/foreign/weixin/service/impl/WeChatServiceImpl.java

@@ -26,9 +26,8 @@ public class WeChatServiceImpl implements WeChatService {
         try {
             HttpUtil.ResponseWrap res = HttpUtil.doGet(url);
             if (res.getContent() != null) {
-                System.out.println(res.getContent().toString());
                 // {"access_token":"xxx","expires_in":7200,"refresh_token":"xxx","openid":"xxx","scope":"snsapi_userinfo","unionid":"xxx"}
-                OAuthInfo oAuthInfo = JSON.parseObject(res.getContent().toString(), OAuthInfo.class);
+                OAuthInfo oAuthInfo = JSON.parseObject(res.getContent(), OAuthInfo.class);
                 return oAuthInfo;
             }
         } catch (Exception e) {
@@ -44,8 +43,7 @@ public class WeChatServiceImpl implements WeChatService {
         try {
             HttpUtil.ResponseWrap res = HttpUtil.doGet(url);
             if (res.getContent() != null) {
-                System.out.println(res.getContent().toString());
-                UserInfo userInfo = JSON.parseObject(res.getContent().toString(), UserInfo.class);
+                UserInfo userInfo = JSON.parseObject(res.getContent(), UserInfo.class);
                 return userInfo;
             }
         } catch (Exception e) {

sso-server/src/main/java/com/uas/sso/service/impl/RestSmsServiceImpl.java

@@ -87,9 +87,7 @@ public class RestSmsServiceImpl implements SmsService {
         object.put("params", params);
 
         HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
-        logger.warn("短信发送开始, 模板：{}，手机号：{}", templateId, receiver);
         ResponseEntity<SmsLog> responseEntity = restTemplate.postForEntity(SMS_CONSOLE_HOST + SMS_SEND_URL, formEntity, SmsLog.class);
-        logger.warn("短信发送成功, 模板：{}，手机号：{}", templateId, receiver);
         return responseEntity.getBody();
     }
 

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -662,8 +662,6 @@ public class UserServiceImpl implements UserService {
         Calendar end = Calendar.getInstance();
         end.setTime(endToDate);
         end.add(Calendar.MONTH, -month);
-        System.out.println(new Timestamp(start.getTimeInMillis()));
-        System.out.println(new Timestamp(end.getTimeInMillis()));
         return userRecordDao.getCountByLogin(new Timestamp(start.getTimeInMillis()),new Timestamp(end.getTimeInMillis()));
 
     }

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -170,7 +170,6 @@ public class UserspaceServiceImpl implements UserspaceService {
         if (noSyncApp != null && apps.contains(noSyncApp)) {
             apps.remove(noSyncApp);
         }
-        System.out.println(apps.toString());
         syncUserSpaceInfo(formData, msg, apps);
     }
 

sso-server/src/main/java/com/uas/sso/util/IpUtils.java

@@ -13,6 +13,8 @@ import javax.servlet.http.HttpServletRequest;
  **/
 public class IpUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(IpUtils.class);
+
     public static String getIp(HttpServletRequest request) {
         String ip = request.getHeader("x-forwarded-for");
         if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
@@ -24,6 +26,10 @@ public class IpUtils {
         if (ip.contains(",")) {
             return ip.split(",")[0];
         } else {
+            logger.info("x-forwarded-for：{}", ip);
+            logger.info("X-Forwarded-Proto：{}", request.getHeader("X-Forwarded-Proto"));
+            logger.info("X-Forwarded-for：{}", request.getHeader("X-Forwarded-for"));
+            logger.info("X-Forwarded-Host：{}", request.getHeader("X-Forwarded-Host"));
             return ip;
         }
     }

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

@@ -51,9 +51,7 @@ public class MessageUtils {
             if (StringUtils.isEmpty(smsTplId)) {
                 throw new RuntimeException("模板不存在");
             }
-            messageUtils.logger.warn("短信发送准备, 模板：{}，手机号：{}", templateId, mobile);
             messageUtils.smsService.send(smsTplId.getValue(), mobile, data);
-            messageUtils.logger.warn("短信发送完成, 模板：{}，手机号：{}", templateId, mobile);
         } catch (Exception e) {
             messageUtils.logger.warn("短信发送失败，{}, 模板：{}，手机号：{}", e.getMessage(), templateId, mobile);
         }

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

@@ -28,7 +28,7 @@ public class ExceptionHandlerAdvice {
 	 */
 	@ExceptionHandler(RuntimeException.class)
 	public ResponseEntity<ModelMap> handleRuntimeException(RuntimeException 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);