Merge remote-tracking branch 'origin/master'

src/main/java/com/codesdream/ase/component/UserFunctionalPermissionContainersListGenerator.java

@@ -0,0 +1,41 @@
+package com.codesdream.ase.component;
+
+import com.codesdream.ase.model.permission.*;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * 生成功能性权限容器列表
+ */
+@Component
+public class UserFunctionalPermissionContainersListGenerator {
+    @Resource
+    UserFunctionalScopeRelationsListGenerator functionalScopeRelationsListGenerator;
+
+    public Collection<FunctionalPermissionContainer> generateFunctionalContainers(
+            Collection<FunctionalScopeRelation> functionalScopeRelations){
+        Collection<FunctionalPermissionContainer> functionalPermissionContainers
+                = new ArrayList<>();
+
+        for (FunctionalScopeRelation functionalScopeRelation : functionalScopeRelations){
+            functionalPermissionContainers.add(functionalScopeRelation.getFunctionalPermissionContainer());
+        }
+
+        return functionalPermissionContainers;
+    }
+
+    public Collection<FunctionalPermissionContainer> generateFunctionalPermissionContainers(User user){
+        return generateFunctionalContainers(
+                functionalScopeRelationsListGenerator.generateFunctionalScopeRelations(user)
+        );
+    }
+
+    public Collection<FunctionalPermissionContainer> generateFunctionalPermissionContainers(String username){
+        return generateFunctionalContainers(
+                functionalScopeRelationsListGenerator.generateFunctionalScopeRelations(username)
+        );
+    }
+}

src/main/java/com/codesdream/ase/component/UserFunctionalScopeRelationsListGenerator.java

@@ -0,0 +1,43 @@
+package com.codesdream.ase.component;
+
+import com.codesdream.ase.model.permission.FunctionalScopeRelation;
+import com.codesdream.ase.model.permission.PermissionContainersCollection;
+import com.codesdream.ase.model.permission.User;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * 生成功能性权限容器与范围性权限容器关联对列表
+ */
+@Component
+public class UserFunctionalScopeRelationsListGenerator {
+    @Resource
+    UserPermissionContainersCollectionsListGenerator userPermissionContainersCollectionsListGenerator;
+
+    public Collection<FunctionalScopeRelation> generateFunctionalScopeRelations(
+            Collection<PermissionContainersCollection> permissionContainersCollections){
+        Collection<FunctionalScopeRelation> functionalScopeRelations =
+                new ArrayList<>();
+
+        for(PermissionContainersCollection permissionContainersCollection : permissionContainersCollections){
+            functionalScopeRelations.addAll(permissionContainersCollection.getFunctionalScopeRelations());
+        }
+
+        return functionalScopeRelations;
+    }
+
+    public Collection<FunctionalScopeRelation> generateFunctionalScopeRelations(
+            User user){
+        return generateFunctionalScopeRelations(
+                userPermissionContainersCollectionsListGenerator.generatePermissionContainerCollections(user));
+    }
+
+    public Collection<FunctionalScopeRelation> generateFunctionalScopeRelations(
+            String username){
+        return generateFunctionalScopeRelations(
+                userPermissionContainersCollectionsListGenerator.generatePermissionContainerCollections(username));
+    }
+}

src/main/java/com/codesdream/ase/component/UserPermissionContainersCollectionsListGenerator.java

@@ -0,0 +1,41 @@
+package com.codesdream.ase.component;
+
+import com.codesdream.ase.model.permission.PermissionContainersCollection;
+import com.codesdream.ase.model.permission.Tag;
+import com.codesdream.ase.model.permission.User;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 生成权限容器集合列表
+ */
+@Component
+public class UserPermissionContainersCollectionsListGenerator {
+    @Resource
+    UserTagsListGenerator userTagsListGenerator;
+
+    public Collection<PermissionContainersCollection> generatePermissionContainerCollections(
+            Collection<Tag> tags){
+        Collection<PermissionContainersCollection> permissionContainersCollections =
+                new ArrayList<>();
+        for(Tag tag : tags){
+            permissionContainersCollections.addAll(tag.getPermissionContainersCollections());
+        }
+        return permissionContainersCollections;
+    }
+
+    public Collection<PermissionContainersCollection> generatePermissionContainerCollections(
+            User user) {
+        return generatePermissionContainerCollections(userTagsListGenerator.generateTags(user));
+    }
+
+    public Collection<PermissionContainersCollection> generatePermissionContainerCollections(
+            String username){
+        return generatePermissionContainerCollections(userTagsListGenerator.generateTags(username));
+    }
+}

src/main/java/com/codesdream/ase/component/UserRolesListGenerator.java

@@ -1,24 +1,44 @@
 package com.codesdream.ase.component;
 
 import com.codesdream.ase.model.permission.FunctionalPermissionContainer;
-import com.codesdream.ase.model.permission.Tag;
 import com.codesdream.ase.model.permission.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Optional;
 
+/**
+ * 生成用户访问权限角色列表
+ */
 @Component
 public class UserRolesListGenerator {
-    public Collection<GrantedAuthority> GenerateRoles(User user){
+    @Resource
+    UserFunctionalPermissionContainersListGenerator functionalPermissionContainersListGenerator;
+
+    public Collection<GrantedAuthority> generateRoles(
+            Collection<FunctionalPermissionContainer> functionalPermissionContainers){
         Collection<GrantedAuthority> authorities = new ArrayList<>();
-        for(Tag tag : user.getTags()){
+        for(FunctionalPermissionContainer functionalPermissionContainer :functionalPermissionContainers){
-            for(FunctionalPermissionContainer functionalPermissionContainer : tag.getFunctionalPermissionContainers()){
+            for(String role :functionalPermissionContainer.getRoles()){
-                authorities.add(new SimpleGrantedAuthority(functionalPermissionContainer.getName()));
+                authorities.add(new SimpleGrantedAuthority(role));
             }
         }
         return authorities;
     }
+
+    public Collection<GrantedAuthority> generateRoles(String username){
+        return generateRoles(
+                functionalPermissionContainersListGenerator.generateFunctionalPermissionContainers(username)
+        );
+    }
+
+    public Collection<GrantedAuthority> generateRoles(User user){
+        return generateRoles(
+                functionalPermissionContainersListGenerator.generateFunctionalPermissionContainers(user)
+        );
+    }
 }

src/main/java/com/codesdream/ase/component/UserTagsListGenerator.java

@@ -0,0 +1,54 @@
+package com.codesdream.ase.component;
+
+import com.codesdream.ase.model.permission.ScopePermissionContainer;
+import com.codesdream.ase.model.permission.Tag;
+import com.codesdream.ase.model.permission.User;
+import com.codesdream.ase.repository.UserRepository;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Optional;
+
+/**
+ * 生成用户标签列表
+ */
+@Component
+public class UserTagsListGenerator {
+    @Resource
+    UserRepository userRepository;
+
+    public Collection<Tag> generateTags(ScopePermissionContainer scopePermissionContainer){
+        return new ArrayList<>(scopePermissionContainer.getTags());
+    }
+
+    public Collection<Tag> generateTags(User user){
+        return new ArrayList<Tag>(user.getTags());
+    }
+
+    public Collection<Tag> generateTags(String username){
+        Optional<User> user = userRepository.findByUsername(username);
+        // 检查用户是否存在
+        if(!user.isPresent()) throw new RuntimeException("User Not Found");
+
+        return generateTags(user.get());
+    }
+
+    public Collection<String> generateTagsName(User user){
+        Collection<String> tagsName = new ArrayList<>();
+        Collection<Tag> tags = generateTags(user);
+        for(Tag tag : tags){
+            tagsName.add(tag.getName());
+        }
+        return tagsName;
+    }
+
+    public Collection<String> generateTagsName(String username){
+        Optional<User> user = userRepository.findByUsername(username);
+
+        if(!user.isPresent()) throw new RuntimeException("User Not Found");
+
+        return generateTagsName(user.get());
+    }
+}

src/main/java/com/codesdream/ase/component/UsersListGenerator.java

@@ -0,0 +1,24 @@
+package com.codesdream.ase.component;
+
+import com.codesdream.ase.model.permission.Tag;
+import com.codesdream.ase.model.permission.User;
+import org.springframework.stereotype.Component;
+import sun.nio.cs.US_ASCII;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * 生成用户列表
+ */
+@Component
+public class UsersListGenerator {
+    public Collection<User> generateUsers(Collection<Tag> tags){
+        Collection<User> users = new ArrayList<>();
+        for(Tag tag : tags){
+            users.addAll(tag.getUsers());
+        }
+        return users;
+    }
+}

src/main/java/com/codesdream/ase/controller/RegisterController.java

@@ -0,0 +1,4 @@
+package com.codesdream.ase.controller;
+
+public class RegisterController {
+}

src/main/java/com/codesdream/ase/model/information/BaseAdministrativeDivision.java

@@ -0,0 +1,21 @@
+package com.codesdream.ase.model.information;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 行政区划基本信息
+ */
+@Data
+@Entity
+@Table(name = "base_administrative_division")
+public class BaseAdministrativeDivision {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+
+    private int parent_id;
+}

src/main/java/com/codesdream/ase/model/information/BaseCollege.java

@@ -0,0 +1,19 @@
+package com.codesdream.ase.model.information;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 学院基本信息
+ */
+@Data
+@Entity
+@Table(name = "base_college")
+public class BaseCollege {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+}

src/main/java/com/codesdream/ase/model/information/BaseEthnic.java

@@ -0,0 +1,16 @@
+package com.codesdream.ase.model.information;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "base_ethnic")
+public class BaseEthnic {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+}

src/main/java/com/codesdream/ase/model/information/BaseMajor.java

@@ -0,0 +1,16 @@
+package com.codesdream.ase.model.information;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "base_major")
+public class BaseMajor {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+}

src/main/java/com/codesdream/ase/model/permission/FunctionalPermissionContainer.java

@@ -1,10 +1,17 @@
 package com.codesdream.ase.model.permission;
 
+import lombok.Data;
+
 import javax.persistence.*;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * 功能性权限容器
+ */
+@Data
 @Entity
 @Table(name = "functional_permit_container")
 public class FunctionalPermissionContainer {
@@ -19,76 +26,30 @@ public class FunctionalPermissionContainer {
     // 功能性权限容器解释
     private String description;
 
-    // 功能性容器对应范围性容器
+    // 对应访问控制角色列表
-    @ManyToOne(cascade=CascadeType.PERSIST,fetch=FetchType.LAZY)
-    private ScopePermissionContainer scopePermissionContainer;
-
-    @ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
-    private Set<Tag> tags;
-
     @ElementCollection
     @Column(nullable = false)
-    private List<String> urls;
+    private List<String> roles;
 
+    // 是否启用
     @Column(nullable = false)
     private boolean enabled;
 
+    // 是否删除
     @Column(nullable = false)
     private boolean deleted;
 
+    public FunctionalPermissionContainer(){
+        initDefault();
+    }
+
     public FunctionalPermissionContainer(String name, String description) {
         this.name = name;
         this.description = description;
-
+        initDefault();
-        this.tags = new HashSet<Tag>();
-        this.scopePermissionContainer = null;
     }
 
-    public int getId() {
+    private void initDefault(){
-        return id;
+        this.roles = new LinkedList<>();
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    public List<String> getUrls() {
-        return urls;
-    }
-
-    public void setUrls(List<String> urls) {
-        this.urls = urls;
     }
 }

src/main/java/com/codesdream/ase/model/permission/FunctionalScopeRelation.java

@@ -0,0 +1,27 @@
+package com.codesdream.ase.model.permission;
+
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 功能性权限容器与范围性权限容器关联对
+ */
+@Data
+@Entity
+@Table(name = "functional_scope_relation")
+public class FunctionalScopeRelation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    // 对应功能性权限容器
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private FunctionalPermissionContainer functionalPermissionContainer;
+
+    // 对应范围性权限容器
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private ScopePermissionContainer scopePermissionContainer;
+}

src/main/java/com/codesdream/ase/model/permission/PermissionContainersCollection.java

@@ -0,0 +1,28 @@
+package com.codesdream.ase.model.permission;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.util.Set;
+
+/**
+ * 权限容器集合
+ */
+@Data
+@Entity
+@Table(name = "permission_container_collection")
+public class PermissionContainersCollection {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    // 权限容器集合名称
+    @Column(nullable = false)
+    private String name;
+
+    // 权限容器集合概述
+    private String description;
+
+    // 对应功能性权限容器与范围性权限容器关联对
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private Set<FunctionalScopeRelation> functionalScopeRelations;
+}

src/main/java/com/codesdream/ase/model/permission/ScopePermissionContainer.java

@@ -1,8 +1,12 @@
 package com.codesdream.ase.model.permission;
 
+import lombok.Data;
+
 import javax.persistence.*;
+import java.util.List;
 import java.util.Set;
 
+@Data
 @Entity
 @Table(name = "scope_permit_container")
 public class ScopePermissionContainer {
@@ -15,52 +19,12 @@ public class ScopePermissionContainer {
 
     private String description;
 
-    @OneToMany(cascade=CascadeType.MERGE,fetch=FetchType.LAZY,mappedBy="scopePermissionContainer")
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private Set<FunctionalPermissionContainer> functionalPermissionContainers;
+    private List<Tag> tags;
 
     @Column(nullable = false)
     private boolean enabled;
 
     @Column(nullable = false)
     private boolean deleted;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
 }

src/main/java/com/codesdream/ase/model/permission/Tag.java

@@ -1,5 +1,8 @@
 package com.codesdream.ase.model.permission;
 
+import lombok.Data;
+import org.hibernate.annotations.ManyToAny;
+
 import javax.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
@@ -7,6 +10,7 @@ import java.util.Set;
 /**
  * 标签
  */
+@Data
 @Entity
 @Table(name = "tag")
 public class Tag {
@@ -33,81 +37,22 @@ public class Tag {
     @Column(nullable = false)
     private boolean deleted;
 
-    // 标签对应权限容器
+    // 对应权限容器集合
-    @ManyToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY, mappedBy = "tags")
+    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private Set<FunctionalPermissionContainer> functionalPermissionContainers;
+    private Set<PermissionContainersCollection> permissionContainersCollections;
 
     public Tag(String name, String description) {
         this.name = name;
         this.description = description;
         this.deleted = false;
         this.enabled = true;
-
         this.users = new HashSet<User>();
-        this.functionalPermissionContainers = new HashSet<FunctionalPermissionContainer>();
     }
 
     public Tag() {
         this.deleted = false;
         this.enabled = true;
-
         this.users = new HashSet<User>();
-        this.functionalPermissionContainers = new HashSet<FunctionalPermissionContainer>();
     }
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    public Set<User> getUsers() {
-        return users;
-    }
-
-    public void setUsers(Set<User> users) {
-        this.users = users;
-    }
-
-    public Set<FunctionalPermissionContainer> getFunctionalPermissionContainers() {
-        return functionalPermissionContainers;
-    }
-
-    public void setFunctionalPermissionContainers(Set<FunctionalPermissionContainer> functionalPermissionContainers) {
-        this.functionalPermissionContainers = functionalPermissionContainers;
-    }
 }

src/main/java/com/codesdream/ase/model/permission/User.java

@@ -1,6 +1,7 @@
 package com.codesdream.ase.model.permission;
 
 import com.codesdream.ase.component.UserRolesListGenerator;
+import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -9,6 +10,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+@Data
 @Entity
 @Table(name = "user")
 public class User implements UserDetails {
@@ -27,101 +29,58 @@ public class User implements UserDetails {
     @Column(nullable = true)
     private String phone_number;
 
-    // 用户关联标签
+    // 账号是否过期
-    @ManyToMany(cascade = CascadeType.PERSIST)
+    private boolean accountNonExpired;
-    @JoinTable(name = "user_tag",
+
-            joinColumns = {
+    // 账号是否被封禁
-                @JoinColumn(name = "user_id", referencedColumnName = "id")
+    private boolean accountNonLocked;
-            },
+
-            inverseJoinColumns = {
+    // 证书是否过期
-                    @JoinColumn(name = "tag_id", referencedColumnName = "id")
+    private boolean credentialsNonExpired;
-            })
+
-    private Set<Tag> tags;
+    // 账号是否激活
+    private  boolean enabled;
 
-    // 是否启用
-    @Column(nullable =  false)
-    private boolean enabled;
     // 是否删除
     @Column(nullable = false)
     private boolean deleted;
 
+    // 用户关联标签
+    @ManyToMany(cascade = CascadeType.ALL, fetch =  FetchType.LAZY)
+    private Set<Tag> tags;
+
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private UserDetail userDetail;
+
+
     public User(String username, String password) {
         this.username = username;
         this.password = password;
-        this.enabled = true;
+
-        this.deleted = false;
+        initUserDefault();
-        this.tags = new HashSet<Tag>();
     }
 
     public User() {
         this.username = null;
         this.password = null;
-        this.enabled = true;
         this.deleted = false;
-        this.tags = new HashSet<Tag>();
+
+        initUserDefault();
     }
 
-    @Override
+    // 用默认的方式初始化User对象的值
-    public String getUsername() {
+    private void initUserDefault(){
-        return username;
+        this.accountNonExpired = true;
-    }
+        this.accountNonLocked = true;
-
+        this.credentialsNonExpired = true;
-    @Override
+        this.deleted = false;
-    public boolean isAccountNonExpired() {
+        this.tags = new HashSet<>();
-        return isEnabled();
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return isEnabled();
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return isEnabled();
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return this.enabled;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
     }
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         UserRolesListGenerator userRolesListGenerator = new UserRolesListGenerator();
-        return userRolesListGenerator.GenerateRoles(this);
+        return userRolesListGenerator.generateRoles(this);
     }
 
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    public Set<Tag> getTags() {
-        return tags;
-    }
-
-    public void setTags(Set<Tag> tags) {
-        this.tags = tags;
-    }
 }

src/main/java/com/codesdream/ase/model/permission/UserDetail.java

@@ -0,0 +1,32 @@
+package com.codesdream.ase.model.permission;
+
+import com.codesdream.ase.model.information.BaseAdministrativeDivision;
+import com.codesdream.ase.model.information.BaseCollege;
+import com.codesdream.ase.model.information.BaseMajor;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 用户相关详细信息
+ */
+@Data
+@Entity
+@Table(name = "user_detail")
+public class UserDetail {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    // 所属地区
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private BaseAdministrativeDivision baseAdministrativeDivision;
+
+    // 所属学院
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private BaseCollege baseCollege;
+
+    // 所属专业
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private BaseMajor baseMajor;
+}

src/main/java/com/codesdream/ase/repository/PermissionContainersCollectionRepository.java

@@ -0,0 +1,13 @@
+package com.codesdream.ase.repository;
+
+import com.codesdream.ase.model.permission.PermissionContainersCollection;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface PermissionContainersCollectionRepository
+        extends CrudRepository<PermissionContainersCollection, Integer> {
+    Optional<PermissionContainersCollection> findByName(String name);
+}

src/main/java/com/codesdream/ase/test/UserTest.java

@@ -60,7 +60,7 @@ public class UserTest {
         // 添加为标签功能性权限容器
         HashSet<FunctionalPermissionContainer> functionalPermissionContainers = new HashSet<>();
         functionalPermissionContainers.add(functionalPermissionContainer);
-        tag.setFunctionalPermissionContainers(functionalPermissionContainers);
+        // 等待添加
 
         // 为用户添加标签
         HashSet<Tag> tags = new HashSet<>();

src/main/resources/application.properties

@@ -7,7 +7,8 @@ spring.thymeleaf.encoding=UTF-8
 
 spring.jpa.generate-ddl=false
 spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=update
+spring.jooq.sql-dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 spring.datasource.url=jdbc:mysql://${MYSQL_HOST:119.23.9.34}:3306/ase?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
 spring.datasource.username=codedream

src/main/resources/data_base_ethnic.sql

@@ -0,0 +1,62 @@
+-- ----------------------------
+-- Records of base_ethnic
+-- ----------------------------
+INSERT INTO `base_ethnic` VALUES ('00', '----');
+INSERT INTO `base_ethnic` VALUES ('01', '汉族');
+INSERT INTO `base_ethnic` VALUES ('02', '蒙古族');
+INSERT INTO `base_ethnic` VALUES ('03', '回族');
+INSERT INTO `base_ethnic` VALUES ('04', '藏族');
+INSERT INTO `base_ethnic` VALUES ('05', '维吾尔族');
+INSERT INTO `base_ethnic` VALUES ('06', '苗族');
+INSERT INTO `base_ethnic` VALUES ('07', '彝族');
+INSERT INTO `base_ethnic` VALUES ('08', '壮族');
+INSERT INTO `base_ethnic` VALUES ('09', '布依族');
+INSERT INTO `base_ethnic` VALUES ('10', '朝鲜族');
+INSERT INTO `base_ethnic` VALUES ('11', '满族');
+INSERT INTO `base_ethnic` VALUES ('12', '侗族');
+INSERT INTO `base_ethnic` VALUES ('13', '瑶族');
+INSERT INTO `base_ethnic` VALUES ('14', '白族');
+INSERT INTO `base_ethnic` VALUES ('15', '土家族');
+INSERT INTO `base_ethnic` VALUES ('16', '哈尼族');
+INSERT INTO `base_ethnic` VALUES ('17', '哈萨克族');
+INSERT INTO `base_ethnic` VALUES ('18', '傣族');
+INSERT INTO `base_ethnic` VALUES ('19', '黎族');
+INSERT INTO `base_ethnic` VALUES ('20', '傈傈族');
+INSERT INTO `base_ethnic` VALUES ('21', '佤族');
+INSERT INTO `base_ethnic` VALUES ('22', '畲族');
+INSERT INTO `base_ethnic` VALUES ('23', '高山族');
+INSERT INTO `base_ethnic` VALUES ('24', '拉祜族');
+INSERT INTO `base_ethnic` VALUES ('25', '水族');
+INSERT INTO `base_ethnic` VALUES ('26', '东乡族');
+INSERT INTO `base_ethnic` VALUES ('27', '纳西族');
+INSERT INTO `base_ethnic` VALUES ('28', '景颇族');
+INSERT INTO `base_ethnic` VALUES ('29', '柯尔克孜族');
+INSERT INTO `base_ethnic` VALUES ('30', '土族');
+INSERT INTO `base_ethnic` VALUES ('31', '达斡尔族');
+INSERT INTO `base_ethnic` VALUES ('32', '仫佬族');
+INSERT INTO `base_ethnic` VALUES ('33', '羌族');
+INSERT INTO `base_ethnic` VALUES ('34', '布朗族');
+INSERT INTO `base_ethnic` VALUES ('35', '撒拉族');
+INSERT INTO `base_ethnic` VALUES ('36', '毛难族');
+INSERT INTO `base_ethnic` VALUES ('37', '仡佬族');
+INSERT INTO `base_ethnic` VALUES ('38', '锡伯族');
+INSERT INTO `base_ethnic` VALUES ('39', '阿昌族');
+INSERT INTO `base_ethnic` VALUES ('40', '普米族');
+INSERT INTO `base_ethnic` VALUES ('41', '塔吉克族');
+INSERT INTO `base_ethnic` VALUES ('42', '怒族');
+INSERT INTO `base_ethnic` VALUES ('43', '乌孜别克族');
+INSERT INTO `base_ethnic` VALUES ('44', '俄罗斯族');
+INSERT INTO `base_ethnic` VALUES ('45', '鄂温克族');
+INSERT INTO `base_ethnic` VALUES ('46', '崩龙族');
+INSERT INTO `base_ethnic` VALUES ('47', '保安族');
+INSERT INTO `base_ethnic` VALUES ('48', '裕固族');
+INSERT INTO `base_ethnic` VALUES ('49', '京族');
+INSERT INTO `base_ethnic` VALUES ('50', '塔塔尔族');
+INSERT INTO `base_ethnic` VALUES ('51', '独龙族');
+INSERT INTO `base_ethnic` VALUES ('52', '鄂伦春族');
+INSERT INTO `base_ethnic` VALUES ('53', '赫哲族');
+INSERT INTO `base_ethnic` VALUES ('54', '门巴族');
+INSERT INTO `base_ethnic` VALUES ('55', '珞巴族');
+INSERT INTO `base_ethnic` VALUES ('56', '基诺族');
+INSERT INTO `base_ethnic` VALUES ('97', '其他');
+INSERT INTO `base_ethnic` VALUES ('98', '外国血统');

src/main/resources/data_base_major.sql

@@ -0,0 +1,832 @@
+-- ----------------------------
+-- Records of base_major
+-- ----------------------------
+INSERT INTO `base_major` VALUES ('010100', '哲学类');
+INSERT INTO `base_major` VALUES ('010101', '哲学');
+INSERT INTO `base_major` VALUES ('010102', '逻辑学');
+INSERT INTO `base_major` VALUES ('010103', '宗教学');
+INSERT INTO `base_major` VALUES ('010104', '伦理学');
+INSERT INTO `base_major` VALUES ('01010J', '哲学基地班');
+INSERT INTO `base_major` VALUES ('01SY00', '人文科学试验班类');
+INSERT INTO `base_major` VALUES ('01SY01', '人文科学试验班');
+INSERT INTO `base_major` VALUES ('020100', '经济学类');
+INSERT INTO `base_major` VALUES ('020101', '经济学');
+INSERT INTO `base_major` VALUES ('020102', '国际经济与贸易');
+INSERT INTO `base_major` VALUES ('020103', '财政学');
+INSERT INTO `base_major` VALUES ('020104', '金融学');
+INSERT INTO `base_major` VALUES ('020105', '国民经济管理');
+INSERT INTO `base_major` VALUES ('020106', '贸易经济');
+INSERT INTO `base_major` VALUES ('020107', '保险');
+INSERT INTO `base_major` VALUES ('020108', '环境经济');
+INSERT INTO `base_major` VALUES ('020109', '金融工程');
+INSERT INTO `base_major` VALUES ('02010J', '经济学基地班');
+INSERT INTO `base_major` VALUES ('020110', '税务');
+INSERT INTO `base_major` VALUES ('020111', '信用管理');
+INSERT INTO `base_major` VALUES ('020112', '网络经济学');
+INSERT INTO `base_major` VALUES ('020113', '体育经济');
+INSERT INTO `base_major` VALUES ('020114', '投资学');
+INSERT INTO `base_major` VALUES ('020115', '环境资源与发展经济学');
+INSERT INTO `base_major` VALUES ('020116', '海洋经济学');
+INSERT INTO `base_major` VALUES ('020117', '国际文化贸易');
+INSERT INTO `base_major` VALUES ('020119', '金融数学');
+INSERT INTO `base_major` VALUES ('020120', '经济与金融');
+INSERT INTO `base_major` VALUES ('020121', '能源经济');
+INSERT INTO `base_major` VALUES ('020303', '保险学');
+INSERT INTO `base_major` VALUES ('030100', '法学类');
+INSERT INTO `base_major` VALUES ('030101', '法学');
+INSERT INTO `base_major` VALUES ('030102', '知识产权法');
+INSERT INTO `base_major` VALUES ('030103', '知识产权');
+INSERT INTO `base_major` VALUES ('030120', '监狱学');
+INSERT INTO `base_major` VALUES ('030200', '马克思主义理论类');
+INSERT INTO `base_major` VALUES ('030201', '科学社会主义与国际共产主义运动');
+INSERT INTO `base_major` VALUES ('030202', '中国革命史与中国共产党党史');
+INSERT INTO `base_major` VALUES ('030300', '社会学类');
+INSERT INTO `base_major` VALUES ('030301', '社会学');
+INSERT INTO `base_major` VALUES ('030302', '社会工作');
+INSERT INTO `base_major` VALUES ('030303', '家政学');
+INSERT INTO `base_major` VALUES ('030304', '人类学');
+INSERT INTO `base_major` VALUES ('030305', '女性学');
+INSERT INTO `base_major` VALUES ('030400', '政治学类');
+INSERT INTO `base_major` VALUES ('030401', '政治学与行政学');
+INSERT INTO `base_major` VALUES ('030402', '国际政治');
+INSERT INTO `base_major` VALUES ('030403', '外交学');
+INSERT INTO `base_major` VALUES ('030404', '思想政治教育');
+INSERT INTO `base_major` VALUES ('030405', '国际文化交流');
+INSERT INTO `base_major` VALUES ('030406', '国际政治经济学');
+INSERT INTO `base_major` VALUES ('030407', '国际事务');
+INSERT INTO `base_major` VALUES ('030408', '国际事务与国际关系');
+INSERT INTO `base_major` VALUES ('030409', '欧洲事务与欧洲关系');
+INSERT INTO `base_major` VALUES ('030500', '公安学类');
+INSERT INTO `base_major` VALUES ('030501', '治安学');
+INSERT INTO `base_major` VALUES ('030502', '侦查学');
+INSERT INTO `base_major` VALUES ('030503', '边防管理');
+INSERT INTO `base_major` VALUES ('030504', '火灾勘查');
+INSERT INTO `base_major` VALUES ('030505', '禁毒学');
+INSERT INTO `base_major` VALUES ('030506', '警犬技术');
+INSERT INTO `base_major` VALUES ('030507', '经济犯罪侦查');
+INSERT INTO `base_major` VALUES ('030508', '边防指挥');
+INSERT INTO `base_major` VALUES ('030509', '消防指挥');
+INSERT INTO `base_major` VALUES ('030510', '警卫学');
+INSERT INTO `base_major` VALUES ('030511', '公安情报学');
+INSERT INTO `base_major` VALUES ('030512', '犯罪学');
+INSERT INTO `base_major` VALUES ('030513', '公安管理学');
+INSERT INTO `base_major` VALUES ('030514', '涉外警务');
+INSERT INTO `base_major` VALUES ('030515', '国内安全保卫');
+INSERT INTO `base_major` VALUES ('030516', '警务指挥与战术');
+INSERT INTO `base_major` VALUES ('03SY01', '社会科学试验班');
+INSERT INTO `base_major` VALUES ('040100', '教育学类');
+INSERT INTO `base_major` VALUES ('040101', '教育学');
+INSERT INTO `base_major` VALUES ('040102', '学前教育');
+INSERT INTO `base_major` VALUES ('040103', '特殊教育');
+INSERT INTO `base_major` VALUES ('040104', '教育技术学');
+INSERT INTO `base_major` VALUES ('040105', '小学教育');
+INSERT INTO `base_major` VALUES ('040106', '艺术教育');
+INSERT INTO `base_major` VALUES ('040107', '人文教育');
+INSERT INTO `base_major` VALUES ('040108', '科学教育');
+INSERT INTO `base_major` VALUES ('040109', '言语听觉科学');
+INSERT INTO `base_major` VALUES ('040110', '华文教育');
+INSERT INTO `base_major` VALUES ('040200', '体育学类');
+INSERT INTO `base_major` VALUES ('040201', '体育教育');
+INSERT INTO `base_major` VALUES ('040202', '运动训练');
+INSERT INTO `base_major` VALUES ('040203', '社会体育');
+INSERT INTO `base_major` VALUES ('040204', '运动人体科学');
+INSERT INTO `base_major` VALUES ('040205', '民族传统体育');
+INSERT INTO `base_major` VALUES ('040206', '运动康复与健康');
+INSERT INTO `base_major` VALUES ('040207', '休闲体育');
+INSERT INTO `base_major` VALUES ('040300', '职业技术教育类');
+INSERT INTO `base_major` VALUES ('040301', '农艺教育');
+INSERT INTO `base_major` VALUES ('040302', '园艺教育');
+INSERT INTO `base_major` VALUES ('040303', '特用作物教育');
+INSERT INTO `base_major` VALUES ('040304', '林木生产教育');
+INSERT INTO `base_major` VALUES ('040305', '特用动物教育');
+INSERT INTO `base_major` VALUES ('040306', '畜禽生产教育');
+INSERT INTO `base_major` VALUES ('040307', '水产养殖教育');
+INSERT INTO `base_major` VALUES ('040308', '应用生物教育');
+INSERT INTO `base_major` VALUES ('040309', '农业机械教育');
+INSERT INTO `base_major` VALUES ('040310', '农业建筑与环境控制教育');
+INSERT INTO `base_major` VALUES ('040311', '农产品储运与加工教育');
+INSERT INTO `base_major` VALUES ('040312', '农业经营管理教育');
+INSERT INTO `base_major` VALUES ('040313', '机械制造工艺教育');
+INSERT INTO `base_major` VALUES ('040314', '机械维修及检测技术教育');
+INSERT INTO `base_major` VALUES ('040315', '机电技术教育');
+INSERT INTO `base_major` VALUES ('040316', '电气技术教育');
+INSERT INTO `base_major` VALUES ('040317', '汽车维修工程教育');
+INSERT INTO `base_major` VALUES ('040318', '应用电子技术教育');
+INSERT INTO `base_major` VALUES ('040319', '制浆造纸工艺教育');
+INSERT INTO `base_major` VALUES ('040320', '印刷工艺教育');
+INSERT INTO `base_major` VALUES ('040321', '橡塑制品成型工艺教育');
+INSERT INTO `base_major` VALUES ('040322', '食品工艺教育');
+INSERT INTO `base_major` VALUES ('040323', '纺织工艺教育');
+INSERT INTO `base_major` VALUES ('040324', '染整工艺教育');
+INSERT INTO `base_major` VALUES ('040325', '化工工艺教育');
+INSERT INTO `base_major` VALUES ('040326', '化工分析与检测技术教育');
+INSERT INTO `base_major` VALUES ('040327', '建筑材料工程教育');
+INSERT INTO `base_major` VALUES ('040328', '建筑工程教育');
+INSERT INTO `base_major` VALUES ('040329', '服装设计与工艺教育');
+INSERT INTO `base_major` VALUES ('040330', '装潢设计与工艺教育');
+INSERT INTO `base_major` VALUES ('040331', '旅游管理与服务教育');
+INSERT INTO `base_major` VALUES ('040332', '食品营养与检验教育');
+INSERT INTO `base_major` VALUES ('040333', '烹饪与营养教育');
+INSERT INTO `base_major` VALUES ('040334', '财务会计教育');
+INSERT INTO `base_major` VALUES ('040335', '文秘教育');
+INSERT INTO `base_major` VALUES ('040336', '市场营销教育');
+INSERT INTO `base_major` VALUES ('040337', '职业技术教育管理');
+INSERT INTO `base_major` VALUES ('050100', '中国语言文学类');
+INSERT INTO `base_major` VALUES ('050101', '汉语言文学');
+INSERT INTO `base_major` VALUES ('050102', '汉语言');
+INSERT INTO `base_major` VALUES ('050103', '对外汉语');
+INSERT INTO `base_major` VALUES ('050104', '中国少数民族语言文学');
+INSERT INTO `base_major` VALUES ('050105', '古典文献');
+INSERT INTO `base_major` VALUES ('050106', '中国语言文化');
+INSERT INTO `base_major` VALUES ('050107', '应用语言学');
+INSERT INTO `base_major` VALUES ('05010J', '中国语言文学基地班');
+INSERT INTO `base_major` VALUES ('050200', '外国语言文学类');
+INSERT INTO `base_major` VALUES ('050201', '英语');
+INSERT INTO `base_major` VALUES ('050202', '俄语');
+INSERT INTO `base_major` VALUES ('050203', '德语');
+INSERT INTO `base_major` VALUES ('050204', '法语');
+INSERT INTO `base_major` VALUES ('050205', '西班牙语');
+INSERT INTO `base_major` VALUES ('050206', '阿拉伯语');
+INSERT INTO `base_major` VALUES ('050207', '日语');
+INSERT INTO `base_major` VALUES ('050208', '波斯语');
+INSERT INTO `base_major` VALUES ('050209', '朝鲜语');
+INSERT INTO `base_major` VALUES ('050210', '菲律宾语');
+INSERT INTO `base_major` VALUES ('050211', '梵语巴利语');
+INSERT INTO `base_major` VALUES ('050212', '印度尼西亚语');
+INSERT INTO `base_major` VALUES ('050213', '印地语');
+INSERT INTO `base_major` VALUES ('050214', '柬埔寨语');
+INSERT INTO `base_major` VALUES ('050215', '老挝语');
+INSERT INTO `base_major` VALUES ('050216', '缅甸语');
+INSERT INTO `base_major` VALUES ('050217', '马来语');
+INSERT INTO `base_major` VALUES ('050218', '蒙古语');
+INSERT INTO `base_major` VALUES ('050219', '僧加罗语');
+INSERT INTO `base_major` VALUES ('050220', '泰语');
+INSERT INTO `base_major` VALUES ('050221', '乌尔都语');
+INSERT INTO `base_major` VALUES ('050222', '希伯莱语');
+INSERT INTO `base_major` VALUES ('050223', '越南语');
+INSERT INTO `base_major` VALUES ('050224', '豪萨语');
+INSERT INTO `base_major` VALUES ('050225', '斯瓦希里语');
+INSERT INTO `base_major` VALUES ('050226', '阿尔巴尼亚语');
+INSERT INTO `base_major` VALUES ('050227', '保加利亚语');
+INSERT INTO `base_major` VALUES ('050228', '波兰语');
+INSERT INTO `base_major` VALUES ('050229', '捷克语');
+INSERT INTO `base_major` VALUES ('050230', '罗马尼亚语');
+INSERT INTO `base_major` VALUES ('050231', '葡萄牙语');
+INSERT INTO `base_major` VALUES ('050232', '瑞典语');
+INSERT INTO `base_major` VALUES ('050233', '塞尔维亚—克罗地亚语');
+INSERT INTO `base_major` VALUES ('050234', '土耳其语');
+INSERT INTO `base_major` VALUES ('050235', '希腊语');
+INSERT INTO `base_major` VALUES ('050236', '匈牙利语');
+INSERT INTO `base_major` VALUES ('050237', '意大利语');
+INSERT INTO `base_major` VALUES ('050238', '捷克语—斯洛伐克语');
+INSERT INTO `base_major` VALUES ('050239', '泰米尔语');
+INSERT INTO `base_major` VALUES ('050240', '普什图语');
+INSERT INTO `base_major` VALUES ('050241', '世界语');
+INSERT INTO `base_major` VALUES ('050242', '孟加拉语');
+INSERT INTO `base_major` VALUES ('050243', '尼泊尔语');
+INSERT INTO `base_major` VALUES ('050244', '塞尔维亚语—克罗地亚语');
+INSERT INTO `base_major` VALUES ('050245', '荷兰语');
+INSERT INTO `base_major` VALUES ('050246', '芬兰语');
+INSERT INTO `base_major` VALUES ('050247', '乌克兰语');
+INSERT INTO `base_major` VALUES ('050248', '韩国语');
+INSERT INTO `base_major` VALUES ('050249', '商务英语');
+INSERT INTO `base_major` VALUES ('050250', '塞尔维亚语');
+INSERT INTO `base_major` VALUES ('050251', '克罗地亚语');
+INSERT INTO `base_major` VALUES ('050252', '挪威语');
+INSERT INTO `base_major` VALUES ('050253', '丹麦语');
+INSERT INTO `base_major` VALUES ('050254', '冰岛语');
+INSERT INTO `base_major` VALUES ('050255', '翻译');
+INSERT INTO `base_major` VALUES ('050300', '新闻传播学类');
+INSERT INTO `base_major` VALUES ('050301', '新闻学');
+INSERT INTO `base_major` VALUES ('050302', '广播电视新闻学');
+INSERT INTO `base_major` VALUES ('050303', '广告学');
+INSERT INTO `base_major` VALUES ('050304', '编辑出版学');
+INSERT INTO `base_major` VALUES ('050305', '传播学');
+INSERT INTO `base_major` VALUES ('050306', '媒体创意');
+INSERT INTO `base_major` VALUES ('050307', '新媒体与信息网络');
+INSERT INTO `base_major` VALUES ('050308', '数字出版');
+INSERT INTO `base_major` VALUES ('050400', '艺术类');
+INSERT INTO `base_major` VALUES ('050401', '音乐学');
+INSERT INTO `base_major` VALUES ('050402', '作曲与作曲技术理论');
+INSERT INTO `base_major` VALUES ('050403', '音乐表演');
+INSERT INTO `base_major` VALUES ('050404', '绘画');
+INSERT INTO `base_major` VALUES ('050405', '雕塑');
+INSERT INTO `base_major` VALUES ('050406', '美术学');
+INSERT INTO `base_major` VALUES ('050407', '艺术设计学');
+INSERT INTO `base_major` VALUES ('050408', '艺术设计');
+INSERT INTO `base_major` VALUES ('050409', '舞蹈学');
+INSERT INTO `base_major` VALUES ('050410', '舞蹈编导');
+INSERT INTO `base_major` VALUES ('050411', '戏剧学');
+INSERT INTO `base_major` VALUES ('050412', '表演');
+INSERT INTO `base_major` VALUES ('050413', '导演');
+INSERT INTO `base_major` VALUES ('050414', '戏剧影视文学');
+INSERT INTO `base_major` VALUES ('050415', '戏剧影视美术设计');
+INSERT INTO `base_major` VALUES ('050416', '摄影');
+INSERT INTO `base_major` VALUES ('050417', '录音艺术');
+INSERT INTO `base_major` VALUES ('050418', '动画');
+INSERT INTO `base_major` VALUES ('050419', '播音与主持艺术');
+INSERT INTO `base_major` VALUES ('050420', '广播电视编导');
+INSERT INTO `base_major` VALUES ('050422', '艺术学');
+INSERT INTO `base_major` VALUES ('050423', '影视学');
+INSERT INTO `base_major` VALUES ('050424', '广播影视编导');
+INSERT INTO `base_major` VALUES ('050425', '书法学');
+INSERT INTO `base_major` VALUES ('050426', '照明艺术');
+INSERT INTO `base_major` VALUES ('050427', '会展艺术与技术');
+INSERT INTO `base_major` VALUES ('050428', '音乐科技与艺术');
+INSERT INTO `base_major` VALUES ('050429', '中国画');
+INSERT INTO `base_major` VALUES ('050430', '公共艺术');
+INSERT INTO `base_major` VALUES ('050431', '数字游戏设计');
+INSERT INTO `base_major` VALUES ('050432', '数字电影技术');
+INSERT INTO `base_major` VALUES ('05SY00', '文科试验班类');
+INSERT INTO `base_major` VALUES ('060100', '历史学类');
+INSERT INTO `base_major` VALUES ('060101', '历史学');
+INSERT INTO `base_major` VALUES ('060102', '世界历史');
+INSERT INTO `base_major` VALUES ('060103', '考古学');
+INSERT INTO `base_major` VALUES ('060104', '博物馆学');
+INSERT INTO `base_major` VALUES ('060105', '民族学');
+INSERT INTO `base_major` VALUES ('060106', '文物保护技术');
+INSERT INTO `base_major` VALUES ('06010J', '历史学基地班');
+INSERT INTO `base_major` VALUES ('070100', '数学类');
+INSERT INTO `base_major` VALUES ('070101', '数学与应用数学');
+INSERT INTO `base_major` VALUES ('070102', '信息与计算科学');
+INSERT INTO `base_major` VALUES ('070103', '数理基础科学');
+INSERT INTO `base_major` VALUES ('07010J', '数学基地班');
+INSERT INTO `base_major` VALUES ('070200', '物理学类');
+INSERT INTO `base_major` VALUES ('070201', '物理学');
+INSERT INTO `base_major` VALUES ('070202', '应用物理学');
+INSERT INTO `base_major` VALUES ('070203', '声学');
+INSERT INTO `base_major` VALUES ('070204', '核物理');
+INSERT INTO `base_major` VALUES ('07020J', '物理学基地班');
+INSERT INTO `base_major` VALUES ('070300', '化学类');
+INSERT INTO `base_major` VALUES ('070301', '化学');
+INSERT INTO `base_major` VALUES ('070302', '应用化学');
+INSERT INTO `base_major` VALUES ('070303', '化学生物学');
+INSERT INTO `base_major` VALUES ('070304', '分子科学与工程');
+INSERT INTO `base_major` VALUES ('07030J', '化学基地班');
+INSERT INTO `base_major` VALUES ('070400', '生物科学类');
+INSERT INTO `base_major` VALUES ('070401', '生物科学');
+INSERT INTO `base_major` VALUES ('070402', '生物技术');
+INSERT INTO `base_major` VALUES ('070403', '生物信息学');
+INSERT INTO `base_major` VALUES ('070404', '生物信息技术');
+INSERT INTO `base_major` VALUES ('070405', '生物科学与生物技术');
+INSERT INTO `base_major` VALUES ('070406', '动植物检疫');
+INSERT INTO `base_major` VALUES ('070407', '生物化学与分子生物学');
+INSERT INTO `base_major` VALUES ('070408', '医学信息学');
+INSERT INTO `base_major` VALUES ('070409', '植物生物技术');
+INSERT INTO `base_major` VALUES ('07040J', '生物学基地班');
+INSERT INTO `base_major` VALUES ('070410', '动物生物技术');
+INSERT INTO `base_major` VALUES ('070411', '生物资源科学');
+INSERT INTO `base_major` VALUES ('070412', '生物安全');
+INSERT INTO `base_major` VALUES ('070413', '生物医学英语');
+INSERT INTO `base_major` VALUES ('07041J', '生命科学与技术基地班');
+INSERT INTO `base_major` VALUES ('070500', '天文学类');
+INSERT INTO `base_major` VALUES ('070501', '天文学');
+INSERT INTO `base_major` VALUES ('070600', '地质学类');
+INSERT INTO `base_major` VALUES ('070601', '地质学');
+INSERT INTO `base_major` VALUES ('070602', '地球化学');
+INSERT INTO `base_major` VALUES ('07060J', '地质学基地班');
+INSERT INTO `base_major` VALUES ('070700', '地理科学类');
+INSERT INTO `base_major` VALUES ('070701', '地理科学');
+INSERT INTO `base_major` VALUES ('070702', '资源环境与城乡规划管理');
+INSERT INTO `base_major` VALUES ('070703', '地理信息系统');
+INSERT INTO `base_major` VALUES ('070704', '地球信息科学与技术');
+INSERT INTO `base_major` VALUES ('07070J', '地理学基地班');
+INSERT INTO `base_major` VALUES ('070800', '地球物理学类');
+INSERT INTO `base_major` VALUES ('070801', '地球物理学');
+INSERT INTO `base_major` VALUES ('070802', '地球与空间科学');
+INSERT INTO `base_major` VALUES ('070803', '空间科学与技术');
+INSERT INTO `base_major` VALUES ('070900', '大气科学类');
+INSERT INTO `base_major` VALUES ('070901', '大气科学');
+INSERT INTO `base_major` VALUES ('070902', '应用气象学');
+INSERT INTO `base_major` VALUES ('071000', '海洋科学类');
+INSERT INTO `base_major` VALUES ('071001', '海洋科学');
+INSERT INTO `base_major` VALUES ('071002', '海洋技术');
+INSERT INTO `base_major` VALUES ('071003', '海洋管理');
+INSERT INTO `base_major` VALUES ('071004', '军事海洋学');
+INSERT INTO `base_major` VALUES ('071005', '海洋生物资源与环境');
+INSERT INTO `base_major` VALUES ('071100', '力学类');
+INSERT INTO `base_major` VALUES ('071101', '理论与应用力学');
+INSERT INTO `base_major` VALUES ('071200', '电子信息科学类');
+INSERT INTO `base_major` VALUES ('071201', '电子信息科学与技术');
+INSERT INTO `base_major` VALUES ('071202', '微电子学');
+INSERT INTO `base_major` VALUES ('071203', '光信息科学与技术');
+INSERT INTO `base_major` VALUES ('071204', '科技防卫');
+INSERT INTO `base_major` VALUES ('071205', '信息安全');
+INSERT INTO `base_major` VALUES ('071206', '信息科学技术');
+INSERT INTO `base_major` VALUES ('071207', '光电子技术科学');
+INSERT INTO `base_major` VALUES ('071300', '材料科学类');
+INSERT INTO `base_major` VALUES ('071301', '材料物理');
+INSERT INTO `base_major` VALUES ('071302', '材料化学');
+INSERT INTO `base_major` VALUES ('071400', '环境科学类');
+INSERT INTO `base_major` VALUES ('071401', '环境科学');
+INSERT INTO `base_major` VALUES ('071402', '生态学');
+INSERT INTO `base_major` VALUES ('071403', '资源环境科学');
+INSERT INTO `base_major` VALUES ('071404', '地球环境科学');
+INSERT INTO `base_major` VALUES ('071500', '心理学类');
+INSERT INTO `base_major` VALUES ('071501', '心理学');
+INSERT INTO `base_major` VALUES ('071502', '应用心理学');
+INSERT INTO `base_major` VALUES ('071600', '统计学类');
+INSERT INTO `base_major` VALUES ('071601', '统计学');
+INSERT INTO `base_major` VALUES ('071700', '系统科学类');
+INSERT INTO `base_major` VALUES ('071701', '系统理论');
+INSERT INTO `base_major` VALUES ('071702', '系统科学与工程');
+INSERT INTO `base_major` VALUES ('07SY00', '理科试验班类');
+INSERT INTO `base_major` VALUES ('07SY01', '理科试验班');
+INSERT INTO `base_major` VALUES ('07SY02', '自然科学试验班');
+INSERT INTO `base_major` VALUES ('080100', '地矿类');
+INSERT INTO `base_major` VALUES ('080101', '采矿工程');
+INSERT INTO `base_major` VALUES ('080102', '石油工程');
+INSERT INTO `base_major` VALUES ('080103', '矿物加工工程');
+INSERT INTO `base_major` VALUES ('080104', '勘查技术与工程');
+INSERT INTO `base_major` VALUES ('080105', '资源勘查工程');
+INSERT INTO `base_major` VALUES ('080106', '地质工程');
+INSERT INTO `base_major` VALUES ('080107', '矿物资源工程');
+INSERT INTO `base_major` VALUES ('080108', '煤及煤层气工程');
+INSERT INTO `base_major` VALUES ('080109', '地下水科学与工程');
+INSERT INTO `base_major` VALUES ('080110', '能源与资源工程');
+INSERT INTO `base_major` VALUES ('080111', '海洋油气工程');
+INSERT INTO `base_major` VALUES ('080200', '材料类');
+INSERT INTO `base_major` VALUES ('080201', '冶金工程');
+INSERT INTO `base_major` VALUES ('080202', '金属材料工程');
+INSERT INTO `base_major` VALUES ('080203', '无机非金属材料工程');
+INSERT INTO `base_major` VALUES ('080204', '高分子材料与工程');
+INSERT INTO `base_major` VALUES ('080205', '材料科学与工程');
+INSERT INTO `base_major` VALUES ('080206', '复合材料与工程');
+INSERT INTO `base_major` VALUES ('080207', '焊接技术与工程');
+INSERT INTO `base_major` VALUES ('080208', '宝石及材料工艺学');
+INSERT INTO `base_major` VALUES ('080209', '粉体材料科学与工程');
+INSERT INTO `base_major` VALUES ('080210', '再生资源科学与技术');
+INSERT INTO `base_major` VALUES ('080211', '稀土工程');
+INSERT INTO `base_major` VALUES ('080212', '高分子材料加工工程');
+INSERT INTO `base_major` VALUES ('080213', '生物功能材料');
+INSERT INTO `base_major` VALUES ('080214', '电子封装技术');
+INSERT INTO `base_major` VALUES ('080215', '功能材料');
+INSERT INTO `base_major` VALUES ('080216', '纳米材料与技术');
+INSERT INTO `base_major` VALUES ('080217', '新能源材料与器件');
+INSERT INTO `base_major` VALUES ('080218', '资源循环科学与工程');
+INSERT INTO `base_major` VALUES ('080300', '机械类');
+INSERT INTO `base_major` VALUES ('080301', '机械设计制造及其自动化');
+INSERT INTO `base_major` VALUES ('080302', '材料成型及控制工程');
+INSERT INTO `base_major` VALUES ('080303', '工业设计');
+INSERT INTO `base_major` VALUES ('080304', '过程装备与控制工程');
+INSERT INTO `base_major` VALUES ('080305', '机械工程及自动化');
+INSERT INTO `base_major` VALUES ('080306', '车辆工程');
+INSERT INTO `base_major` VALUES ('080307', '机械电子工程');
+INSERT INTO `base_major` VALUES ('080308', '汽车服务工程');
+INSERT INTO `base_major` VALUES ('080309', '制造自动化与测控技术');
+INSERT INTO `base_major` VALUES ('080310', '微机电系统工程');
+INSERT INTO `base_major` VALUES ('080311', '制造工程');
+INSERT INTO `base_major` VALUES ('080312', '体育装备工程');
+INSERT INTO `base_major` VALUES ('080313', '工程机械');
+INSERT INTO `base_major` VALUES ('080400', '仪器仪表类');
+INSERT INTO `base_major` VALUES ('080401', '测控技术与仪器');
+INSERT INTO `base_major` VALUES ('080402', '电子信息技术及仪器');
+INSERT INTO `base_major` VALUES ('080500', '能源动力类');
+INSERT INTO `base_major` VALUES ('080501', '热能与动力工程');
+INSERT INTO `base_major` VALUES ('080502', '核工程与核技术');
+INSERT INTO `base_major` VALUES ('080503', '工程物理');
+INSERT INTO `base_major` VALUES ('080504', '能源与环境系统工程');
+INSERT INTO `base_major` VALUES ('080505', '能源工程及自动化');
+INSERT INTO `base_major` VALUES ('080506', '能源动力系统及自动化');
+INSERT INTO `base_major` VALUES ('080507', '风能与动力工程');
+INSERT INTO `base_major` VALUES ('080508', '核技术');
+INSERT INTO `base_major` VALUES ('080509', '辐射防护与环境工程');
+INSERT INTO `base_major` VALUES ('080510', '核化工与核燃料工程');
+INSERT INTO `base_major` VALUES ('080511', '核反应堆工程');
+INSERT INTO `base_major` VALUES ('080512', '新能源科学与工程');
+INSERT INTO `base_major` VALUES ('080600', '电气信息类');
+INSERT INTO `base_major` VALUES ('080601', '电气工程及其自动化');
+INSERT INTO `base_major` VALUES ('080602', '自动化');
+INSERT INTO `base_major` VALUES ('080603', '电子信息工程');
+INSERT INTO `base_major` VALUES ('080604', '通信工程');
+INSERT INTO `base_major` VALUES ('080605', '计算机科学与技术');
+INSERT INTO `base_major` VALUES ('080606', '电子科学与技术');
+INSERT INTO `base_major` VALUES ('080607', '生物医学工程');
+INSERT INTO `base_major` VALUES ('080608', '电气工程与自动化');
+INSERT INTO `base_major` VALUES ('080609', '信息工程');
+INSERT INTO `base_major` VALUES ('080610', '光源与照明');
+INSERT INTO `base_major` VALUES ('080611', '软件工程');
+INSERT INTO `base_major` VALUES ('080612', '影视艺术技术');
+INSERT INTO `base_major` VALUES ('080613', '网络工程');
+INSERT INTO `base_major` VALUES ('080614', '信息显示与光电技术');
+INSERT INTO `base_major` VALUES ('080615', '集成电路设计与集成系统');
+INSERT INTO `base_major` VALUES ('080616', '光电信息工程');
+INSERT INTO `base_major` VALUES ('080617', '广播电视工程');
+INSERT INTO `base_major` VALUES ('080618', '电气信息工程');
+INSERT INTO `base_major` VALUES ('080619', '计算机软件');
+INSERT INTO `base_major` VALUES ('080620', '电力工程与管理');
+INSERT INTO `base_major` VALUES ('080621', '微电子制造工程');
+INSERT INTO `base_major` VALUES ('080622', '假肢矫形工程');
+INSERT INTO `base_major` VALUES ('080623', '数字媒体艺术');
+INSERT INTO `base_major` VALUES ('080624', '医学信息工程');
+INSERT INTO `base_major` VALUES ('080625', '信息物理工程');
+INSERT INTO `base_major` VALUES ('080626', '医疗器械工程');
+INSERT INTO `base_major` VALUES ('080627', '智能科学与技术');
+INSERT INTO `base_major` VALUES ('080628', '数字媒体技术');
+INSERT INTO `base_major` VALUES ('080629', '医学影像工程');
+INSERT INTO `base_major` VALUES ('080630', '真空电子技术');
+INSERT INTO `base_major` VALUES ('080631', '电磁场与无线技术');
+INSERT INTO `base_major` VALUES ('080632', '电信工程及管理');
+INSERT INTO `base_major` VALUES ('080633', '电气工程与智能控制');
+INSERT INTO `base_major` VALUES ('080634', '信息与通信工程');
+INSERT INTO `base_major` VALUES ('080635', '电波传播与天线');
+INSERT INTO `base_major` VALUES ('080636', '船舶电子电气工程');
+INSERT INTO `base_major` VALUES ('080637', '电子与计算机工程');
+INSERT INTO `base_major` VALUES ('080638', '仿真科学与技术');
+INSERT INTO `base_major` VALUES ('080639', '电机电器智能化');
+INSERT INTO `base_major` VALUES ('080640', '物联网工程');
+INSERT INTO `base_major` VALUES ('080641', '传感网技术');
+INSERT INTO `base_major` VALUES ('080643', '光电子材料与器件');
+INSERT INTO `base_major` VALUES ('080644', '水声工程');
+INSERT INTO `base_major` VALUES ('080645', '智能电网信息工程');
+INSERT INTO `base_major` VALUES ('080700', '土建类');
+INSERT INTO `base_major` VALUES ('080701', '建筑学');
+INSERT INTO `base_major` VALUES ('080702', '城市规划');
+INSERT INTO `base_major` VALUES ('080703', '土木工程');
+INSERT INTO `base_major` VALUES ('080704', '建筑环境与设备工程');
+INSERT INTO `base_major` VALUES ('080705', '给水排水工程');
+INSERT INTO `base_major` VALUES ('080706', '城市地下空间工程');
+INSERT INTO `base_major` VALUES ('080707', '历史建筑保护工程');
+INSERT INTO `base_major` VALUES ('080708', '景观建筑设计');
+INSERT INTO `base_major` VALUES ('080709', '水务工程');
+INSERT INTO `base_major` VALUES ('080710', '建筑设施智能技术');
+INSERT INTO `base_major` VALUES ('080711', '给排水科学与工程');
+INSERT INTO `base_major` VALUES ('080712', '建筑电气与智能化');
+INSERT INTO `base_major` VALUES ('080713', '景观学');
+INSERT INTO `base_major` VALUES ('080714', '风景园林');
+INSERT INTO `base_major` VALUES ('080715', '总图设计与工业运输');
+INSERT INTO `base_major` VALUES ('080716', '建筑节能技术与工程');
+INSERT INTO `base_major` VALUES ('080724', '道路桥梁与渡河工程');
+INSERT INTO `base_major` VALUES ('080800', '水利类');
+INSERT INTO `base_major` VALUES ('080801', '水利水电工程');
+INSERT INTO `base_major` VALUES ('080802', '水文与水资源工程');
+INSERT INTO `base_major` VALUES ('080803', '港口航道与海岸工程');
+INSERT INTO `base_major` VALUES ('080804', '港口海岸及治河工程');
+INSERT INTO `base_major` VALUES ('080805', '水资源与海洋工程');
+INSERT INTO `base_major` VALUES ('080900', '测绘类');
+INSERT INTO `base_major` VALUES ('080901', '测绘工程');
+INSERT INTO `base_major` VALUES ('080902', '遥感科学与技术');
+INSERT INTO `base_major` VALUES ('080903', '空间信息与数字技术');
+INSERT INTO `base_major` VALUES ('081000', '环境与安全类');
+INSERT INTO `base_major` VALUES ('081001', '环境工程');
+INSERT INTO `base_major` VALUES ('081002', '安全工程');
+INSERT INTO `base_major` VALUES ('081003', '水质科学与技术');
+INSERT INTO `base_major` VALUES ('081004', '灾害防治工程');
+INSERT INTO `base_major` VALUES ('081005', '环境科学与工程');
+INSERT INTO `base_major` VALUES ('081006', '环境监察');
+INSERT INTO `base_major` VALUES ('081007', '雷电防护科学与技术');
+INSERT INTO `base_major` VALUES ('081008', '核安全工程');
+INSERT INTO `base_major` VALUES ('081009', '环保设备工程');
+INSERT INTO `base_major` VALUES ('081100', '化工与制药类');
+INSERT INTO `base_major` VALUES ('081101', '化学工程与工艺');
+INSERT INTO `base_major` VALUES ('081102', '制药工程');
+INSERT INTO `base_major` VALUES ('081103', '化工与制药');
+INSERT INTO `base_major` VALUES ('081104', '化学工程与工业生物工程');
+INSERT INTO `base_major` VALUES ('081105', '资源科学与工程');
+INSERT INTO `base_major` VALUES ('081106', '能源化学工程');
+INSERT INTO `base_major` VALUES ('081107', '生物制药');
+INSERT INTO `base_major` VALUES ('081200', '交通运输类');
+INSERT INTO `base_major` VALUES ('081201', '交通运输');
+INSERT INTO `base_major` VALUES ('081202', '交通工程');
+INSERT INTO `base_major` VALUES ('081203', '油气储运工程');
+INSERT INTO `base_major` VALUES ('081204', '飞行技术');
+INSERT INTO `base_major` VALUES ('081205', '航海技术');
+INSERT INTO `base_major` VALUES ('081206', '轮机工程');
+INSERT INTO `base_major` VALUES ('081207', '物流工程');
+INSERT INTO `base_major` VALUES ('081208', '海事管理');
+INSERT INTO `base_major` VALUES ('081209', '交通设备信息工程');
+INSERT INTO `base_major` VALUES ('081210', '交通建设与装备');
+INSERT INTO `base_major` VALUES ('081211', '救助与打捞工程');
+INSERT INTO `base_major` VALUES ('081212', '航空器适航技术');
+INSERT INTO `base_major` VALUES ('081213', '交通信息与控制工程');
+INSERT INTO `base_major` VALUES ('081300', '海洋工程类');
+INSERT INTO `base_major` VALUES ('081301', '船舶与海洋工程');
+INSERT INTO `base_major` VALUES ('081302', '海洋工程与技术');
+INSERT INTO `base_major` VALUES ('081303', '海洋资源开发技术');
+INSERT INTO `base_major` VALUES ('081400', '轻工纺织食品类');
+INSERT INTO `base_major` VALUES ('081401', '食品科学与工程');
+INSERT INTO `base_major` VALUES ('081402', '轻化工程');
+INSERT INTO `base_major` VALUES ('081403', '包装工程');
+INSERT INTO `base_major` VALUES ('081404', '印刷工程');
+INSERT INTO `base_major` VALUES ('081405', '纺织工程');
+INSERT INTO `base_major` VALUES ('081406', '服装设计与工程');
+INSERT INTO `base_major` VALUES ('081407', '食品质量与安全');
+INSERT INTO `base_major` VALUES ('081408', '酿酒工程');
+INSERT INTO `base_major` VALUES ('081409', '葡萄与葡萄酒工程');
+INSERT INTO `base_major` VALUES ('081410', '轻工生物技术');
+INSERT INTO `base_major` VALUES ('081411', '农产品质量与安全');
+INSERT INTO `base_major` VALUES ('081412', '非织造材料与工程');
+INSERT INTO `base_major` VALUES ('081413', '数字印刷');
+INSERT INTO `base_major` VALUES ('081414', '植物资源工程');
+INSERT INTO `base_major` VALUES ('081415', '粮食工程');
+INSERT INTO `base_major` VALUES ('081416', '乳品工程');
+INSERT INTO `base_major` VALUES ('081500', '航空航天类');
+INSERT INTO `base_major` VALUES ('081501', '飞行器设计与工程');
+INSERT INTO `base_major` VALUES ('081502', '飞行器动力工程');
+INSERT INTO `base_major` VALUES ('081503', '飞行器制造工程');
+INSERT INTO `base_major` VALUES ('081504', '飞行器环境与生命保障工程');
+INSERT INTO `base_major` VALUES ('081505', '航空航天工程');
+INSERT INTO `base_major` VALUES ('081506', '工程力学与航天航空工程');
+INSERT INTO `base_major` VALUES ('081507', '航天运输与控制');
+INSERT INTO `base_major` VALUES ('081508', '质量与可靠性工程');
+INSERT INTO `base_major` VALUES ('081600', '武器类');
+INSERT INTO `base_major` VALUES ('081601', '武器系统与发射工程');
+INSERT INTO `base_major` VALUES ('081602', '探测制导与控制技术');
+INSERT INTO `base_major` VALUES ('081603', '弹药工程与爆炸技术');
+INSERT INTO `base_major` VALUES ('081604', '特种能源工程与烟火技术');
+INSERT INTO `base_major` VALUES ('081605', '地面武器机动工程');
+INSERT INTO `base_major` VALUES ('081606', '信息对抗技术');
+INSERT INTO `base_major` VALUES ('081607', '武器系统与工程');
+INSERT INTO `base_major` VALUES ('081700', '工程力学类');
+INSERT INTO `base_major` VALUES ('081701', '工程力学');
+INSERT INTO `base_major` VALUES ('081702', '工程结构分析');
+INSERT INTO `base_major` VALUES ('081800', '生物工程类');
+INSERT INTO `base_major` VALUES ('081801', '生物工程');
+INSERT INTO `base_major` VALUES ('081900', '农业工程类');
+INSERT INTO `base_major` VALUES ('081901', '农业机械化及其自动化');
+INSERT INTO `base_major` VALUES ('081902', '农业电气化与自动化');
+INSERT INTO `base_major` VALUES ('081903', '农业建筑环境与能源工程');
+INSERT INTO `base_major` VALUES ('081904', '农业水利工程');
+INSERT INTO `base_major` VALUES ('081905', '农业工程');
+INSERT INTO `base_major` VALUES ('081906', '生物系统工程');
+INSERT INTO `base_major` VALUES ('082000', '林业工程类');
+INSERT INTO `base_major` VALUES ('082001', '森林工程');
+INSERT INTO `base_major` VALUES ('082002', '木材科学与工程');
+INSERT INTO `base_major` VALUES ('082003', '林产化工');
+INSERT INTO `base_major` VALUES ('082100', '公安技术类');
+INSERT INTO `base_major` VALUES ('082101', '刑事科学技术');
+INSERT INTO `base_major` VALUES ('082102', '消防工程');
+INSERT INTO `base_major` VALUES ('082103', '安全防范工程');
+INSERT INTO `base_major` VALUES ('082104', '交通管理工程');
+INSERT INTO `base_major` VALUES ('082105', '核生化消防');
+INSERT INTO `base_major` VALUES ('082106', '公安视听技术');
+INSERT INTO `base_major` VALUES ('082107', '网络安全与执法');
+INSERT INTO `base_major` VALUES ('082303', '农业电气化');
+INSERT INTO `base_major` VALUES ('082802', '城乡规划');
+INSERT INTO `base_major` VALUES ('08SY00', '工科试验班类');
+INSERT INTO `base_major` VALUES ('08SY01', '工科试验班');
+INSERT INTO `base_major` VALUES ('08SY02', '科技与创意设计试验班');
+INSERT INTO `base_major` VALUES ('090100', '植物生产类');
+INSERT INTO `base_major` VALUES ('090101', '农学');
+INSERT INTO `base_major` VALUES ('090102', '园艺');
+INSERT INTO `base_major` VALUES ('090103', '植物保护');
+INSERT INTO `base_major` VALUES ('090104', '茶学');
+INSERT INTO `base_major` VALUES ('090105', '烟草');
+INSERT INTO `base_major` VALUES ('090106', '植物科学与技术');
+INSERT INTO `base_major` VALUES ('090107', '种子科学与工程');
+INSERT INTO `base_major` VALUES ('090108', '应用生物科学');
+INSERT INTO `base_major` VALUES ('090109', '设施农业科学与工程');
+INSERT INTO `base_major` VALUES ('090200', '草业科学类');
+INSERT INTO `base_major` VALUES ('090201', '草业科学');
+INSERT INTO `base_major` VALUES ('090300', '森林资源类');
+INSERT INTO `base_major` VALUES ('090301', '林学');
+INSERT INTO `base_major` VALUES ('090302', '森林资源保护与游憩');
+INSERT INTO `base_major` VALUES ('090303', '野生动物与自然保护区管理');
+INSERT INTO `base_major` VALUES ('090400', '环境生态类');
+INSERT INTO `base_major` VALUES ('090401', '园林');
+INSERT INTO `base_major` VALUES ('090402', '水土保持与荒漠化防治');
+INSERT INTO `base_major` VALUES ('090403', '农业资源与环境');
+INSERT INTO `base_major` VALUES ('090500', '动物生产类');
+INSERT INTO `base_major` VALUES ('090501', '动物科学');
+INSERT INTO `base_major` VALUES ('090502', '蚕学');
+INSERT INTO `base_major` VALUES ('090503', '蜂学');
+INSERT INTO `base_major` VALUES ('090600', '动物医学类');
+INSERT INTO `base_major` VALUES ('090601', '动物医学');
+INSERT INTO `base_major` VALUES ('090602', '动物药学');
+INSERT INTO `base_major` VALUES ('090700', '水产类');
+INSERT INTO `base_major` VALUES ('090701', '水产养殖学');
+INSERT INTO `base_major` VALUES ('090702', '海洋渔业科学与技术');
+INSERT INTO `base_major` VALUES ('090703', '水族科学与技术');
+INSERT INTO `base_major` VALUES ('100100', '基础医学类');
+INSERT INTO `base_major` VALUES ('100101', '基础医学');
+INSERT INTO `base_major` VALUES ('100200', '预防医学类');
+INSERT INTO `base_major` VALUES ('100201', '预防医学');
+INSERT INTO `base_major` VALUES ('100202', '卫生检验');
+INSERT INTO `base_major` VALUES ('100203', '妇幼保健医学');
+INSERT INTO `base_major` VALUES ('100204', '营养学');
+INSERT INTO `base_major` VALUES ('100300', '临床医学与医学技术类');
+INSERT INTO `base_major` VALUES ('100301', '临床医学');
+INSERT INTO `base_major` VALUES ('100302', '麻醉学');
+INSERT INTO `base_major` VALUES ('100303', '医学影像学');
+INSERT INTO `base_major` VALUES ('100304', '医学检验');
+INSERT INTO `base_major` VALUES ('100305', '放射医学');
+INSERT INTO `base_major` VALUES ('100306', '眼视光学');
+INSERT INTO `base_major` VALUES ('100307', '康复治疗学');
+INSERT INTO `base_major` VALUES ('100308', '精神医学');
+INSERT INTO `base_major` VALUES ('100309', '医学技术');
+INSERT INTO `base_major` VALUES ('100310', '听力学');
+INSERT INTO `base_major` VALUES ('100311', '医学实验学');
+INSERT INTO `base_major` VALUES ('100312', '医学美容技术');
+INSERT INTO `base_major` VALUES ('100400', '口腔医学类');
+INSERT INTO `base_major` VALUES ('100401', '口腔医学');
+INSERT INTO `base_major` VALUES ('100402', '口腔修复工艺学');
+INSERT INTO `base_major` VALUES ('100500', '中医学类');
+INSERT INTO `base_major` VALUES ('100501', '中医学');
+INSERT INTO `base_major` VALUES ('100502', '针灸推拿学');
+INSERT INTO `base_major` VALUES ('100503', '蒙医学');
+INSERT INTO `base_major` VALUES ('100504', '藏医学');
+INSERT INTO `base_major` VALUES ('100505', '中西医临床医学');
+INSERT INTO `base_major` VALUES ('100506', '维医学');
+INSERT INTO `base_major` VALUES ('100600', '法医学类');
+INSERT INTO `base_major` VALUES ('100601', '法医学');
+INSERT INTO `base_major` VALUES ('100700', '护理学类');
+INSERT INTO `base_major` VALUES ('100701', '护理学');
+INSERT INTO `base_major` VALUES ('100800', '药学类');
+INSERT INTO `base_major` VALUES ('100801', '药学');
+INSERT INTO `base_major` VALUES ('100802', '中药学');
+INSERT INTO `base_major` VALUES ('100803', '药物制剂');
+INSERT INTO `base_major` VALUES ('100804', '中草药栽培与鉴定');
+INSERT INTO `base_major` VALUES ('100805', '藏药学');
+INSERT INTO `base_major` VALUES ('100806', '中药资源与开发');
+INSERT INTO `base_major` VALUES ('100807', '应用药学');
+INSERT INTO `base_major` VALUES ('100808', '临床药学');
+INSERT INTO `base_major` VALUES ('100809', '海洋药学');
+INSERT INTO `base_major` VALUES ('10080J', '基础药学基地班');
+INSERT INTO `base_major` VALUES ('100810', '药事管理');
+INSERT INTO `base_major` VALUES ('100811', '蒙药学');
+INSERT INTO `base_major` VALUES ('100812', '药物分析');
+INSERT INTO `base_major` VALUES ('100813', '药物化学');
+INSERT INTO `base_major` VALUES ('100814', '中药制药');
+INSERT INTO `base_major` VALUES ('101001', '医学检验技术');
+INSERT INTO `base_major` VALUES ('101003', '医学影像技术');
+INSERT INTO `base_major` VALUES ('101007', '卫生检验与检疫');
+INSERT INTO `base_major` VALUES ('10SY00', '医学试验班类');
+INSERT INTO `base_major` VALUES ('10SY01', '医学试验班');
+INSERT INTO `base_major` VALUES ('110100', '管理科学与工程类');
+INSERT INTO `base_major` VALUES ('110101', '管理科学');
+INSERT INTO `base_major` VALUES ('110102', '信息管理与信息系统');
+INSERT INTO `base_major` VALUES ('110103', '工业工程');
+INSERT INTO `base_major` VALUES ('110104', '工程管理');
+INSERT INTO `base_major` VALUES ('110105', '工程造价');
+INSERT INTO `base_major` VALUES ('110106', '房地产经营管理');
+INSERT INTO `base_major` VALUES ('110107', '产品质量工程');
+INSERT INTO `base_major` VALUES ('110108', '项目管理');
+INSERT INTO `base_major` VALUES ('110109', '管理科学工程');
+INSERT INTO `base_major` VALUES ('110110', '标准化工程');
+INSERT INTO `base_major` VALUES ('110200', '工商管理类');
+INSERT INTO `base_major` VALUES ('110201', '工商管理');
+INSERT INTO `base_major` VALUES ('110202', '市场营销');
+INSERT INTO `base_major` VALUES ('110203', '会计学');
+INSERT INTO `base_major` VALUES ('110204', '财务管理');
+INSERT INTO `base_major` VALUES ('110205', '人力资源管理');
+INSERT INTO `base_major` VALUES ('110206', '旅游管理');
+INSERT INTO `base_major` VALUES ('110207', '商品学');
+INSERT INTO `base_major` VALUES ('110208', '审计学');
+INSERT INTO `base_major` VALUES ('110209', '电子商务');
+INSERT INTO `base_major` VALUES ('110210', '物流管理');
+INSERT INTO `base_major` VALUES ('110211', '国际商务');
+INSERT INTO `base_major` VALUES ('110212', '物业管理');
+INSERT INTO `base_major` VALUES ('110213', '特许经营管理');
+INSERT INTO `base_major` VALUES ('110214', '连锁经营管理');
+INSERT INTO `base_major` VALUES ('110215', '资产评估');
+INSERT INTO `base_major` VALUES ('110216', '电子商务及法律');
+INSERT INTO `base_major` VALUES ('110217', '商务策划管理');
+INSERT INTO `base_major` VALUES ('110218', '酒店管理');
+INSERT INTO `base_major` VALUES ('110219', '采购管理');
+INSERT INTO `base_major` VALUES ('110300', '公共管理类');
+INSERT INTO `base_major` VALUES ('110301', '行政管理');
+INSERT INTO `base_major` VALUES ('110302', '公共事业管理');
+INSERT INTO `base_major` VALUES ('110303', '劳动与社会保障');
+INSERT INTO `base_major` VALUES ('110304', '土地资源管理');
+INSERT INTO `base_major` VALUES ('110305', '公共关系学');
+INSERT INTO `base_major` VALUES ('110306', '高等教育管理');
+INSERT INTO `base_major` VALUES ('110307', '公共政策学');
+INSERT INTO `base_major` VALUES ('110308', '城市管理');
+INSERT INTO `base_major` VALUES ('110309', '公共管理');
+INSERT INTO `base_major` VALUES ('110310', '文化产业管理');
+INSERT INTO `base_major` VALUES ('110311', '会展经济与管理');
+INSERT INTO `base_major` VALUES ('110312', '国防教育与管理');
+INSERT INTO `base_major` VALUES ('110313', '航运管理');
+INSERT INTO `base_major` VALUES ('110314', '劳动关系');
+INSERT INTO `base_major` VALUES ('110315', '公共安全管理');
+INSERT INTO `base_major` VALUES ('110316', '体育产业管理');
+INSERT INTO `base_major` VALUES ('110317', '食品经济管理');
+INSERT INTO `base_major` VALUES ('110318', '应急管理');
+INSERT INTO `base_major` VALUES ('110319', '海关管理');
+INSERT INTO `base_major` VALUES ('110400', '农业经济管理类');
+INSERT INTO `base_major` VALUES ('110401', '农林经济管理');
+INSERT INTO `base_major` VALUES ('110402', '农村区域发展');
+INSERT INTO `base_major` VALUES ('110500', '图书档案学类');
+INSERT INTO `base_major` VALUES ('110501', '图书馆学');
+INSERT INTO `base_major` VALUES ('110502', '档案学');
+INSERT INTO `base_major` VALUES ('110503', '信息资源管理');
+INSERT INTO `base_major` VALUES ('120201', '政治经济学');
+INSERT INTO `base_major` VALUES ('120301', '政治学');
+INSERT INTO `base_major` VALUES ('120302', '国际关系与安全');
+INSERT INTO `base_major` VALUES ('120303', '军事外交');
+INSERT INTO `base_major` VALUES ('120501', '中国语言文学');
+INSERT INTO `base_major` VALUES ('120502', '外国语言文学(外国军事)');
+INSERT INTO `base_major` VALUES ('120601', '军事历史');
+INSERT INTO `base_major` VALUES ('120701', '应用数学');
+INSERT INTO `base_major` VALUES ('120702', '军事气象学');
+INSERT INTO `base_major` VALUES ('120703', '军事海洋学');
+INSERT INTO `base_major` VALUES ('120704', '军事心理学');
+INSERT INTO `base_major` VALUES ('120801', '军用材料工程');
+INSERT INTO `base_major` VALUES ('120802', '机械装备类');
+INSERT INTO `base_major` VALUES ('120803', '车辆运用工程');
+INSERT INTO `base_major` VALUES ('120804', '油料储运工程');
+INSERT INTO `base_major` VALUES ('120805', '舰船动力工程');
+INSERT INTO `base_major` VALUES ('120806', '核动力工程');
+INSERT INTO `base_major` VALUES ('120807', '电力工程及其自动化');
+INSERT INTO `base_major` VALUES ('120808', '电子工程');
+INSERT INTO `base_major` VALUES ('120809', '雷达工程');
+INSERT INTO `base_major` VALUES ('120810', '导航工程');
+INSERT INTO `base_major` VALUES ('120811', '军用光电工程');
+INSERT INTO `base_major` VALUES ('120812', '航空反潜工程');
+INSERT INTO `base_major` VALUES ('120813', '侦测工程');
+INSERT INTO `base_major` VALUES ('120814', '信息研究与安全(密码学)');
+INSERT INTO `base_major` VALUES ('120815', '密码装备工程');
+INSERT INTO `base_major` VALUES ('120816', '仿真工程');
+INSERT INTO `base_major` VALUES ('120817', '指挥自动化工程');
+INSERT INTO `base_major` VALUES ('120818', '国防建筑学');
+INSERT INTO `base_major` VALUES ('120819', '土木工程');
+INSERT INTO `base_major` VALUES ('120820', '野战给水工程');
+INSERT INTO `base_major` VALUES ('120821', '国防建筑设备工程');
+INSERT INTO `base_major` VALUES ('120822', '道路桥梁与渡河濒海工程');
+INSERT INTO `base_major` VALUES ('120823', '测绘遥感类');
+INSERT INTO `base_major` VALUES ('120824', '测量工程');
+INSERT INTO `base_major` VALUES ('120825', '地图学与地理信息工程');
+INSERT INTO `base_major` VALUES ('120826', '工程物理');
+INSERT INTO `base_major` VALUES ('120827', '生化防护工程');
+INSERT INTO `base_major` VALUES ('120828', '国防工程与防护');
+INSERT INTO `base_major` VALUES ('120829', '伪装工程');
+INSERT INTO `base_major` VALUES ('120830', '舰船与海洋工程');
+INSERT INTO `base_major` VALUES ('120831', '飞行器系统与工程');
+INSERT INTO `base_major` VALUES ('120832', '空间工程');
+INSERT INTO `base_major` VALUES ('120833', '兵器工程');
+INSERT INTO `base_major` VALUES ('120834', '导弹工程');
+INSERT INTO `base_major` VALUES ('120835', '弹药工程');
+INSERT INTO `base_major` VALUES ('120836', '地雷爆破与破障工程');
+INSERT INTO `base_major` VALUES ('120837', '控制测试类');
+INSERT INTO `base_major` VALUES ('120838', '火力指挥与控制工程');
+INSERT INTO `base_major` VALUES ('120839', '测控工程');
+INSERT INTO `base_major` VALUES ('120840', '无人机运用工程');
+INSERT INTO `base_major` VALUES ('120841', '探测工程');
+INSERT INTO `base_major` VALUES ('121101', '管理工程');
+INSERT INTO `base_major` VALUES ('121102', '系统工程');
+INSERT INTO `base_major` VALUES ('121103', '经济管理类');
+INSERT INTO `base_major` VALUES ('121104', '军队财务管理');
+INSERT INTO `base_major` VALUES ('121105', '装备经济管理');
+INSERT INTO `base_major` VALUES ('121106', '军队审计');
+INSERT INTO `base_major` VALUES ('121107', '军队采办');
+INSERT INTO `base_major` VALUES ('121300', '兵种指挥类');
+INSERT INTO `base_major` VALUES ('121301', '炮兵指挥');
+INSERT INTO `base_major` VALUES ('121302', '防空兵指挥');
+INSERT INTO `base_major` VALUES ('121303', '装甲兵指挥');
+INSERT INTO `base_major` VALUES ('121304', '工程兵指挥');
+INSERT INTO `base_major` VALUES ('121305', '防化兵指挥');
+INSERT INTO `base_major` VALUES ('121400', '航空航天指挥类');
+INSERT INTO `base_major` VALUES ('121401', '航空飞行与指挥');
+INSERT INTO `base_major` VALUES ('121402', '地面领航与航空管制');
+INSERT INTO `base_major` VALUES ('121403', '航天指挥');
+INSERT INTO `base_major` VALUES ('121500', '信息作战指挥类');
+INSERT INTO `base_major` VALUES ('121501', '侦察与特种兵指挥');
+INSERT INTO `base_major` VALUES ('121502', '通信指挥');
+INSERT INTO `base_major` VALUES ('121503', '电子对抗指挥与工程');
+INSERT INTO `base_major` VALUES ('121504', '军事情报');
+INSERT INTO `base_major` VALUES ('121505', '作战信息管理');
+INSERT INTO `base_major` VALUES ('121506', '预警探测指挥');
+INSERT INTO `base_major` VALUES ('121600', '保障指挥类');
+INSERT INTO `base_major` VALUES ('121601', '军事交通指挥与工程');
+INSERT INTO `base_major` VALUES ('121602', '汽车指挥');
+INSERT INTO `base_major` VALUES ('121603', '船艇指挥');
+INSERT INTO `base_major` VALUES ('121604', '航空兵场站指挥');
+INSERT INTO `base_major` VALUES ('121605', '国防工程指挥');
+INSERT INTO `base_major` VALUES ('121606', '装备保障指挥');
+INSERT INTO `base_major` VALUES ('121607', '军需勤务指挥');
+INSERT INTO `base_major` VALUES ('121700', '武警指挥类');
+INSERT INTO `base_major` VALUES ('121701', '武警指挥');
+INSERT INTO `base_major` VALUES ('130101', '艺术史论');
+INSERT INTO `base_major` VALUES ('130201', '音乐表演');
+INSERT INTO `base_major` VALUES ('130202', '音乐学');
+INSERT INTO `base_major` VALUES ('130203', '作曲与作曲技术理论');
+INSERT INTO `base_major` VALUES ('130204', '舞蹈表演');
+INSERT INTO `base_major` VALUES ('130205', '舞蹈学');
+INSERT INTO `base_major` VALUES ('130206', '舞蹈编导');
+INSERT INTO `base_major` VALUES ('130301', '表演');
+INSERT INTO `base_major` VALUES ('130302', '戏剧学');
+INSERT INTO `base_major` VALUES ('130303', '电影学');
+INSERT INTO `base_major` VALUES ('130304', '戏剧影视文学');
+INSERT INTO `base_major` VALUES ('130305', '广播电视编导');
+INSERT INTO `base_major` VALUES ('130306', '戏剧影视导演');
+INSERT INTO `base_major` VALUES ('130307', '戏剧影视美术设计');
+INSERT INTO `base_major` VALUES ('130308', '录音艺术');
+INSERT INTO `base_major` VALUES ('130309', '播音与主持艺术');
+INSERT INTO `base_major` VALUES ('130310', '动画');
+INSERT INTO `base_major` VALUES ('130311', '影视摄影与制作');
+INSERT INTO `base_major` VALUES ('130401', '美术学');
+INSERT INTO `base_major` VALUES ('130402', '绘画');
+INSERT INTO `base_major` VALUES ('130403', '雕塑');
+INSERT INTO `base_major` VALUES ('130404', '摄影');
+INSERT INTO `base_major` VALUES ('130405', '书法学');
+INSERT INTO `base_major` VALUES ('130406', '中国画');
+INSERT INTO `base_major` VALUES ('130500', '设计学类');
+INSERT INTO `base_major` VALUES ('130501', '艺术设计学');
+INSERT INTO `base_major` VALUES ('130502', '视觉传达设计');
+INSERT INTO `base_major` VALUES ('130503', '环境设计');
+INSERT INTO `base_major` VALUES ('130504', '产品设计');
+INSERT INTO `base_major` VALUES ('130505', '服装与服饰设计');
+INSERT INTO `base_major` VALUES ('130506', '公共艺术');
+INSERT INTO `base_major` VALUES ('130507', '工艺美术');
+INSERT INTO `base_major` VALUES ('130508', '数字媒体艺术');
+INSERT INTO `base_major` VALUES ('130509', '艺术与科技');

src/main/resources/templates/login.html

@@ -4,11 +4,12 @@
 <head>
     <div th:include="layout::head"></div>
 </head>
+
 <body>
 <div th:fragment="content">
     <div class="wrapper">
         <div class="row" style="height: 15%"></div>
-        <div class="row" style="height: 70%">
+        <div class="row" style="height: 70%; color: #9A9A9A;">
             <div class="col-md-3 ml-auto mr-auto">
                 <div class="card">
                     <div class="card-header">
@@ -22,6 +23,7 @@
                             </div>
                             <div class="form-group">
                                 <label for="password">密码</label>
+                                <span style="color: #F89798"></span>
                                 <input type="password" class="form-control" id="password" name="password" placeholder="这里输入密码">
                             </div>
                         </div>