diff --git a/db/src/main/java/db/model/bilibili/WordModel.java b/db/src/main/java/db/model/bilibili/WordModel.java new file mode 100644 index 0000000..6785fd0 --- /dev/null +++ b/db/src/main/java/db/model/bilibili/WordModel.java @@ -0,0 +1,80 @@ +package db.model.bilibili; + +import db.annotation.Aliyun; +import db.model.AbstractModel; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Objects; + +@Aliyun +@Entity +@Table(name = "word") +public class WordModel extends AbstractModel { + private int id; + private String courseName; + private String kana; + private String chinese; + + @Id + @Column(name = "id", nullable = false) + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + @Basic + @Column(name = "course_name", nullable = false, length = 32) + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + @Basic + @Column(name = "kana", nullable = false, length = 32) + public String getKana() { + return kana; + } + + public void setKana(String kana) { + this.kana = kana; + } + + @Basic + @Column(name = "chinese", nullable = true, length = 32) + public String getChinese() { + return chinese; + } + + public void setChinese(String chinese) { + this.chinese = chinese; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + WordModel wordModel = (WordModel) o; + return id == wordModel.id && + Objects.equals(courseName, wordModel.courseName) && + Objects.equals(kana, wordModel.kana) && + Objects.equals(chinese, wordModel.chinese); + } + + @Override + public int hashCode() { + + return Objects.hash(id, courseName, kana, chinese); + } + + @Override + public Serializable primaryKey() { + return getId(); + } +} diff --git a/sql/new.sql b/sql/new.sql index 0e0e489..8cd5e1d 100644 --- a/sql/new.sql +++ b/sql/new.sql @@ -1,20 +1,36 @@ ---菜单表 +#菜单表 create table menu ( - id int auto_increment--自增主键 - primary key, - href varchar(32) not null,--菜单超链接 - menu_name varchar(10) not null,--菜单名 - icon varchar(20) null,--菜单图标 - parent_id int not null,--父菜单id - menu_level int not null,--菜单树深度 - sort int not null,--排序 - constraint menu_href_uindex - unique (href) + id int auto_increment,#自增主键 + href varchar(32) not null,#菜单超链接 + menu_name varchar(10) not null,#菜单名 + icon varchar(20) null,#菜单图标 + parent_id int not null,#父菜单id + menu_level int not null,#菜单树深度 + sort int not null,#排序 + constraint menu_href_uindex unique (href) ) -engine=InnoDB ; ---thrift服务器表 -create - - +alter table menu add primary key(id); +#thrift服务器表 +create table thrift +( + ip varchar(15), + port int not null, + timeout int default 3000 +); +ALTER TABLE thrift ADD PRIMARY KEY (ip, port ); +#数据源表 +create table datasource +( + db_id varchar(32) not null, + hostname varchar(32) not null, + db_port int(5) not null, + username varchar(10) not null, + db_password varchar(10) not null, + db_name varchar(10) not null, + annotation varchar(32) not null, + db_desc varchar(20) null +) +; +ALTER TABLE datasource ADD PRIMARY KEY (db_id); \ No newline at end of file diff --git a/web/src/main/java/web/controller/BaseController.java b/web/src/main/java/web/controller/BaseController.java index c2ebc8c..a0b82b4 100644 --- a/web/src/main/java/web/controller/BaseController.java +++ b/web/src/main/java/web/controller/BaseController.java @@ -51,6 +51,7 @@ public abstract class BaseController result=new JsonResult(); result.setAction(DBAction.R); @@ -79,7 +80,7 @@ public abstract class BaseController result=new JsonResult(); result.setAction(DBAction.R); @@ -93,6 +94,7 @@ public abstract class BaseController extends BaseController{ - @Override - protected boolean checkAction(DBAction action) { - return false; - } } diff --git a/web/src/main/java/web/controller/TableController.java b/web/src/main/java/web/controller/TableController.java index 9b55526..76e44d0 100644 --- a/web/src/main/java/web/controller/TableController.java +++ b/web/src/main/java/web/controller/TableController.java @@ -56,11 +56,6 @@ public abstract class TableController { + +} diff --git a/web/src/main/java/web/service/BaseService.java b/web/src/main/java/web/service/BaseService.java index 67f63b1..88334a6 100644 --- a/web/src/main/java/web/service/BaseService.java +++ b/web/src/main/java/web/service/BaseService.java @@ -49,7 +49,7 @@ public abstract class BaseService{ } public final void delete(T command) throws DataAccessException{ - getHibernateTemplate().delete(command); + getHibernateTemplate().delete(get(command)); } public final List find(DetachedCriteria criteria, int firstResult,int maxResults) throws DataAccessException{ diff --git a/web/src/main/resources/config.properties b/web/src/main/resources/config.properties index ae1cef6..bb2dda5 100644 --- a/web/src/main/resources/config.properties +++ b/web/src/main/resources/config.properties @@ -1,7 +1,7 @@ #hibernate\u914D\u7F6E -db_url=jdbc:mysql://mysql.sukura.top:8635/rootdb?serverTimezone=UTC&useSSL=false +db_url=jdbc:mysql://sukura.top:3306/bilibili?serverTimezone=UTC&useSSL=false db_username=sukura -db_password=Luffy9412! +db_password=12345678 hibernate.dialect=org.hibernate.dialect.MySQL57Dialect hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver diff --git a/web/src/main/webapp/WEB-INF/jsp/menu.jsp b/web/src/main/webapp/WEB-INF/jsp/menu.jsp index 1f06026..1a0377a 100644 --- a/web/src/main/webapp/WEB-INF/jsp/menu.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/menu.jsp @@ -115,7 +115,7 @@ } $(function () { - $.get('/menu/batch_C',function(json){ + $.get('/menu/batch_R',function(json){ addMenu(json['data']); }); diff --git a/web/src/main/webapp/WEB-INF/jsp/test.jsp b/web/src/main/webapp/WEB-INF/jsp/test.jsp index d33c9a7..11e989a 100644 --- a/web/src/main/webapp/WEB-INF/jsp/test.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/test.jsp @@ -22,14 +22,14 @@ $(function () { $("#demo").tmpl([{type: 'primary'}, {type: 'secondary'}, {type: 'success'}, {type: 'danger'}, {type: 'warning'}, {type: 'info'}, {type: 'light'}, {type: 'dark'}]).appendTo('#div_demo'); - console.info("${spring:mvcUrl('MC#get#0').build()}"); + }); -