diff --git a/pom.xml b/pom.xml
index 1f5b196474c449ca138e5ccf8d717d45b1710295..b467e183e63490d983dc7583c49ff910009d569c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<mapstruct.version>1.3.0.Beta2</mapstruct.version>
 		<lombok.version>1.18.4</lombok.version>
+		<fastjson.version>1.2.55</fastjson.version>
 
 		<base.package>com.simon</base.package><!-- 基础包名，用于代码生成器 -->
 	</properties>
@@ -243,7 +244,7 @@
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>fastjson</artifactId>
-				<version>1.2.47</version>
+				<version>${fastjson.version}</version>
 			</dependency>
 
 			<dependency>
diff --git a/web/src/main/java/com/simon/common/aspect/ButtonAuthorityAspect.java b/web/src/main/java/com/simon/common/aspect/ButtonAuthorityAspect.java
index 6ef204986385d1de49a8064a788a3f0d4e96abdc..3195425896d9803db8e1671dcbb9a96da698209c 100644
--- a/web/src/main/java/com/simon/common/aspect/ButtonAuthorityAspect.java
+++ b/web/src/main/java/com/simon/common/aspect/ButtonAuthorityAspect.java
@@ -38,7 +38,8 @@ public class ButtonAuthorityAspect {
         for(Object object : pjp.getArgs()){
             if(object instanceof Model){
                 Model model = (Model) object;
-                List<ButtonAuthorityDto> buttonAuthorityDtoList = sideMenuService.findButtonAuthorityDtoByEntityName("NewsInfo");
+                String simpleClassName = pjp.getTarget().getClass().getSimpleName();
+                List<ButtonAuthorityDto> buttonAuthorityDtoList = sideMenuService.findButtonAuthorityDtoByEntityName(simpleClassName.substring(0, simpleClassName.indexOf("Controller")));
                 if (null != buttonAuthorityDtoList && buttonAuthorityDtoList.size() > 0){
                     buttonAuthorityDtoList.forEach(item -> model.addAttribute(item.getRemark(), item.getAuthority()));
                 }
diff --git a/web/src/main/java/com/simon/controller/NewsInfoController.java b/web/src/main/java/com/simon/controller/NewsInfoController.java
index 3749932fdb9020ce5ce0cc85140ddca714a1a6e6..8b66c1a0ab740a684eb5199d161fc5883bdb7031 100644
--- a/web/src/main/java/com/simon/controller/NewsInfoController.java
+++ b/web/src/main/java/com/simon/controller/NewsInfoController.java
@@ -83,7 +83,7 @@ public class NewsInfoController extends BaseController{
     }
 
     @ApiOperation(value = "新增")
-    @PostMapping
+    @PostMapping("add")
     @ResponseBody
     public ResultMsg add(@RequestBody NewsInfo body, Authentication authentication){
         Object principal = authentication.getPrincipal();
@@ -99,7 +99,7 @@ public class NewsInfoController extends BaseController{
     }
 
     @ApiOperation(value = "修改")
-    @PatchMapping
+    @PatchMapping("edit")
     @ResponseBody
     public ResultMsg update(@RequestBody NewsInfo body, Authentication authentication){
         Object principal = authentication.getPrincipal();
diff --git a/web/src/main/java/com/simon/controller/OauthUserController.java b/web/src/main/java/com/simon/controller/OauthUserController.java
index 6361e8f777f6b6cd160fd2e96f9262b795ccc437..df13733adf3880c64b42e5135a54ee483fb700b4 100644
--- a/web/src/main/java/com/simon/controller/OauthUserController.java
+++ b/web/src/main/java/com/simon/controller/OauthUserController.java
@@ -1,90 +1,127 @@
 package com.simon.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageInfo;
 import com.simon.common.controller.BaseController;
 import com.simon.common.domain.EasyUIDataGridResult;
 import com.simon.common.domain.ResultMsg;
 import com.simon.common.domain.UserEntity;
 import com.simon.common.utils.BeanUtils;
-import com.simon.dto.StatisticDto;
 import com.simon.model.OauthUser;
+import com.simon.service.DictTypeService;
 import com.simon.service.OauthUserService;
-import com.simon.service.SmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.MessageSource;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.security.PermitAll;
-import java.util.HashMap;
-import java.util.List;
+import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * @author simon
- * @date 2016/8/21
- */
+* 用户表
+*
+* @author SimonSun
+* @date 2019-01-22
+**/
 @Slf4j
-@Api(description = "用户信息")
+@Api(description = "用户表")
 @Controller
 @RequestMapping("/api/oauthUsers")
-public class OauthUserController extends BaseController {
-    @Autowired
-    private MessageSource messageSource;
+public class OauthUserController extends BaseController{
 
     @Autowired
     private OauthUserService oauthUserService;
 
     @Autowired
-    @Qualifier(value = "yzxSmsServiceImpl")
-    private SmsService smsService;
+    private DictTypeService dictTypeService;
+
+    @ApiIgnore
+    @ApiOperation(value = "列表页面")
+    @GetMapping("list")
+    public String list(Model model){
+        model.addAttribute("sexTypeList", dictTypeService.getTypeByGroupCode("sex_type"));
+        model.addAttribute("loginTypeList", dictTypeService.getTypeByGroupCode("login_type"));
+        model.addAttribute("loginStatusList", dictTypeService.getTypeByGroupCode("login_status"));
+        model.addAttribute("enabledStatusList", dictTypeService.getTypeByGroupCode("enabled_status"));
+        return "easyui/oauthUser/list";
+    }
+
+    @ApiIgnore
+    @ApiOperation(value = "新增页面")
+    @GetMapping("add")
+    public String add(){
+        return "easyui/oauthUser/add";
+    }
 
-    PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(11);
+    @ApiIgnore
+    @ApiOperation(value = "编辑页面")
+    @GetMapping("edit")
+    public String edit(@RequestParam Long id, Model model){
+        model.addAttribute("oauthUser", oauthUserService.findById(id));
+        return "easyui/oauthUser/edit";
+    }
 
     @ApiIgnore
-    @ApiOperation(value = "easyui列表")
-    @GetMapping(value = "easyui/list")
+    @ApiOperation(value = "列表数据")
+    @GetMapping("data")
     @ResponseBody
-    public EasyUIDataGridResult<OauthUser> getEasyUiList(
-            @ApiParam(value = "用户名(昵称)") @RequestParam(required = false) String username,
-            @ApiParam(value = "手机号") @RequestParam(required = false) String phone,
-            @ApiParam(value = "邮箱") @RequestParam(required = false) String email,
+    public EasyUIDataGridResult<OauthUser> data(
+            @ApiParam(value= "用户名")@RequestParam(required = false) String username,
+            @ApiParam(value= "有效")@RequestParam(required = false) Boolean enabled,
+            @ApiParam(value= "手机号")@RequestParam(required = false) String phone,
+            @ApiParam(value= "邮箱")@RequestParam(required = false) String email,
+            @ApiParam(value= "性别")@RequestParam(required = false) Boolean sex,
             @ApiParam(value = "页码", defaultValue = "1", required = true) @RequestParam Integer pageNo,
             @ApiParam(value = "每页条数", defaultValue = "10", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "排序")@RequestParam(required = false, defaultValue = "") String orderBy){
-        Map<String, Object> params = new HashMap<>(3);
+        Map<String, Object> params = new LinkedHashMap<>();
         params.put("username", username);
-        params.put("email", email);
+        params.put("enabled", enabled);
         params.put("phone", phone);
-        PageInfo<OauthUser> pageInfo = oauthUserService.getList(params, pageSize, (pageNo - 1) * pageSize, orderBy);
-        return new EasyUIDataGridResult<>(pageInfo.getTotal(), pageInfo.getList());
+        params.put("email", email);
+        params.put("sex", sex);
+        return new EasyUIDataGridResult<>(oauthUserService.getList(params, pageNo, pageSize, orderBy));
     }
 
-    @ApiIgnore
-    @GetMapping(params = "easyui-list")
-    public String easyUiList(){
-        return "easyui/oauth_user";
+    @ApiOperation(value = "新增")
+    @PostMapping("add")
+    @ResponseBody
+    public ResultMsg add(@RequestBody OauthUser body, Authentication authentication){
+        Object principal = authentication.getPrincipal();
+        UserEntity userEntity = null;
+        if(principal instanceof UserEntity){
+            userEntity = (UserEntity)principal;
+        }
+        body.setCreateDate(new Date());
+        body.setCreateBy(userEntity.getId());
+        oauthUserService.insertSelective(body);
+        return ResultMsg.success();
     }
 
-    @PostMapping(value = "")
+    @ApiOperation(value = "修改")
+    @PatchMapping("edit")
     @ResponseBody
-    public ResultMsg add(@RequestBody OauthUser body){
-        oauthUserService.save(body);
+    public ResultMsg update(@RequestBody OauthUser body, Authentication authentication){
+        Object principal = authentication.getPrincipal();
+        UserEntity userEntity = null;
+        if(principal instanceof UserEntity){
+            userEntity = (UserEntity)principal;
+        }
+        body.setUpdateDate(new Date());
+        body.setUpdateBy(userEntity.getId());
+        oauthUserService.updateByPrimaryKeySelective(body);
         return ResultMsg.success();
     }
 
+    @ApiOperation(value = "删除")
     @DeleteMapping("/ids/{ids}")
     @ResponseBody
     public ResultMsg delete(@PathVariable String ids){
@@ -92,13 +129,6 @@ public class OauthUserController extends BaseController {
         return ResultMsg.success();
     }
 
-    @PermitAll
-    @GetMapping("/statistics/sex")
-    @ResponseBody
-    public ResultMsg<List<StatisticDto>> sexRatio(){
-        return ResultMsg.success(oauthUserService.sexRatio());
-    }
-
     @ApiIgnore
     @PreAuthorize("isAuthenticated()")
     @ApiOperation(value = "个人中心")
@@ -117,9 +147,9 @@ public class OauthUserController extends BaseController {
     }
 
     @ApiOperation(value = "更新个人信息")
-    @PatchMapping
+    @PatchMapping("personalCenter/edit")
     @ResponseBody
-    public ResultMsg update(@RequestBody OauthUser oauthUser, Authentication authentication){
+    public ResultMsg updatePersonInfo(@RequestBody OauthUser oauthUser, Authentication authentication){
         oauthUserService.updateByPrimaryKeySelective(oauthUser);
 
 //        log.info("birth=" + new SimpleDateFormat("yyyy-MM-dd").format(oauthUser.getBirth()));
@@ -137,5 +167,4 @@ public class OauthUserController extends BaseController {
 
         return ResultMsg.success();
     }
-
-}
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/simon/controller/TableController.java b/web/src/main/java/com/simon/controller/TableController.java
index d0550bd1832e2ab32c0342bc6fb92cfb32ee2925..ea8f1f08073871ebd2426c0125aa99384169147a 100644
--- a/web/src/main/java/com/simon/controller/TableController.java
+++ b/web/src/main/java/com/simon/controller/TableController.java
@@ -117,7 +117,6 @@ public class TableController extends BaseController {
         model.addAttribute("entityName", entityName);
         try {
             EntityDataModel entityDataModel = DbUtil.getEntityModel(dataSource.getConnection(), tableName, CodeGenerator.BASE_PACKAGE, entityName);
-            List<Column> columns = entityDataModel.getColumns();
 
             //想隐藏显示的列
             List<String> hiddenColumns = new ArrayList<>();
@@ -133,7 +132,7 @@ public class TableController extends BaseController {
             denyInputColumns.add("updateDate");
             denyInputColumns.add("updateBy");
 
-            for(Column column : columns){
+            for(Column column : entityDataModel.getColumns()){
                 if(hiddenColumns.contains(column.getName())){
                     column.setHidden(true);
                 }
@@ -141,7 +140,10 @@ public class TableController extends BaseController {
                     column.setAllowInput(false);
                 }
             }
+
+            log.info(JSON.toJSONString(entityDataModel.getColumns()));
             model.addAttribute("tableEntity", entityDataModel);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/web/src/main/java/com/simon/mapper/OauthUserMapper.java b/web/src/main/java/com/simon/mapper/OauthUserMapper.java
index c0d1878b5f0456d85eb1396ddf96614b984328cb..faf3902e4281a7518c96b0d2ed54413c30b20184 100644
--- a/web/src/main/java/com/simon/mapper/OauthUserMapper.java
+++ b/web/src/main/java/com/simon/mapper/OauthUserMapper.java
@@ -3,7 +3,9 @@ package com.simon.mapper;
 import com.simon.common.mapper.MyMapper;
 import com.simon.dto.StatisticDto;
 import com.simon.model.OauthUser;
+import com.simon.provider.OauthUserProvider;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 import java.util.List;
 import java.util.Map;
@@ -15,5 +17,11 @@ public interface OauthUserMapper extends MyMapper<OauthUser> {
 
     List<StatisticDto> sexRatio();
 
-    List<OauthUser> getList(@Param("map") Map<String, Object> map);
+    /**
+     * 使用Map查询
+     * @param map 查询条件
+     * @return 结果列表
+     */
+    @SelectProvider(type = OauthUserProvider.class, method = "getList")
+    List<OauthUser> getList(Map<String, Object> map);
 }
\ No newline at end of file
diff --git a/web/src/main/java/com/simon/provider/OauthUserProvider.java b/web/src/main/java/com/simon/provider/OauthUserProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..41414d09d60cb5a5c3f16d684c559479f0018741
--- /dev/null
+++ b/web/src/main/java/com/simon/provider/OauthUserProvider.java
@@ -0,0 +1,45 @@
+package com.simon.provider;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.jdbc.SQL;
+
+import java.util.Map;
+
+/**
+* 用户表
+* @author SimonSun
+* @date 2019-01-22
+**/
+
+public class OauthUserProvider {
+    /**
+     * 构造SQL查询语句
+     * @param param 查询条件
+     * @return SQL字符串
+     */
+    public String getList(Map<String, Object> param) {
+        return new SQL() {
+            {
+                SELECT("tb1.*,tu1.username AS create_user,tu2.username AS update_user");
+                FROM("t_users tb1");
+                LEFT_OUTER_JOIN("t_users tu1 ON tb1.create_by = tu1.id");
+                LEFT_OUTER_JOIN("t_users tu2 ON tb1.update_by = tu2.id");
+                if (null != param.get("username") && StringUtils.isNotEmpty(String.valueOf(param.get("username")))) {
+                    WHERE("tb1.username=#{username}");
+                }
+                if (null != param.get("enabled")) {
+                    WHERE("tb1.enabled=#{enabled}");
+                }
+                if (null != param.get("phone") && StringUtils.isNotEmpty(String.valueOf(param.get("phone")))) {
+                    WHERE("tb1.phone=#{phone}");
+                }
+                if (null != param.get("email") && StringUtils.isNotEmpty(String.valueOf(param.get("email")))) {
+                    WHERE("tb1.email=#{email}");
+                }
+                if (null != param.get("sex")) {
+                    WHERE("tb1.sex=#{sex}");
+                }
+            }
+        }.toString();
+    }
+}
diff --git a/web/src/main/java/com/simon/service/OauthUserService.java b/web/src/main/java/com/simon/service/OauthUserService.java
index ce35df4c12355db3edf1b87cdc687fdc53f9cb92..e44dfb37419119c17528525be0eab9ed799514f6 100644
--- a/web/src/main/java/com/simon/service/OauthUserService.java
+++ b/web/src/main/java/com/simon/service/OauthUserService.java
@@ -1,13 +1,11 @@
 package com.simon.service;
 
-import com.github.pagehelper.PageInfo;
 import com.simon.common.domain.UserEntity;
 import com.simon.common.service.BasicService;
 import com.simon.dto.StatisticDto;
 import com.simon.model.OauthUser;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 用户
@@ -25,8 +23,6 @@ public interface OauthUserService extends BasicService<OauthUser, Long> {
 
     int updatePwdByOldPwd(String username, String oldPwd, String newPwd);
 
-    PageInfo<OauthUser> getList(Map<String, Object> params, Integer limit, Integer offset, String orderBy);
-
     List<StatisticDto> sexRatio();
 
     UserEntity findEntityByPhone(String phone);
diff --git a/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java b/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java
index 7e1dc9142fdd92b8838746fca5923184ba4d9b30..c88f48b105adcd47c8e02495b0787c61aa523d8e 100644
--- a/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java
+++ b/web/src/main/java/com/simon/service/impl/OauthUserServiceImpl.java
@@ -8,9 +8,9 @@ import com.simon.common.exception.CodeInvalidException;
 import com.simon.common.exception.PhoneRegisteredException;
 import com.simon.common.exception.UserExistsException;
 import com.simon.common.exception.UserNotValidException;
-import com.simon.common.utils.ValidUtil;
 import com.simon.common.utils.BeanUtils;
 import com.simon.common.utils.UsernameUtil;
+import com.simon.common.utils.ValidUtil;
 import com.simon.dto.StatisticDto;
 import com.simon.mapper.AuthorityMapper;
 import com.simon.mapper.OauthUserMapper;
@@ -296,15 +296,17 @@ public class OauthUserServiceImpl implements OauthUserService {
     }
 
     @Override
-    public PageInfo<OauthUser> getList(Map<String, Object> params, Integer limit, Integer offset, String orderBy) {
+    public PageInfo<OauthUser> getList(Map<String, Object> params, Integer pageNo, Integer pageSize, String orderBy) {
+        if (null == pageSize){
+            pageSize = AppConfig.DEFAULT_PAGE_SIZE;
+        }
         orderBy = orderBy.trim();
-        if (org.springframework.util.StringUtils.isEmpty(orderBy)){
-            PageHelper.startPage(offset/limit + 1, limit);
+        if (StringUtils.isEmpty(orderBy)){
+            PageHelper.startPage(pageNo, pageSize);
         }else{
-            PageHelper.startPage(offset/limit + 1, limit, orderBy);
+            PageHelper.startPage(pageNo, pageSize, orderBy);
         }
-
-        List<OauthUser> list = oauthUserMapper.findByMap(params);
+        List<OauthUser> list = oauthUserMapper.getList(params);
         return new PageInfo<>(list);
     }
 
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
index cb29d208a426e2d52253f0f42b3ea7d9ef684874..cbee9f01973a394ae1441e7dd1231bd2e7755bd3 100644
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -1,3 +1,5 @@
+
+
 security:
   basic:
     enabled: false
@@ -143,4 +145,10 @@ mybatis:
     map-underscore-to-camel-case: true
     # 二级缓存的总开关
     cache-enabled: false
-  mapper-locations: classpath:mapping/*.xml
\ No newline at end of file
+  mapper-locations: classpath:mapping/*.xml
+
+# 解决java.lang.IllegalArgumentException: Request header is too large
+server:
+  max-http-header-size: 1048576
+  tomcat:
+    max-http-post-size: 2097152
\ No newline at end of file
diff --git a/web/src/main/resources/templates/code/add.ftl b/web/src/main/resources/templates/code/add.ftl
index 5fa0c460ac6c7bc1ffa53cec48e7965d37591d17..b3a0dd1cef66fdf75252e7a61818078f1e9d72e9 100644
--- a/web/src/main/resources/templates/code/add.ftl
+++ b/web/src/main/resources/templates/code/add.ftl
@@ -6,6 +6,7 @@
     <#list columns as column>
         <#if column.name == "id" || column.name == "createDate" || column.name == "createBy" || column.name == "updateDate" || column.name == "updateBy" || column.name == "userId">
         <#else>
+            <#if (column.allowInput?string('yes', 'no'))=='yes'>
             <#switch column.easyuiType>
                 <#case "easyui-textbox">
         <div>
@@ -56,6 +57,7 @@
             <input class="easyui-textbox" id="add_${column.name}" name="${column.name}" data-options="label:'${column.comment}:', width:300, required:true">
         </div>
             </#switch>
+            </#if>
         </#if>
     </#list>
     <div style="text-align:center;padding:5px 0">
@@ -92,7 +94,7 @@
     function add() {
         doRequest({
             formId: '#form_add',
-            url: '/api/${entityName?uncap_first}s',
+            url: '/api/${entityName?uncap_first}s/add',
             type: 'POST',
             extraData: {
     <#list columns as column>
diff --git a/web/src/main/resources/templates/code/controllerWithPage.ftl b/web/src/main/resources/templates/code/controllerWithPage.ftl
index af1cd78a6b2f85c06e0c9ffcd347d170cf6a3780..3e2cc475330d5051756cf03c3b9bc6690fe0e561 100644
--- a/web/src/main/resources/templates/code/controllerWithPage.ftl
+++ b/web/src/main/resources/templates/code/controllerWithPage.ftl
@@ -118,7 +118,7 @@ public class ${entityName}Controller extends BaseController{
     }
 
     @ApiOperation(value = "新增")
-    @PostMapping
+    @PostMapping("add")
     @ResponseBody
     public ResultMsg add(@RequestBody ${entityName} body, Authentication authentication){
         Object principal = authentication.getPrincipal();
@@ -138,7 +138,7 @@ public class ${entityName}Controller extends BaseController{
     }
 
     @ApiOperation(value = "修改")
-    @PatchMapping
+    @PatchMapping("edit")
     @ResponseBody
     public ResultMsg update(@RequestBody ${entityName} body, Authentication authentication){
         Object principal = authentication.getPrincipal();
diff --git a/web/src/main/resources/templates/code/edit.ftl b/web/src/main/resources/templates/code/edit.ftl
index ec45837d6a56f67a8af475d2f3a8758ce2814d9f..1aa8e3e1d0719f396112d5d9afebe6f788958d7b 100644
--- a/web/src/main/resources/templates/code/edit.ftl
+++ b/web/src/main/resources/templates/code/edit.ftl
@@ -6,6 +6,7 @@
 <#list columns as column>
     <#if column.name == "createDate" || column.name == "createBy" || column.name == "updateDate" || column.name == "updateBy" || column.name == "userId">
     <#else>
+        <#if (column.allowInput?string('yes', 'no'))=='yes'>
         <#switch column.easyuiType>
             <#case "easyui-textbox">
                 <div>
@@ -56,6 +57,7 @@
                     <input class="easyui-textbox" id="edit_${column.name}" name="${column.name}" data-options="label:'${column.comment}:', width:300, required:true" th:value="${r'${' + entityName?uncap_first + "." + column.name + r'}'}">
                 </div>
         </#switch>
+        </#if>
     </#if>
 </#list>
     <div style="text-align:center;pediting:5px 0">
@@ -77,10 +79,10 @@
 <#list columns as column>
     <#switch column.easyuiType>
         <#case "image">
-            //初始化图片上传按钮
-            initFileUpload('#edit_${column.name}', '${column.name}');
-            //显示预览图片
-            imgPreview('#edit_${column.name}', '${column.name}', row.${column.name});
+        //初始化图片上传按钮
+        initFileUpload('#edit_${column.name}', '${column.name}');
+        //显示预览图片
+        imgPreview('#edit_${column.name}', '${column.name}', [[${r'${' + entityName?uncap_first + "." + column.name + r'}'}]]);
             <#break>
         <#case "rich_text">
         var ${column.name}Editor = UE.getEditor('edit_${column.name}_editor', {
@@ -91,6 +93,9 @@
             ${column.name}Editor.setContent([[${r'${' + entityName?uncap_first + "." + column.name + r'}'}]]);
         });
         <#break>
+        <#case "t:dict">
+        ${r'$(\'#edit_' + column.name + '\')'}.combobox('setValue', String([[${r'${' + entityName?uncap_first + "." + column.name + r'}'}]]));
+        <#break>
     </#switch>
 </#list>
     });
@@ -98,7 +103,7 @@
     function edit() {
         doRequest({
             formId: '#form_edit',
-            url: '/api/${entityName?uncap_first}s',
+            url: '/api/${entityName?uncap_first}s/edit',
             type: 'PATCH',
             extraData: {
     <#list columns as column>
diff --git a/web/src/main/resources/templates/code/list.ftl b/web/src/main/resources/templates/code/list.ftl
index 7e39f98a88edf958e06440555cce9f9d7c97ac9c..b8876642374117a45ff05c73fbbade95a84aee29 100644
--- a/web/src/main/resources/templates/code/list.ftl
+++ b/web/src/main/resources/templates/code/list.ftl
@@ -38,9 +38,9 @@
         <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="${r'#{reset}'}"></span></a>
     </div>
     <div class="datagrid-toolbar easyui-panel" style="padding:5px;">
-        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="${r'#{add}'}"></span></a>
-        <a href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="${r'#{edit}'}"></span></a>
-        <a href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="${r'#{delete}'}"></span></a>
+        <a th:if="${r'${#authorization.expression('+'\'hasAnyRole(\'\'__' + r'${add}' + '__\'\')\')}'}" href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="${r'#{add}'}"></span></a>
+        <a th:if="${r'${#authorization.expression('+'\'hasAnyRole(\'\'__' + r'${edit}' + '__\'\')\')}'}" href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="${r'#{edit}'}"></span></a>
+        <a th:if="${r'${#authorization.expression('+'\'hasAnyRole(\'\'__' + r'${delete}' + '__\'\')\')}'}" href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="${r'#{delete}'}"></span></a>
     </div>
 </div>
 <table id="tt">
@@ -179,7 +179,7 @@
     function format${dashedToCamel(column.extraInfo)?cap_first}(value, row) {
         let ${dashedToCamel(column.extraInfo)}List = [[${r'${' + dashedToCamel(column.extraInfo) + 'List}'}]];
         for(let i = 0; i < ${dashedToCamel(column.extraInfo)}List.length; i++){
-            if(value == ${dashedToCamel(column.extraInfo)}List[i].typeCode){
+            if(String(value) == String(${dashedToCamel(column.extraInfo)}List[i].typeCode)){
                 return ${dashedToCamel(column.extraInfo)}List[i].typeName;
             }
         }
diff --git a/web/src/main/resources/templates/easyui/code_generate.html b/web/src/main/resources/templates/easyui/code_generate.html
index 724f1dfcbf347fc013444495f99facbb1f154d95..55231f00962f42918e23cd575f579cb03d1645df 100644
--- a/web/src/main/resources/templates/easyui/code_generate.html
+++ b/web/src/main/resources/templates/easyui/code_generate.html
@@ -69,19 +69,19 @@
         <th data-options="width:100,sortable:true,align:'center',field:'allowSearch',
             editor:{
                 type:'checkbox',
-                options:{on:'true',off:'false'}
+                options:{on:'1',off:'0'}
             }
             ">是否支持搜索</th>
         <th data-options="width:100,sortable:true,align:'center',field:'hidden',
             editor:{
                 type:'checkbox',
-                options:{on:'true',off:'false'}
+                options:{on:'1',off:'0'}
             }
             ">是否隐藏</th>
         <th data-options="width:100,sortable:true,align:'center',field:'allowInput',
             editor:{
                 type:'checkbox',
-                options:{on:'true',off:'false'}
+                options:{on:'1',off:'0'}
             }
             ">是否允许输入</th>
     </tr>
@@ -161,6 +161,7 @@ $.extend($.fn.datagrid.methods, {
 
 $(function(){
     var data = [[${tableEntity.columns}]];
+    console.log(data);
     var dg = $('#tt').datagrid({
         data: data
     });
diff --git a/web/src/main/resources/templates/easyui/newsInfo/add.html b/web/src/main/resources/templates/easyui/newsInfo/add.html
index aac4b7cd0d54f82064a7373657296f923cd8f820..a87fe5887096a7cbe3e6635193836dd04d00abfc 100644
--- a/web/src/main/resources/templates/easyui/newsInfo/add.html
+++ b/web/src/main/resources/templates/easyui/newsInfo/add.html
@@ -54,7 +54,7 @@
     function add() {
         doRequest({
             formId: '#form_add',
-            url: '/api/newsInfos',
+            url: '/api/newsInfos/add',
             type: 'POST',
             extraData: {
                 content: UE.getEditor('add_content_editor').getContent(),
diff --git a/web/src/main/resources/templates/easyui/newsInfo/edit.html b/web/src/main/resources/templates/easyui/newsInfo/edit.html
index 4554ccd3b9a23ddce6998fa20ed7c5ab38635875..6d947a2365ad99a91e02dbeb293c3574b55a10fd 100644
--- a/web/src/main/resources/templates/easyui/newsInfo/edit.html
+++ b/web/src/main/resources/templates/easyui/newsInfo/edit.html
@@ -57,13 +57,13 @@
             //初始化图片上传按钮
             initFileUpload('#edit_imageUrl', 'imageUrl');
             //显示预览图片
-            imgPreview('#edit_imageUrl', 'imageUrl', row.imageUrl);
+            imgPreview('#edit_imageUrl', 'imageUrl', [[${newsInfo.imageUrl}]]);
     });
 
     function edit() {
         doRequest({
             formId: '#form_edit',
-            url: '/api/newsInfos',
+            url: '/api/newsInfos/edit',
             type: 'PATCH',
             extraData: {
                 content: UE.getEditor('edit_content_editor').getContent(),
diff --git a/web/src/main/resources/templates/easyui/newsInfo/list.html b/web/src/main/resources/templates/easyui/newsInfo/list.html
index e7d6854f6b61624369c10e9754fc3221b3764456..399f1646ff62c2343485bcc479bbb6cdd677fe34 100644
--- a/web/src/main/resources/templates/easyui/newsInfo/list.html
+++ b/web/src/main/resources/templates/easyui/newsInfo/list.html
@@ -11,9 +11,9 @@
         <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="#{reset}"></span></a>
     </div>
     <div class="datagrid-toolbar easyui-panel" style="padding:5px;">
-        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="#{add}"></span></a>
-        <a href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="#{edit}"></span></a>
-        <a href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="#{delete}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${add}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="#{add}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${edit}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="#{edit}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${delete}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="#{delete}"></span></a>
     </div>
 </div>
 <table id="tt">
diff --git a/web/src/main/resources/templates/easyui/oauthUser/add.html b/web/src/main/resources/templates/easyui/oauthUser/add.html
new file mode 100644
index 0000000000000000000000000000000000000000..3ac35e7454712b2abe1055bd0ba5605b8fdc78ec
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/oauthUser/add.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('用户表', 'easyui,upload,ueditor')">
+<body>
+<form id="form_add">
+        <div>
+            <input class="easyui-textbox" id="add_username" name="username" data-options="label:'用户名:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_password" name="password" data-options="label:'密码:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_enabled" name="enabled" data-options="label:'有效:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_areaCode" name="areaCode" data-options="label:'手机区号:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_phone" name="phone" data-options="label:'手机号:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_email" name="email" data-options="label:'邮箱:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_address" name="address" data-options="label:'地址:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-numberbox" id="add_age" name="age" data-options="label:'年龄:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-datetimebox" id="add_birth" name="birth" data-options="label:'生日:', width:300, required:true">
+        </div>
+        <div>
+            <label style="width: 80px;float:left;">头像:</label>
+            <div th:replace="components/toolbar :: file-upload (idVal='add_headPhoto',nameVal='headPhoto')" style="width:94%;float:left;"></div>
+            <div style="clear:both"></div>
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_personBrief" name="personBrief" data-options="label:'个人简介:', width:300, required:true">
+        </div>
+        <div>
+            <t:dict class="easyui-combobox" id="add_sex" name="sex" dict-name="sex_type" data-options="label:'性别:', width:300, multiple:false"></t:dict>
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_visitCard" name="visitCard" data-options="label:'邀请码:', width:300, required:true">
+        </div>
+        <div>
+            <t:dict class="easyui-combobox" id="add_loginType" name="loginType" dict-name="login_type" data-options="label:'登录方式:', width:300, multiple:false"></t:dict>
+        </div>
+        <div>
+            <t:dict class="easyui-combobox" id="add_loginStatus" name="loginStatus" dict-name="login_status" data-options="label:'登录状态:', width:300, multiple:false"></t:dict>
+        </div>
+        <div>
+            <input class="easyui-datetimebox" id="add_loginDate" name="loginDate" data-options="label:'登录时间:', width:300, required:true">
+        </div>
+    <div style="text-align:center;padding:5px 0">
+        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="add()" th:text="#{ok}"></a>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="clearForm()" th:text="#{cancel}"></a>
+    </div>
+</form>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true" style="width:480px;height:480px;padding:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false" style="width:720px;height:480px;padding:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui,upload,ueditor')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        //实例化编辑器
+        //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
+        /*var addEditor = UE.getEditor('add_editor', {
+            autoHeight: false
+        });*/
+        //初始化图片上传按钮
+        initFileUpload('#add_headPhoto', 'headPhoto');
+    });
+
+    function add() {
+        doRequest({
+            formId: '#form_add',
+            url: '/api/oauthUsers/add',
+            type: 'POST',
+            extraData: {
+            }
+        });
+    }
+
+    function clearForm() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/oauthUser/edit.html b/web/src/main/resources/templates/easyui/oauthUser/edit.html
new file mode 100644
index 0000000000000000000000000000000000000000..1c3bb62162c1368f7a568ed2ef5b400453f344e1
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/oauthUser/edit.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('用户表', 'easyui,upload,ueditor')">
+<body>
+<form id="form_edit">
+                <div>
+                    <input class="easyui-numberbox" id="edit_id" name="id" data-options="label:'id:', width:300, required:true" th:value="${oauthUser.id}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_username" name="username" data-options="label:'用户名:', width:300, required:true" th:value="${oauthUser.username}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_password" name="password" data-options="label:'密码:', width:300, required:true" th:value="${oauthUser.password}">
+                </div>
+                <!--<div>
+                    <input class="easyui-textbox" id="edit_enabled" name="enabled" data-options="label:'有效:', width:300, required:true" th:value="${oauthUser.enabled}">
+                </div>-->
+                <div>
+                    <t:dict class="easyui-combobox" id="edit_enabled" name="enabled" dict-name="enabled_status" data-options="label:'有效:', width:300, required:true"></t:dict>
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_areaCode" name="areaCode" data-options="label:'手机区号:', width:300, required:true" th:value="${oauthUser.areaCode}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_phone" name="phone" data-options="label:'手机号:', width:300, required:true" th:value="${oauthUser.phone}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_email" name="email" data-options="label:'邮箱:', width:300, required:true" th:value="${oauthUser.email}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_address" name="address" data-options="label:'地址:', width:300, required:true" th:value="${oauthUser.address}">
+                </div>
+                <div>
+                    <input class="easyui-numberbox" id="edit_age" name="age" data-options="label:'年龄:', width:300, required:true" th:value="${oauthUser.age}">
+                </div>
+                <div>
+                    <input class="easyui-datetimebox" id="edit_birth" name="birth" data-options="label:'生日:', width:300, required:true" th:value="${oauthUser.birth}">
+                </div>
+                <div>
+                    <label style="width: 80px;float:left;">头像:</label>
+                    <div th:replace="components/toolbar :: file-upload (idVal='edit_headPhoto',nameVal='headPhoto')" style="width:94%;float:left;"></div>
+                    <div style="clear:both"></div>
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_personBrief" name="personBrief" data-options="label:'个人简介:', width:300, required:true" th:value="${oauthUser.personBrief}">
+                </div>
+                <div>
+                    <t:dict class="easyui-combobox" id="edit_sex" name="sex" dict-name="sex_type" data-options="label:'性别:', width:300, multiple:false"></t:dict>
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_visitCard" name="visitCard" data-options="label:'邀请码:', width:300, required:true" th:value="${oauthUser.visitCard}">
+                </div>
+                <div>
+                    <t:dict class="easyui-combobox" id="edit_loginType" name="loginType" dict-name="login_type" data-options="label:'登录方式:', width:300, multiple:false"></t:dict>
+                </div>
+                <div>
+                    <t:dict class="easyui-combobox" id="edit_loginStatus" name="loginStatus" dict-name="login_status" data-options="label:'登录状态:', width:300, multiple:false"></t:dict>
+                </div>
+                <div>
+                    <input class="easyui-datetimebox" id="edit_loginDate" name="loginDate" data-options="label:'登录时间:', width:300, required:true" th:value="${oauthUser.loginDate}">
+                </div>
+    <div style="text-align:center;pediting:5px 0">
+        <a href="javascript:void(0)" class="button button-rounded button-small button-primary" onclick="edit()" th:text="#{ok}"></a>
+        <a href="javascript:void(0)" class="button button-rounded button-small" onclick="clearForm()" th:text="#{cancel}"></a>
+    </div>
+</form>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true" style="width:480px;height:480px;pediting:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false" style="width:720px;height:480px;pediting:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui,upload,ueditor')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        //实例化编辑器
+        //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
+        /*var editEditor = UE.getEditor('edit_editor', {
+            autoHeight: false
+        });*/
+        //初始化图片上传按钮
+        initFileUpload('#edit_headPhoto', 'headPhoto');
+        //显示预览图片
+        imgPreview('#edit_headPhoto', 'headPhoto', [[${oauthUser.headPhoto}]]);
+
+        $('#edit_enabled').combobox('setValue', String([[${oauthUser.enabled}]]));
+        $('#edit_sex').combobox('setValue', String([[${oauthUser.sex}]]));
+        $('#edit_loginType').combobox('setValue', String([[${oauthUser.loginType}]]));
+        $('#edit_loginStatus').combobox('setValue', String([[${oauthUser.loginStatus}]]));
+    });
+
+    function edit() {
+        doRequest({
+            formId: '#form_edit',
+            url: '/api/oauthUsers/edit',
+            type: 'PATCH',
+            extraData: {
+            }
+    });
+    }
+
+    function clearForm() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/oauthUser/list.html b/web/src/main/resources/templates/easyui/oauthUser/list.html
new file mode 100644
index 0000000000000000000000000000000000000000..13f78c5ea28e815d68fa6ffac43416ccf8c72195
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/oauthUser/list.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('用户表', 'easyui')">
+<body>
+<div id="tb">
+    <div class="datagrid-toolbar" style="padding-bottom: 6px">
+        用户名: <input class="easyui-textbox" style="width: 160px" id="search_username" name="username" data-options="required:false">
+        有效: <t:dict class="easyui-combobox" id="search_enabled" name="enabled" dict-name="enabled_status" style="width:160px" allow-empty="true"></t:dict>
+        手机号: <input class="easyui-textbox" style="width: 160px" id="search_phone" name="phone" data-options="required:false">
+        邮箱: <input class="easyui-textbox" style="width: 160px" id="search_email" name="email" data-options="required:false">
+        性别: <t:dict class="easyui-combobox" id="search_sex" name="sex" dict-name="sex_type"  style="width:160px" allow-empty="true"></t:dict>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="doSearch()"><i class="fa fa-search" aria-hidden="true"></i> <span th:text="#{search}"></span></a>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="#{reset}"></span></a>
+    </div>
+    <div class="datagrid-toolbar easyui-panel" style="padding:5px;">
+        <a th:if="${#authorization.expression('hasAnyRole(''__${add}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="#{add}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${edit}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="#{edit}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${delete}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="#{delete}"></span></a>
+    </div>
+</div>
+<table id="tt">
+    <thead>
+    <tr>
+        <th data-options="field:'ck',checkbox:true"></th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'id'">id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'createBy'">创建人id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'createDate'">创建时间</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'updateBy'">更新人id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'updateDate'">更新时间</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'username'">用户名</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'password'">密码</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'enabled',formatter:formatEnabled">有效</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'areaCode'">手机区号</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'phone'">手机号</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'email'">邮箱</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'address'">地址</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'age'">年龄</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'birth'">生日</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'headPhoto',formatter:formatPic">头像</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'personBrief'">个人简介</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'sex',formatter:formatSexType">性别</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'visitCard'">邀请码</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'loginType',formatter:formatLoginType">登录方式</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'loginStatus',formatter:formatLoginStatus">登录状态</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'loginDate'">登录时间</th>
+    </tr>
+    </thead>
+</table>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true,border:false" style="width:480px;height:480px;padding:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false,border:false" style="width:720px;height:480px;padding:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        $('#tt').datagrid({
+            url: '/api/oauthUsers/data',
+            method: 'get',
+            idField: 'id',
+            nowrap: false,
+            animate: true,
+            rownumbers: true,
+            fit: true,
+            toolbar: '#tb',
+            pagination: true,
+            singleSelect: false,
+            selectOnCheck: true,
+            checkOnSelect: true
+        });
+    });
+
+    function doSearch() {
+        $('#tt').datagrid('load', {
+            username: $('#search_username').val(),
+            enabled: $('#search_enabled').val(),
+            phone: $('#search_phone').val(),
+            email: $('#search_email').val(),
+            sex: $('#search_sex').val(),
+        });
+    }
+
+    function doSearchReset() {
+        $('#search_username').textbox('setValue', '');
+        $('#search_enabled').textbox('setValue', '');
+        $('#search_phone').textbox('setValue', '');
+        $('#search_email').textbox('setValue', '');
+        $('#search_sex').combobox('select', '');
+        doSearch();
+    }
+
+    function doAdd() {
+        parent.showWindow({
+            title:'录入',
+            content:'/api/oauthUsers/add'
+        });
+    }
+
+    function doEdit() {
+        //获取选中的第一行数据
+        //var row = $('#tt').datagrid('getSelected');
+        //获取选中的所有行数据
+        let rows = $('#tt').datagrid('getSelections');
+        if(rows.length == 1){
+            let row = rows[0];
+            parent.showWindow({
+                title:'编辑',
+                content:'/api/oauthUsers/edit?id=' + row.id
+            });
+        }else{
+            $.messager.alert('提示信息','请选择一条数据！','error');
+        }
+    }
+
+    function doDelete() {
+        deleteRequest('/api/oauthUsers/ids/');
+    }
+
+    function formatIcon(val, row){
+        return '<i class="' + val + '" aria-hidden="true"></i>';
+    }
+
+    function formatPic(val, row) {
+        if(!val){
+            return '';
+        }
+        return '<img class="image-thumb" src="' + [[${filePathPrefix}]] + val + '" alt="头像" width="30px">';
+    }
+
+    function formatContent(val, row) {
+        console.log(row.id.toString());
+        return "<a href=\"javascript:void(0)\" class=\"button button-rounded button-small button-primary\" onclick='showContent(\""  + row.id.toString() + "\")'>查看</a>";
+    }
+
+    function showContent(val) {
+        let rows = $('#tt').datagrid('getSelections');
+        $('#window_content').html(rows[0].content);
+        $('#window_content').window('open');
+    }
+
+    function formatSexType(value, row) {
+        let sexTypeList = [[${sexTypeList}]];
+        for(let i = 0; i < sexTypeList.length; i++){
+            if(String(value) == String(sexTypeList[i].typeCode)){
+                return sexTypeList[i].typeName;
+            }
+        }
+        return value;
+    }
+    function formatLoginType(value, row) {
+        let loginTypeList = [[${loginTypeList}]];
+        for(let i = 0; i < loginTypeList.length; i++){
+            if(value == loginTypeList[i].typeCode){
+                return loginTypeList[i].typeName;
+            }
+        }
+        return value;
+    }
+    function formatLoginStatus(value, row) {
+        let loginStatusList = [[${loginStatusList}]];
+        for(let i = 0; i < loginStatusList.length; i++){
+            if(value == loginStatusList[i].typeCode){
+                return loginStatusList[i].typeName;
+            }
+        }
+        return value;
+    }
+
+    function formatEnabled(value, row) {
+        let enabledStatusList = [[${enabledStatusList}]];
+        for(let i = 0; i < enabledStatusList.length; i++){
+            if(String(value) == String(enabledStatusList[i].typeCode)){
+                return enabledStatusList[i].typeName;
+            }
+        }
+        return value;
+    }
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/personal_center.html b/web/src/main/resources/templates/easyui/personal_center.html
index 4ef81c1e654b7e6c2c3efeb298e4a0df740b4e94..c9ddd4d4044b7364ccde567a7c579bcdfedca182 100644
--- a/web/src/main/resources/templates/easyui/personal_center.html
+++ b/web/src/main/resources/templates/easyui/personal_center.html
@@ -160,7 +160,7 @@
     function edit() {
         doRequest({
             formId: '#form_edit',
-            url: '/api/oauthUsers',
+            url: '/api/oauthUsers/personalCenter/edit',
             type: 'PATCH'
         });
     }