hr~ 3 週間 前
コミット
0d4bc7324e

+ 1 - 2
auc/src/main/java/cn/hobbystocks/auc/web/AuctionController.java

@@ -98,8 +98,7 @@ public class AuctionController extends AdminBaseController {
 		if (Objects.equals(Constants.PUB_STATUS_PUBLISHED, dbAuc.getPubStatus())) {
 			return AjaxResult.error("拍卖会已发布不能修改");
 		}
-		//todo user服务不可用
-//		auction.setUpdateBy(getUsername());
+		auction.setUpdateBy(getUsername());
 		return AjaxResult.success(auctionService.updateById(auction));
 	}
 

+ 1 - 2
auc/src/main/java/cn/hobbystocks/auc/web/LotController.java

@@ -124,8 +124,7 @@ public class LotController extends AdminBaseController {
 		Lot dbLot = lotService.selectLotById(lot.getId());
 		if (dbLot==null)
 		    return AjaxResult.error("请传入拍品id");
-		//todo 用户服务不可用先注释掉
-//		lot.setUpdateBy(getUsername());
+		lot.setUpdateBy(getUsername());
 		if (Constants.PUB_STATUS_PUBLISHED.equals(dbLot.getPubStatus())) {
 			lotService.updateLotEx(lot);
 			syncService.syncLot(lot.getId());

+ 1 - 1
lot/src/main/java/cn/hobbystocks/auc/common/core/controller/BaseController.java

@@ -67,7 +67,7 @@ public class BaseController {
 	 * 获取登录用户名
 	 */
 	public String getUsername() {
-		return Objects.requireNonNull(UserUtils.getUserInfo()).getSub();
+        return Objects.requireNonNull(UserUtils.getUserInfo()).getDisplayName();
 	}
 
 }

+ 2 - 0
lot/src/main/java/cn/hobbystocks/auc/common/user/UserInfo.java

@@ -37,4 +37,6 @@ public class UserInfo implements Serializable {
 
 	private Integer accountStatus;
 	private boolean hasAddress;
+
+    private String displayName;
 }