亨利王 1 år sedan
förälder
incheckning
066845a898
2 ändrade filer med 19 tillägg och 58 borttagningar
  1. 14 56
      .idea/workspace.xml
  2. 5 2
      README.md

+ 14 - 56
.idea/workspace.xml

@@ -4,60 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="web维修厂管理接口">
-      <change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/screenshots/2.26-01.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/screenshots/2.26-02.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/screenshots/api.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/config/MyApplicationRunner.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/config/MybatisRedisCache.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/ApproveAccountController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/DepartmentController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/DictController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/EmployeeController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/MenuController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/RoleController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/RoleMenuController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/dto/EmployeeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/dto/LoginDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/dto/UpdatePassDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Department.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Dict.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Employee.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Menu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Role.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/RoleMenu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/DepartmentMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/DictMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/EmployeeMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/MenuMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/RoleMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/RoleMenuMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IDepartmentService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IDictService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IEmployeeService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IMenuService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IRoleMenuService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IRoleService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/DepartmentServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/DictServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/EmployeeServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/MenuServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/RoleMenuServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/RoleServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/utils/Constants.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/utils/SpringUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/utils/TokenUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/DepartmentMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/DictMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/EmployeeMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/MenuMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/RoleMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/RoleMenuMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="用户角色权限更新">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/utils/Result.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/utils/Result.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -233,7 +182,7 @@
       <workItem from="1707438514767" duration="8903000" />
       <workItem from="1708670527995" duration="3132000" />
       <workItem from="1708916949997" duration="4355000" />
-      <workItem from="1708925853376" duration="14224000" />
+      <workItem from="1708925853376" duration="14538000" />
     </task>
     <task id="LOCAL-00001" summary="管理员登录">
       <option name="closed" value="true" />
@@ -305,7 +254,15 @@
       <option name="project" value="LOCAL" />
       <updated>1708671884585</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="用户角色权限更新">
+      <option name="closed" value="true" />
+      <created>1708942701821</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1708942701821</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -318,6 +275,7 @@
     <MESSAGE value="管理员电话和邮箱修改" />
     <MESSAGE value="web品牌管理接口" />
     <MESSAGE value="web维修厂管理接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="web维修厂管理接口" />
+    <MESSAGE value="用户角色权限更新" />
+    <option name="LAST_COMMIT_MESSAGE" value="用户角色权限更新" />
   </component>
 </project>

+ 5 - 2
README.md

@@ -1,5 +1,5 @@
 
-**2.26日修改说明:**
+## 2.26日更新说明
 
 完成了用户角色权限模块对开发,初步测试,现在正确登陆后,可以看到用户权限关联的菜单,
 随后的API调用会自行带上token。
@@ -18,7 +18,7 @@
 
 ![01](./screenshots/2.26-02.png)
 
-- 绿色新增文件,对现有代码没有任何影响
+- 绿色新增文件,对现有代码没有任何影响
 - pom.xml增加了如下依赖:
     ```xml
     <dependency>
@@ -33,11 +33,14 @@
         <version>3.18.3</version>
     </dependency>
     ```
+  
   <mybatis-plus.version>3.4.1</mybatis-plus.version>版本改为了
   <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
 
 - 修改了Result.java,为了与前端返回方式一致,用版本对比可以看到差异
+
 - config目录下 新增了 MyApplicationRunner.java 用以每次重启后清除Redis缓存
+
 - config目录下 新增了 MybatisRedisCache.java
 
 ### 用户角色权限模块相关数据库表也做了整理