Forráskód Böngészése

优化用户配置

zhouhao 7 éve
szülő
commit
31fbb867d9

+ 2 - 0
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/UserSettingMapper.xml

@@ -27,6 +27,8 @@
         <result property="settingId" column="setting_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="setting" column="setting" javaType="String" jdbcType="CLOB"/>
+        <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
+        <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" javaType="Date" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" javaType="Date" jdbcType="TIMESTAMP"/>
     </resultMap>

+ 4 - 0
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/UserSettingEntity.java

@@ -30,6 +30,10 @@ public class UserSettingEntity extends SimpleGenericEntity<String> {
     @NotBlank(groups = CreateGroup.class)
     private String setting;
 
+    private String describe;
+
+    private String name;
+
     private Date createTime;
 
     private Date updateTime;

+ 4 - 0
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserSettingService.java

@@ -12,6 +12,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -63,6 +64,8 @@ public class SimpleUserSettingService extends EnableCacheGenericEntityService<Us
             }
     )
     public String insert(UserSettingEntity entity) {
+        entity.setCreateTime(new Date());
+        entity.setUpdateTime(new Date());
         return super.insert(entity);
     }
 
@@ -85,6 +88,7 @@ public class SimpleUserSettingService extends EnableCacheGenericEntityService<Us
             }
     )
     public int updateByPk(String id, UserSettingEntity entity) {
+        entity.setUpdateTime(new Date());
         return super.updateByPk(id, entity);
     }
 }

+ 12 - 0
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/main/resources/hsweb-starter.js

@@ -150,6 +150,18 @@ function install(context) {
         .addColumn().name("sort_index").alias("sortIndex").comment("排序序号").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("status").alias("status").comment("状态").jdbcType(java.sql.JDBCType.DECIMAL).length(4, 0).commit()
         .comment("菜单分组关联").commit();
+
+    database.createOrAlter("s_user_setting")
+        .addColumn().name("u_id").varchar(32).notNull().primaryKey().comment("uid").commit()
+        .addColumn().name("name").varchar(128).comment("配置名称").commit()
+        .addColumn().name("describe").varchar(512).comment("说明").commit()
+        .addColumn().name("user_id").varchar(32).notNull().comment("用户ID").commit()
+        .addColumn().name("key").varchar(128).notNull().comment("配置标识").commit()
+        .addColumn().name("setting").clob().comment("配置内容").commit()
+        .addColumn().name("setting_id").varchar(32).notNull().comment("自定义配置id").commit()
+        .addColumn().name("create_time").datetime().notNull().comment("创建时间").commit()
+        .addColumn().name("update_time").datetime().comment("创建时间").commit()
+        .comment("角色表").commit();
 }
 
 //设置依赖