update

src/main/java/com/zhiqiyun/open/config/OauthInterceptor.java

@@ -5,10 +5,9 @@ import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.service.UserOperateLogService;
 import com.zhiqiyun.open.exception.NoLoginException;
 import com.zhiqiyun.open.exception.PermissionDeniedException;
-import com.zhiqiyun.open.core.models.OauthInfo;
-import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.models.user.UserOperateLog;
 import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.UserBaseInfoService;
 import com.zhiqiyun.open.utils.DateUtil;
 import com.zhiqiyun.open.utils.ServletContext;
 import com.zhiqiyun.open.utils.request.RequestWrapper;

src/main/java/com/zhiqiyun/open/core/enmus/ConfigItemType.java

@@ -0,0 +1,35 @@
+package com.zhiqiyun.open.core.enmus;
+
+
+/**
+ * @author jtoms
+ */
+
+public enum ConfigItemType implements IBaseEnum {
+    /**
+     *
+     */
+    string(1, "文本"), number(2, "数字"), bool(3, "布尔"), bstring(4, "多行文本");
+
+    private final int value;
+    private final String text;
+
+    ConfigItemType(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public String getName() {
+        return this.name();
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+}

src/main/java/com/zhiqiyun/open/core/enmus/Gender.java

@@ -5,7 +5,7 @@ package com.zhiqiyun.open.core.enmus;
  * @author jtoms
  */
 
-public enum Gender implements IBaseEnum<Integer> {
+public enum Gender implements IBaseEnum {
     /**
      *
      */

src/main/java/com/zhiqiyun/open/core/enmus/IBaseEnum.java

@@ -2,11 +2,9 @@ package com.zhiqiyun.open.core.enmus;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 
-import java.io.Serializable;
+public interface IBaseEnum extends IEnum<Integer> {
 
-public interface IBaseEnum<T extends Serializable> extends IEnum<T> {
-
-    T getValue();
+    Integer getValue();
 
     String getText();
 

src/main/java/com/zhiqiyun/open/core/mapper/ApiRequestLogMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.ApiRequestLog;
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/zhiqiyun/open/core/mapper/AppKeyInfoMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/zhiqiyun/open/core/mapper/AuthorityInfoMapper.java

@@ -1,11 +1,8 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.AuthorityInfo;
+import com.zhiqiyun.open.core.models.user.AuthorityInfo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * @author jtoms

src/main/java/com/zhiqiyun/open/core/mapper/RoleInfoMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.RoleInfo;
+import com.zhiqiyun.open.core.models.user.RoleInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/zhiqiyun/open/core/mapper/UserBaseInfoMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.UserBaseInfo;
+import com.zhiqiyun.open.core.models.user.UserBaseInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/zhiqiyun/open/core/mapper/UserLoginAccountMapper.java

@@ -1,13 +1,10 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.enmus.AccountType;
-import com.zhiqiyun.open.core.models.UserLoginAccount;
+import com.zhiqiyun.open.core.models.user.UserLoginAccount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * @author Administrator
  * @date 2017-6-7

src/main/java/com/zhiqiyun/open/core/mapper/UserLoginLogMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.UserLoginLog;
+import com.zhiqiyun.open.core.models.user.UserLoginLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/zhiqiyun/open/core/mapper/UserOperateLogMapper.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.models.user.UserOperateLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

src/main/java/com/zhiqiyun/open/core/mapper/UserPasswordMapper.java

@@ -1,10 +1,8 @@
 package com.zhiqiyun.open.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.enmus.PasswordType;
-import com.zhiqiyun.open.core.models.UserPassword;
+import com.zhiqiyun.open.core.models.user.UserPassword;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author Administrator

src/main/java/com/zhiqiyun/open/core/models/SystemConfig.java

@@ -0,0 +1,20 @@
+package com.zhiqiyun.open.core.models;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author jtoms
+ */
+@Data
+public class SystemConfig implements Serializable {
+    private static final long serialVersionUID = 5044998314209760622L;
+    private String id;
+    private String configKey;
+    private String name;
+    private String remark;
+
+    private List<SystemConfigItem> items;
+}

src/main/java/com/zhiqiyun/open/core/models/SystemConfigItem.java

@@ -0,0 +1,22 @@
+package com.zhiqiyun.open.core.models;
+
+import com.zhiqiyun.open.core.enmus.ConfigItemType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author jtoms
+ */
+@Data
+public class SystemConfigItem implements Serializable {
+    private static final long serialVersionUID = 2803996695489090243L;
+    private String id;
+    private String configKey;
+    private String itemName;
+    private String itemKey;
+    private ConfigItemType itemValueType;
+    private String itemValue;
+    private String inputRemark;
+    private Integer sortValue;
+}

src/main/java/com/zhiqiyun/open/core/models/ApiRequestLog.java → src/main/java/com/zhiqiyun/open/core/models/app/ApiRequestLog.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.app;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/zhiqiyun/open/core/models/AppKeyInfo.java → src/main/java/com/zhiqiyun/open/core/models/app/AppKeyInfo.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.app;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/zhiqiyun/open/core/models/AuthorityInfo.java → src/main/java/com/zhiqiyun/open/core/models/user/AuthorityInfo.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiqiyun/open/core/models/OauthInfo.java → src/main/java/com/zhiqiyun/open/core/models/user/OauthInfo.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.zhiqiyun.open.core.enmus.Gender;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/core/models/RoleInfo.java → src/main/java/com/zhiqiyun/open/core/models/user/RoleInfo.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/zhiqiyun/open/core/models/UserBaseInfo.java → src/main/java/com/zhiqiyun/open/core/models/user/UserBaseInfo.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/zhiqiyun/open/core/models/UserLoginAccount.java → src/main/java/com/zhiqiyun/open/core/models/user/UserLoginAccount.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiqiyun/open/core/models/UserLoginLog.java → src/main/java/com/zhiqiyun/open/core/models/user/UserLoginLog.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/zhiqiyun/open/core/models/UserOperateLog.java → src/main/java/com/zhiqiyun/open/core/models/user/UserOperateLog.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/zhiqiyun/open/core/models/UserPassword.java → src/main/java/com/zhiqiyun/open/core/models/user/UserPassword.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models;
+package com.zhiqiyun.open.core.models.user;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/zhiqiyun/open/core/service/ApiRequestLogService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.ApiRequestLog;
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
 
 public interface ApiRequestLogService extends IService<ApiRequestLog> {
 }

src/main/java/com/zhiqiyun/open/core/service/AppKeyInfoService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 
 public interface AppKeyInfoService extends IService<AppKeyInfo> {
     /**

src/main/java/com/zhiqiyun/open/core/service/AuthorityInfoService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 
-import com.zhiqiyun.open.core.models.AuthorityInfo;
+import com.zhiqiyun.open.core.models.user.AuthorityInfo;
 
 import java.util.List;
 

src/main/java/com/zhiqiyun/open/core/service/OauthService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 
-import com.zhiqiyun.open.core.models.OauthInfo;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
 
 /**
  * @author jtoms

src/main/java/com/zhiqiyun/open/core/service/RoleInfoService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.RoleInfo;
+import com.zhiqiyun.open.core.models.user.RoleInfo;
 
 import java.util.List;
 

src/main/java/com/zhiqiyun/open/core/service/UserBaseInfoService.java

@@ -4,9 +4,9 @@ package com.zhiqiyun.open.core.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
-import com.zhiqiyun.open.core.models.UserBaseInfo;
-import com.zhiqiyun.open.core.models.UserLoginAccount;
-import com.zhiqiyun.open.core.models.UserPassword;
+import com.zhiqiyun.open.core.models.user.UserBaseInfo;
+import com.zhiqiyun.open.core.models.user.UserLoginAccount;
+import com.zhiqiyun.open.core.models.user.UserPassword;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/zhiqiyun/open/core/service/UserLoginLogService.java

@@ -1,8 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.UserLoginLog;
-import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.models.user.UserLoginLog;
 
 public interface UserLoginLogService extends IService<UserLoginLog> {
 }

src/main/java/com/zhiqiyun/open/core/service/UserOperateLogService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.models.user.UserOperateLog;
 
 public interface UserOperateLogService extends IService<UserOperateLog> {
 }

src/main/java/com/zhiqiyun/open/core/service/impl/ApiRequestLogServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.core.mapper.ApiRequestLogMapper;
-import com.zhiqiyun.open.core.models.ApiRequestLog;
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
 import com.zhiqiyun.open.core.service.ApiRequestLogService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/zhiqiyun/open/core/service/impl/AppKeyInfoServiceImpl.java

@@ -3,8 +3,7 @@ package com.zhiqiyun.open.core.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.config.RedisKeys;
 import com.zhiqiyun.open.core.mapper.AppKeyInfoMapper;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
-import com.zhiqiyun.open.core.models.OauthInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/zhiqiyun/open/core/service/impl/BaseOauthService.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 
-import com.zhiqiyun.open.core.models.OauthInfo;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
 import com.zhiqiyun.open.core.service.OauthService;
 import org.apache.commons.codec.digest.DigestUtils;
 

src/main/java/com/zhiqiyun/open/core/service/impl/OauthAuthorityInfoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zhiqiyun.open.core.models.AuthorityInfo;
+import com.zhiqiyun.open.core.models.user.AuthorityInfo;
 import com.zhiqiyun.open.core.mapper.AuthorityInfoMapper;
 import com.zhiqiyun.open.core.service.AuthorityInfoService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/core/service/impl/OauthRoleInfoServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.core.mapper.RoleInfoMapper;
-import com.zhiqiyun.open.core.models.RoleInfo;
+import com.zhiqiyun.open.core.models.user.RoleInfo;
 import com.zhiqiyun.open.core.service.RoleInfoService;
 import com.zhiqiyun.open.exception.ServiceException;
 import org.springframework.stereotype.Service;

src/main/java/com/zhiqiyun/open/core/service/impl/OauthServiceRedisImpl.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 import com.zhiqiyun.open.config.RedisKeys;
-import com.zhiqiyun.open.core.models.OauthInfo;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.BoundValueOperations;

src/main/java/com/zhiqiyun/open/core/service/impl/UserBaseInfoServiceImpl.java

@@ -8,9 +8,9 @@ import com.zhiqiyun.open.core.enmus.UserState;
 import com.zhiqiyun.open.core.mapper.UserBaseInfoMapper;
 import com.zhiqiyun.open.core.mapper.UserLoginAccountMapper;
 import com.zhiqiyun.open.core.mapper.UserPasswordMapper;
-import com.zhiqiyun.open.core.models.UserBaseInfo;
-import com.zhiqiyun.open.core.models.UserLoginAccount;
-import com.zhiqiyun.open.core.models.UserPassword;
+import com.zhiqiyun.open.core.models.user.UserBaseInfo;
+import com.zhiqiyun.open.core.models.user.UserLoginAccount;
+import com.zhiqiyun.open.core.models.user.UserPassword;
 import com.zhiqiyun.open.core.service.Ip2RegionService;
 import com.zhiqiyun.open.core.service.OauthService;
 import com.zhiqiyun.open.core.service.SequenceService;

src/main/java/com/zhiqiyun/open/core/service/impl/UserLoginLogServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.core.mapper.UserLoginLogMapper;
-import com.zhiqiyun.open.core.models.UserLoginLog;
+import com.zhiqiyun.open.core.models.user.UserLoginLog;
 import com.zhiqiyun.open.core.service.UserLoginLogService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/zhiqiyun/open/core/service/impl/UserOperateLogServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.core.mapper.UserOperateLogMapper;
-import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.models.user.UserOperateLog;
 import com.zhiqiyun.open.core.service.UserOperateLogService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/zhiqiyun/open/mvc/manager/controller/AppKeyInfoController.java

@@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.enmus.YN;
-import com.zhiqiyun.open.core.models.ApiRequestLog;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
-import com.zhiqiyun.open.core.models.UserBaseInfo;
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.service.ApiRequestLogService;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.manager.params.QueryApiRequestLogParams;
 import com.zhiqiyun.open.mvc.manager.params.QueryAppKeyInfoParams;
-import com.zhiqiyun.open.mvc.manager.params.QueryPageParams;
 import com.zhiqiyun.open.mvc.manager.params.SaveAppKeyInfoParam;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/AuthorityInfoController.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.mvc.manager.controller;
 
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.core.models.AuthorityInfo;
+import com.zhiqiyun.open.core.models.user.AuthorityInfo;
 import com.zhiqiyun.open.core.service.AuthorityInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/OauthController.java

@@ -7,7 +7,7 @@ import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
 import com.zhiqiyun.open.core.enmus.UserLoginLogState;
-import com.zhiqiyun.open.core.models.*;
+import com.zhiqiyun.open.core.models.user.*;
 import com.zhiqiyun.open.core.service.CaptchaService;
 import com.zhiqiyun.open.core.service.OauthService;
 import com.zhiqiyun.open.core.service.UserBaseInfoService;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/RoleInfoController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.RoleInfo;
+import com.zhiqiyun.open.core.models.user.RoleInfo;
 import com.zhiqiyun.open.core.service.RoleInfoService;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.manager.params.QueryRoleParam;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/UserInfoController.java

@@ -7,7 +7,7 @@ import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
 import com.zhiqiyun.open.core.enmus.UserState;
-import com.zhiqiyun.open.core.models.*;
+import com.zhiqiyun.open.core.models.user.*;
 import com.zhiqiyun.open.core.service.*;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.manager.params.QueryLoginLogParam;

src/main/java/com/zhiqiyun/open/router/config/DbBaseAppSecretManager.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.router.config;
 
 import com.dliyun.oap.framework.security.AppSecretManager;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/java/com/zhiqiyun/open/router/config/DesTransportSecurity.java

@@ -2,7 +2,7 @@ package com.zhiqiyun.open.router.config;
 
 import com.dliyun.oap.framework.security.TransportSecurity;
 import com.dliyun.oap.framework.security.algorithm.DES;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/router/config/RequestLogInterceptor.java

@@ -5,11 +5,9 @@ import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.context.OapRequestContext;
 import com.dliyun.oap.framework.interceptor.AbstractOapInterceptor;
 import com.dliyun.oap.framework.response.OapResponse;
-import com.zhiqiyun.open.core.models.ApiRequestLog;
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
 import com.zhiqiyun.open.core.service.ApiRequestLogService;
-import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;

src/main/java/com/zhiqiyun/open/router/config/ServicePermissionController.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.router.config;
 
 import com.dliyun.oap.framework.security.ServiceAccessController;
-import com.zhiqiyun.open.core.models.AppKeyInfo;
+import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/resources/mybatis/mappers/UserPasswordMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.zhiqiyun.open.core.mapper.UserPasswordMapper">
-    <insert id="insertOrUpdatePassword" parameterType="com.zhiqiyun.open.core.models.UserPassword">
+    <insert id="insertOrUpdatePassword" parameterType="com.zhiqiyun.open.core.models.user.UserPassword">
         replace
         into `user_password` (`id`, `uid`, `passwd`, `salt`, `password_type`)
         values (