异常类型及日志内容修改

sso-server/src/main/java/com/uas/sso/foreign/weixin/controller/WeChatController.java

@@ -10,6 +10,8 @@ import com.uas.sso.entity.Token;
 import com.uas.sso.service.UserService;
 import com.uas.sso.foreign.weixin.entity.UserInfo;
 import com.uas.sso.foreign.weixin.service.WeChatService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.Assert;
@@ -40,13 +42,16 @@ public class WeChatController extends BaseController {
 
     private static final String WX_LOGIN_SCOPE = "snsapi_login";
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(WeChatController.class);
+
     @RequestMapping("/getQrUrl")
     public ModelMap getQrUrl(@RequestParam(defaultValue = "sso") String appId, @RequestParam String url) {
         try {
             url = url + (url.contains("?") ?  "&" : "?") + "type=wx";
             url = URLEncoder.encode(url, "utf8");
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("程序编码异常");
+            LOGGER.warn("程序编码异常, {}", e.getMessage());
+            return error("程序编码异常");
         }
         String qrUrl = "https://open.weixin.qq.com/connect/qrconnect?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
         App app = appService.findOne(appId);

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

@@ -228,7 +228,7 @@ public class LoginServiceImpl implements LoginService {
     private ModelMap login(Long userUU, Long spaceUU, BaseLogin loginParam) {
         App app = appService.findOne(loginParam.getAppId());
         if (app == null) {
-            throw new VerifyError("应用不存在");
+            throw new VisibleError("应用"+ loginParam.getAppId() +"不存在");
         }
         App controlApp = StringUtils.isEmpty(app.getUserControl()) ? app : appService.findOne(app.getUserControl());
         boolean personalEnable = Const.YES == controlApp.getPersonalEnable();

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("短信发送失败，模板："+ templateId +"，手机号：" + mobile, e);
+            messageUtils.logger.warn("短信发送失败，{}, 模板：{}，手机号：{}", e.getMessage(), templateId, mobile);
         }
     }
 
@@ -74,7 +74,7 @@ public class MessageUtils {
             }
             messageUtils.mailService.send(mailTplId.getValue(), email, data);
         } catch (Exception e) {
-            messageUtils.logger.warn("邮箱发送失败，模板："+ templateId +"，邮箱：" + email, e);
+            messageUtils.logger.warn("邮箱发送失败, {}，模板：{}，邮箱：{}", e.getMessage(), templateId, email);
         }
     }
 

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("VisibleError", ex);
+        logger.warn("VisibleError", ex.getMessage());
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<ModelMap>(error(ex.getMessage()), headers, HttpStatus.OK);