From e180e151ee8369fcff917d878b3fb15b72d06d31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 二月 2023 18:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
index 3a514aa..6d6a58b 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
@@ -294,17 +294,22 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<PromotionWarpper> queryPromotionQRCode(HttpServletRequest request){
+ public ResponseWarpper<PromotionWarpper> queryPromotionQRCode(HttpServletRequest request) {
try {
Integer uid = driverService.getUserByRequset(request);
- if(null == uid){
+ if (null == uid) {
return ResponseWarpper.success(ResultUtil.tokenErr());
}
PromotionWarpper promotionWarpper = driverService.queryPromotionQRCode(uid);
return ResponseWarpper.success(promotionWarpper);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+
+
+
}
--
Gitblit v1.7.1