第一次部署

src/main/java/model/Model.kt

@@ -6,18 +6,18 @@ class ModelUser(val id: Int?, var name: String?, var passwd: String?, val groupI
     constructor() : this(null, null, null, -1, -1, null)
 }
 
-data class ModelGroup(val id: Int?, val desc: String, val createTime: Timestamp?) {
+data class ModelGroup(val id: Int?, val description: String, val createTime: Timestamp?) {
     constructor() : this(null, "", null)
 }
 
-data class ModelPerm(val id: Int?, val desc: String?, val perm: String?, val createTime: Timestamp?) {
+data class ModelPerm(val id: Int?, val description: String?, val perm: String?, val createTime: Timestamp?) {
     constructor():this(null,null,null,null)
 }
 
-data class ModelMenu(val id: Int?, val desc: String?, val url: String?, val permId: Int?, val createTime: Timestamp?) {
+data class ModelMenu(val id: Int?, val description: String?, val url: String?, val permId: Int?, val createTime: Timestamp?) {
     constructor():this(null,null,null,null,null)
 }
 
-data class ModelRole(val id: Int?, val desc: String?, val createTime: Timestamp?){
+data class ModelRole(val id: Int?, val description: String?, val createTime: Timestamp?){
     constructor():this(null,null,null)
 }

src/main/java/util/Util.kt

@@ -43,37 +43,37 @@ fun userToInsertSQL(user: ModelUser): String {
 fun rsToGroup(rs: ResultSet): ModelGroup {
     return ModelGroup(
             id = rs.getInt("id"),
-            desc = rs.getString("desc"),
+            description = rs.getString("description"),
             createTime = rs.getTimestamp("createTime")
     )
 }
 
 fun groupToInsertSQL(group: ModelGroup): String {
     return """
-        insert into `group`(desc,createTime)
+        insert into `group`(description,createTime)
-        values('${group.desc}','${Timestamp.from(Instant.now())}')
+        values('${group.description}','${Timestamp.from(Instant.now())}')
 """
 }
 
 fun rsToRole(rs: ResultSet): ModelRole {
     return ModelRole(
             id = rs.getInt("id"),
-            desc = rs.getString("desc"),
+            description = rs.getString("description"),
             createTime = rs.getTimestamp("createTime")
     )
 }
 
 fun roleToInsertSQL(role: ModelRole): String {
     return """
-        insert into `role`(desc,createTime)
+        insert into `role`(description,createTime)
-        values('${role.desc}','${Timestamp.from(Instant.now())}')
+        values('${role.description}','${Timestamp.from(Instant.now())}')
 """
 }
 
 fun rsToPerm(rs: ResultSet): ModelPerm {
     return ModelPerm(
             id = rs.getInt("id"),
-            desc = rs.getString("desc"),
+            description = rs.getString("description"),
             perm = rs.getString("perm"),
             createTime = rs.getTimestamp("createTime")
     )
@@ -81,15 +81,15 @@ fun rsToPerm(rs: ResultSet): ModelPerm {
 
 fun permToInsertSQL(perm: ModelPerm): String {
     return """
-        insert into `role`(desc,perm,createTime)
+        insert into `role`(description,perm,createTime)
-        values('${perm.desc}','${perm.perm}','${Timestamp.from(Instant.now())}')
+        values('${perm.description}','${perm.perm}','${Timestamp.from(Instant.now())}')
 """
 }
 
 fun rsToMenu(rs: ResultSet): ModelMenu {
     return ModelMenu(
             id = rs.getInt("id"),
-            desc = rs.getString("desc"),
+            description = rs.getString("description"),
             url = rs.getString("url"),
             permId = rs.getInt("permId"),
             createTime = rs.getTimestamp("createTime")
@@ -98,7 +98,7 @@ fun rsToMenu(rs: ResultSet): ModelMenu {
 
 fun menuToInsertSQL(menu: ModelMenu): String {
     return """
-        insert into `role`(desc,url,permId,createTime)
+        insert into `role`(description,url,permId,createTime)
-        values('${menu.desc}','${menu.desc}','${menu.permId}','${Timestamp.from(Instant.now())}')
+        values('${menu.description}','${menu.description}','${menu.permId}','${Timestamp.from(Instant.now())}')
 """
 }