Browse Source

Changes

master
adiao 3 years ago
parent
commit
d7483c6e4f
  1. 12
      src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java
  2. 6
      src/main/java/co/depsystem/app/model/server/service1/VO/Test.java
  3. 4
      src/main/java/co/depsystem/app/model/server/service2/service/impl/workImpl.java
  4. 5
      src/main/java/co/depsystem/app/model/server/service2/service/workServer.java
  5. 4
      src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java
  6. 10
      src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java
  7. 2
      src/main/resources/application.properties

12
src/main/java/co/depsystem/app/model/server/service1/Rest/Controller.java

@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@RestController @RestController
@RequestMapping("/user") @RequestMapping("/")
public class Controller { public class Controller {
@Resource @Resource
private final UserServerImpl server; private final UserServerImpl server;
@ -33,9 +33,9 @@ public class Controller {
this.server = server; this.server = server;
} }
@PostMapping("/login") @PostMapping("login")
public ResponseResult<UserEntity> login(@RequestParam String name, @RequestParam String password){ public ResponseResult<UserEntity> login(UserEntity entity){
UserEntity user = server.login(name, password); UserEntity user = server.login(entity.getName(), entity.getPassword());
if(user!=null){ if(user!=null){
return ResponseResult.ok(user,"登录成功!"); return ResponseResult.ok(user,"登录成功!");
}else{ }else{
@ -43,7 +43,7 @@ public class Controller {
} }
} }
@PostMapping("/register") @PostMapping("register")
public ResponseResult<UserVO> register(@RequestBody UserVO user){ public ResponseResult<UserVO> register(@RequestBody UserVO user){
int userVO = server.register(user); int userVO = server.register(user);
if (user != null){ if (user != null){
@ -59,7 +59,7 @@ public class Controller {
* @return 图片 * @return 图片
* @throws IOException 异常 * @throws IOException 异常
*/ */
@GetMapping("/captcha") @GetMapping("captcha")
public ResponseEntity<byte[]> getCaptcha(HttpServletResponse response) throws IOException { public ResponseEntity<byte[]> getCaptcha(HttpServletResponse response) throws IOException {
ByteArrayOutputStream stream = new ByteArrayOutputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream();
CaptchaGenerator.generateCaptcha(stream, 200, 100, 4); CaptchaGenerator.generateCaptcha(stream, 200, 100, 4);

6
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;
}

4
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 {
}

5
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 {
}

4
src/main/java/co/depsystem/app/model/system/contiaon/Mapper/UserMapper.java

@ -17,7 +17,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
* @param number username * @param number username
* @return user * @return user
*/ */
@Select("select * from user where name = #{name}") @Select("select * from users where name = #{name}")
UserEntity selectNumberUserEntity(@Param("name") String number); UserEntity selectNumberUserEntity(@Param("name") String number);
/** 查询2 /** 查询2
@ -25,7 +25,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
* @param password password * @param password password
* @return user * @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); UserEntity selectNumberAndPasswordUserEntity(@Param("name")String number,@Param("password") String password);
/** 添加 /** 添加

10
src/main/java/co/depsystem/app/model/system/contiaon/PO/UserEntity.java

@ -20,7 +20,7 @@ import javax.persistence.Id;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@TableName("uses") @TableName("users")
public class UserEntity { public class UserEntity {
/** /**
* *
@ -29,10 +29,10 @@ public class UserEntity {
@TableId @TableId
private Integer id; private Integer id;
private String name; private String name;
private String work_type; private String password;
private String iphone;
private String login_date; private String login_date;
private String login_number; private String login_number;
private String iphone; private String create_date;
private String password; private String update_date;
} }

2
src/main/resources/application.properties

@ -1,4 +1,4 @@
server.port=8080 server.port=80
# template # template
spring.thymeleaf.check-template-location=false spring.thymeleaf.check-template-location=false

Loading…
Cancel
Save