huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
FOAM 2024-03-20 15:36:41 +08:00
parent 7a658ce8b2 3fca9c0b45
commit 8497f61842
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms-vue/src/main.js
View File

@ -8,7 +8,7 @@ import VueRouter from "vue-router";
import router from "@/router/router"; import router from "@/router/router";
import store from "@/store/store"; import store from "@/store/store";
Vue.prototype.$axios=axios; Vue.prototype.$axios=axios;
Vue.prototype.$httpUrl='http://192.168.56.147:8081'; Vue.prototype.$httpUrl='http://192.168.56.138:8081';
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.use(VueRouter) Vue.use(VueRouter)
Vue.use(ElementUI,{size:'small'}); Vue.use(ElementUI,{size:'small'});

29
wms/src/main/java/com/yc/wms/controller/MenuController.java
View File

@ -1,10 +1,15 @@
package com.yc.wms.controller; package com.yc.wms.controller;
import com.yc.wms.model.MQTTResult;
import lombok.extern.slf4j.Slf4j;
import com.yc.wms.model.User;
import com.yc.wms.until.Result;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*;
/** /**
* <p> * <p>
@ -14,15 +19,21 @@ import org.springframework.web.bind.annotation.RestController;
* @author wms * @author wms
* @since 2023-07-07 * @since 2023-07-07
*/ */
@Slf4j
@RestController @RestController
@RequestMapping("/menu") @RequestMapping("/menu")
public class MenuController { public class MenuController {
@PostMapping("/login")
/** public ResponseEntity<Object> login(@RequestBody User user) {
* 查询菜单 System.out.println(""+user.username+"/"+user.password);
* @param roleId log.error(""+user.username+"/"+user.password);
* @return //{
*/ // "result": "allow" | "deny" | "ignore", // Default `"ignore"`
// "is_superuser": true | false // Default `false`
//}
MQTTResult mqttResult=new MQTTResult();
return new ResponseEntity(mqttResult, HttpStatus.OK);
}
} }

7
wms/src/main/java/com/yc/wms/model/MQTTResult.java 100644
View File

@ -0,0 +1,7 @@
package com.yc.wms.model;
public class MQTTResult {
public String result="allow"; // "result": "allow" | "deny" | "ignore", // Default `"ignore"`
public boolean is_superuser=true;// "is_superuser": true | false // Default `false`
}

7
wms/src/main/java/com/yc/wms/model/User.java 100644
View File

@ -0,0 +1,7 @@
package com.yc.wms.model;
public class User {
public String username;
public String password;
}