diff --git a/src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java b/src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java index 6f19040..103057d 100644 --- a/src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java +++ b/src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java @@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; @RestController -@RequestMapping("/user") +@RequestMapping("/") public class Controller { @Resource private final UserServerImpl server; @@ -33,9 +33,9 @@ public class Controller { this.server = server; } - @PostMapping("/login") - public ResponseResult login(@RequestParam String name, @RequestParam String password){ - UserEntity user = server.login(name, password); + @PostMapping("login") + public ResponseResult login(UserEntity entity){ + UserEntity user = server.login(entity.getName(), entity.getPassword()); if(user!=null){ return ResponseResult.ok(user,"登录成功!"); }else{ @@ -43,7 +43,7 @@ public class Controller { } } - @PostMapping("/register") + @PostMapping("register") public ResponseResult register(@RequestBody UserVO user){ int userVO = server.register(user); if (user != null){ @@ -59,7 +59,7 @@ public class Controller { * @return 图片 * @throws IOException 异常 */ - @GetMapping("/captcha") + @GetMapping("captcha") public ResponseEntity getCaptcha(HttpServletResponse response) throws IOException { ByteArrayOutputStream stream = new ByteArrayOutputStream(); CaptchaGenerator.generateCaptcha(stream, 200, 100, 4); diff --git a/src/main/java/co/depsystem/app/model/server/service1/VO/Test.java b/src/main/java/co/depsystem/app/model/server/service1/VO/Test.java new file mode 100644 index 0000000..e2198b0 --- /dev/null +++ b/src/main/java/co/depsystem/app/model/server/service1/VO/Test.java @@ -0,0 +1,6 @@ +package co.depsystem.app.model.server.service1.VO; + +public class Test { + public String name; + public String password; +} diff --git a/src/main/java/co/depsystem/app/model/server/service2/service/impl/workImpl.java b/src/main/java/co/depsystem/app/model/server/service2/service/impl/workImpl.java new file mode 100644 index 0000000..f9326d5 --- /dev/null +++ b/src/main/java/co/depsystem/app/model/server/service2/service/impl/workImpl.java @@ -0,0 +1,4 @@ +package co.depsystem.app.model.server.service2.service.impl; + +public class workImpl { +} diff --git a/src/main/java/co/depsystem/app/model/server/service2/service/workServer.java b/src/main/java/co/depsystem/app/model/server/service2/service/workServer.java new file mode 100644 index 0000000..c7ef2de --- /dev/null +++ b/src/main/java/co/depsystem/app/model/server/service2/service/workServer.java @@ -0,0 +1,5 @@ +package co.depsystem.app.model.server.service2.service; + +public interface workServer { + +} diff --git a/src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java b/src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java index 3b53fcc..3976cbe 100644 --- a/src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java +++ b/src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java @@ -17,7 +17,7 @@ public interface UserMapper extends BaseMapper { * @param number username * @return user */ - @Select("select * from user where name = #{name}") + @Select("select * from users where name = #{name}") UserEntity selectNumberUserEntity(@Param("name") String number); /** 查询2 @@ -25,7 +25,7 @@ public interface UserMapper extends BaseMapper { * @param password password * @return user */ - @Select("select * from user where name = #{name} and password = #{password}") + @Select("select * from users where name = #{name} and password = #{password}") UserEntity selectNumberAndPasswordUserEntity(@Param("name")String number,@Param("password") String password); /** 添加 diff --git a/src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java b/src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java index b4b72ca..f11ac30 100644 --- a/src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java +++ b/src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java @@ -20,7 +20,7 @@ import javax.persistence.Id; @NoArgsConstructor @AllArgsConstructor @Data -@TableName("uses") +@TableName("users") public class UserEntity { /** * @@ -29,10 +29,10 @@ public class UserEntity { @TableId private Integer id; private String name; - private String work_type; + private String password; + private String iphone; private String login_date; private String login_number; - private String iphone; - private String password; - + private String create_date; + private String update_date; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 12901be..1bb8677 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port=8080 +server.port=80 # template spring.thymeleaf.check-template-location=false