From b8e8696b61f4a896b16269157e7b85aa7b590009 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 17:13:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
index 002e818..53bc971 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
@@ -67,7 +67,7 @@
})
@GetMapping("info/{id}/")
//http://127.0.0.1:8000/demo/demo/info/123234234/?name=寮犱笁
- @SsoAop(power="123456", ifAllPower = {"123", "456"})
+ @SsoAop()
public BaseResponse<String> info(@PathVariable String id, @RequestParam String name) throws GlException{
if(name == null || name.trim().equals("")){
return BaseResponseUtils.buildFail(ResultCodeMsg.RsMsg.ERROR_PARAM);
@@ -116,8 +116,8 @@
@GetMapping("test1")
public BaseResponse<BaUser> test1(){
BaUser po = new BaUser() ;
- po.id = System.currentTimeMillis() ;
- po.name = "寮犱笁" ;
+ po.userId = System.currentTimeMillis() ;
+ po.userName = "寮犱笁" ;
po.phone = "13912345678" ;
return BaseResponseUtils.buildSuccess(po);
--
Gitblit v1.8.0