diff --git a/SpringBootBasic/target/classes/com/zz/App.class b/SpringBootBasic/target/classes/com/zz/App.class index 73c67ce..b8da762 100644 Binary files a/SpringBootBasic/target/classes/com/zz/App.class and b/SpringBootBasic/target/classes/com/zz/App.class differ diff --git a/SpringBootBasic/target/classes/com/zz/controller/IndexController.class b/SpringBootBasic/target/classes/com/zz/controller/IndexController.class index fb70a39..9f6f30d 100644 Binary files a/SpringBootBasic/target/classes/com/zz/controller/IndexController.class and b/SpringBootBasic/target/classes/com/zz/controller/IndexController.class differ diff --git a/SpringBootBasic/target/classes/com/zz/controller/TestController.class b/SpringBootBasic/target/classes/com/zz/controller/TestController.class index c7a666b..f80ae73 100644 Binary files a/SpringBootBasic/target/classes/com/zz/controller/TestController.class and b/SpringBootBasic/target/classes/com/zz/controller/TestController.class differ diff --git a/SpringBootBasic/target/classes/com/zz/controller/UserController.class b/SpringBootBasic/target/classes/com/zz/controller/UserController.class index a8c412d..edc49c7 100644 Binary files a/SpringBootBasic/target/classes/com/zz/controller/UserController.class and b/SpringBootBasic/target/classes/com/zz/controller/UserController.class differ diff --git a/SpringBootBasic/target/classes/com/zz/controller/UserController2.class b/SpringBootBasic/target/classes/com/zz/controller/UserController2.class index 557c315..032ff2c 100644 Binary files a/SpringBootBasic/target/classes/com/zz/controller/UserController2.class and b/SpringBootBasic/target/classes/com/zz/controller/UserController2.class differ diff --git a/SpringBootBasic/target/classes/com/zz/entity/User.class b/SpringBootBasic/target/classes/com/zz/entity/User.class index 7a21fa6..0b35828 100644 Binary files a/SpringBootBasic/target/classes/com/zz/entity/User.class and b/SpringBootBasic/target/classes/com/zz/entity/User.class differ diff --git a/SpringBootBasic/target/classes/com/zz/service/UserService.class b/SpringBootBasic/target/classes/com/zz/service/UserService.class index ff0573c..4f186a3 100644 Binary files a/SpringBootBasic/target/classes/com/zz/service/UserService.class and b/SpringBootBasic/target/classes/com/zz/service/UserService.class differ diff --git a/SpringBootBasic/target/classes/com/zz/util/JDBCComon.class b/SpringBootBasic/target/classes/com/zz/util/JDBCComon.class index e98d02a..ed79557 100644 Binary files a/SpringBootBasic/target/classes/com/zz/util/JDBCComon.class and b/SpringBootBasic/target/classes/com/zz/util/JDBCComon.class differ diff --git a/SpringBootController/src/main/java/com/zz/App.java b/SpringBootController/src/main/java/com/zz/App.java index 78a2e87..f3285fd 100644 --- a/SpringBootController/src/main/java/com/zz/App.java +++ b/SpringBootController/src/main/java/com/zz/App.java @@ -2,6 +2,7 @@ package com.zz; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; /** * 右键--》run as application 运行正启动类的main方法，就可以启动这个springboot项目。 @@ -11,6 +12,7 @@ SpringBoot 自带了 tomcat， 运行这个main方法 的时候，会同时启 */ @SpringBootApplication @EnableScheduling +@ServletComponentScan public class App { public static void main(String[] args) { diff --git a/SpringBootFile/target/classes/com/zz/App.class b/SpringBootFile/target/classes/com/zz/App.class index 73c67ce..67f9225 100644 Binary files a/SpringBootFile/target/classes/com/zz/App.class and b/SpringBootFile/target/classes/com/zz/App.class differ diff --git a/SpringBootFile/target/classes/com/zz/controller/FileController.class b/SpringBootFile/target/classes/com/zz/controller/FileController.class index 42622c3..4c332e8 100644 Binary files a/SpringBootFile/target/classes/com/zz/controller/FileController.class and b/SpringBootFile/target/classes/com/zz/controller/FileController.class differ diff --git a/SpringBootJPA/src/main/java/com/zz/controller/UserController.java b/SpringBootJPA/src/main/java/com/zz/controller/UserController.java index 201b668..1a31808 100644 --- a/SpringBootJPA/src/main/java/com/zz/controller/UserController.java +++ b/SpringBootJPA/src/main/java/com/zz/controller/UserController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,7 +23,13 @@ public class UserController { @Resource UserService userService; - + @PostMapping("add") + public User add(User user){ + System.out.println("add*********"); + System.out.println(user); + return userService.add(user); + + } @RequestMapping("login") public Map login(HttpServletRequest request){ String name=request.getParameter("name"); diff --git a/SpringBootJPA/src/main/java/com/zz/entity/User.java b/SpringBootJPA/src/main/java/com/zz/entity/User.java index 02d1fad..b06a916 100644 --- a/SpringBootJPA/src/main/java/com/zz/entity/User.java +++ b/SpringBootJPA/src/main/java/com/zz/entity/User.java @@ -1,45 +1,92 @@ package com.zz.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Proxy; + +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Date; +import java.util.HashSet; +import java.util.Set; @Entity -public class User { +@Table(name="T_USER") + +@Proxy(lazy = false) +public class User implements Serializable{ + final static long serialVersionUID=23424L; @Id + @Column(length = 50) private String id; - private String name; - private String pwd; - private String sex; - private int age; + //用户名 + private String username; + private String passwd; + //是否有效 1：有效 0：锁定 + private String status; + //创建时间 + private Date createTime; + + //使用 @ManyToMany 注解来映射多对多关联关系 + //使用 @JoinTable 来映射中间表 + //1. name 指向中间表的名字 + //2. joinColumns 映射当前类所在的表在中间表中的外键 + //2.1 name 指定外键列的列名 + //2.2 referencedColumnName 指定外键列关联当前表的哪一列 + //3. inverseJoinColumns 映射关联的类所在中间表的外键 + // @ManyToMany注释表示Teacher是多对多关系的一端。 + // @JoinTable描述了多对多关系的数据表关系。name属性指定中间表名称，joinColumns定义中间表与Teacher表的外键关系。 + // 中间表Teacher_Student的Teacher_ID列是Teacher表的主键列对应的外键列，inverseJoinColumns属性定义了中间表与另外一端(Student)的外键关系。 + @ManyToMany(cascade = CascadeType.PERSIST, fetch = FetchType.EAGER) + @JoinTable(name = "T_USER_ROLE", joinColumns = { @JoinColumn(name = "u_id") }, + inverseJoinColumns = { + @JoinColumn(name = "r_id") }) + private Set roles = new HashSet(); + + public String getId() { return id; } + public void setId(String id) { this.id = id; } - public String getName() { - return name; + + public String getUsername() { + return username; } - public void setName(String name) { - this.name = name; + + public void setUsername(String username) { + this.username = username; } - public String getPwd() { - return pwd; + + public String getPasswd() { + return passwd; } - public void setPwd(String pwd) { - this.pwd = pwd; + + public void setPasswd(String passwd) { + this.passwd = passwd; } - public String getSex() { - return sex; + + public String getStatus() { + return status; } - public void setSex(String sex) { - this.sex = sex; + + public void setStatus(String status) { + this.status = status; } - public int getAge() { - return age; + + public Date getCreateTime() { + return createTime; } - public void setAge(int age) { - this.age = age; + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; } - } diff --git a/SpringBootJPA/src/main/java/com/zz/repository/UserRepository.java b/SpringBootJPA/src/main/java/com/zz/repository/UserRepository.java index 6b4ed76..dd99124 100644 --- a/SpringBootJPA/src/main/java/com/zz/repository/UserRepository.java +++ b/SpringBootJPA/src/main/java/com/zz/repository/UserRepository.java @@ -7,7 +7,7 @@ import com.zz.entity.User; public interface UserRepository extends JpaRepository{ - public User findByNameAndPwd(String name,String pwd); + public User findByUsernameAndPasswd(String name,String pwd); diff --git a/SpringBootJPA/src/main/java/com/zz/service/UserService.java b/SpringBootJPA/src/main/java/com/zz/service/UserService.java index 9d3dc93..0c439c2 100644 --- a/SpringBootJPA/src/main/java/com/zz/service/UserService.java +++ b/SpringBootJPA/src/main/java/com/zz/service/UserService.java @@ -15,9 +15,12 @@ public class UserService { @Resource UserRepository userRepository; - + public User add(User user){ + return userRepository.save(user); + } public User findByNameAndPwd(String name,String pwd){ - return userRepository.findByNameAndPwd(name, pwd); + + return userRepository.findByUsernameAndPasswd(name, pwd); }; diff --git a/SpringBootJPA/target/classes/com/zz/controller/UserController.class b/SpringBootJPA/target/classes/com/zz/controller/UserController.class index 704a8eb..55bd628 100644 Binary files a/SpringBootJPA/target/classes/com/zz/controller/UserController.class and b/SpringBootJPA/target/classes/com/zz/controller/UserController.class differ diff --git a/SpringBootJPA/target/classes/com/zz/entity/User.class b/SpringBootJPA/target/classes/com/zz/entity/User.class index 5e800cb..c02abce 100644 Binary files a/SpringBootJPA/target/classes/com/zz/entity/User.class and b/SpringBootJPA/target/classes/com/zz/entity/User.class differ diff --git a/SpringBootJPA/target/classes/com/zz/repository/UserRepository.class b/SpringBootJPA/target/classes/com/zz/repository/UserRepository.class index 9ea463d..8ca42f8 100644 Binary files a/SpringBootJPA/target/classes/com/zz/repository/UserRepository.class and b/SpringBootJPA/target/classes/com/zz/repository/UserRepository.class differ diff --git a/SpringBootJPA/target/classes/com/zz/service/UserService.class b/SpringBootJPA/target/classes/com/zz/service/UserService.class index 5d14afb..71c9c26 100644 Binary files a/SpringBootJPA/target/classes/com/zz/service/UserService.class and b/SpringBootJPA/target/classes/com/zz/service/UserService.class differ diff --git a/corejava/corejava.iml b/corejava/corejava.iml index befcf3b..1802209 100644 --- a/corejava/corejava.iml +++ b/corejava/corejava.iml @@ -14,5 +14,10 @@ + + + + + \ No newline at end of file diff --git a/corejava/pom.xml b/corejava/pom.xml index 817d8d9..d63631b 100644 --- a/corejava/pom.xml +++ b/corejava/pom.xml @@ -29,6 +29,34 @@ com.google.code.gson gson + + junit + junit + 4.12 + test + + + com.google.guava + guava + 19.0 + test + + + + + + + org.apache.commons + commons-lang3 + 3.8.1 + + + + + org.jsoup + jsoup + 1.11.3 + diff --git a/corejava/src/main/java/com/zz/Test.java b/corejava/src/main/java/com/zz/Test.java index 9ef7865..f5c4123 100644 --- a/corejava/src/main/java/com/zz/Test.java +++ b/corejava/src/main/java/com/zz/Test.java @@ -10,6 +10,7 @@ public class Test { Parent a=new ChildA(); Parent b=new ChildB(); printName(b); + } diff --git a/corejava/src/main/java/com/zz/thread/Task.java b/corejava/src/main/java/com/zz/thread/Task.java index 6ac90de..b7580a7 100644 --- a/corejava/src/main/java/com/zz/thread/Task.java +++ b/corejava/src/main/java/com/zz/thread/Task.java @@ -12,6 +12,7 @@ public class Task { public void finishtask(){ //相当于this.total=this.total-1 this.total--; + this.runtime++; System.out.println("total="+total+"****runtime="+runtime); } diff --git a/corejava/src/test/java/com/zz/staticdemo/ChildTest.java b/corejava/src/test/java/com/zz/staticdemo/ChildTest.java new file mode 100644 index 0000000..aefc1c7 --- /dev/null +++ b/corejava/src/test/java/com/zz/staticdemo/ChildTest.java @@ -0,0 +1,35 @@ +package com.zz.staticdemo; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * @Description: 描述 + * @Author: Bsea + * @CreateDate: 2019/12/28 + */ + +public class ChildTest { + Child child; + + @Before + public void init(){ + System.out.println("Before 代码每次先执行"); + child=new Child(); + } + + @Test + public void t1(){ + //assert 断言 (条件真假) + assert (child.getAge()==18); + } + @Test + public void t2(){ + assert (child.add(5,0)==16); + } + + + +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index f148713..acba130 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ SpringBootRedis SpringBootMybatisRedisCache SpringBootOrder + SpringBootAOP