Browse Source

1、修改pom一些version,不用release

machaoyi 1 year ago
parent
commit
320844860a
2 changed files with 18 additions and 12 deletions
  1. 14 8
      .idea/workspace.xml
  2. 4 4
      application/pom.xml

+ 14 - 8
.idea/workspace.xml

@@ -4,11 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、用户修改生日类型为时间戳">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、根据部门获取用户列表&#10;2、修改base64包">
+      <change beforePath="$PROJECT_DIR$/application/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -125,7 +122,7 @@
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
       <workItem from="1704932572547" duration="31458000" />
-      <workItem from="1705278479826" duration="21289000" />
+      <workItem from="1705278479826" duration="21733000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -319,7 +316,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705305557096</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="1、根据部门获取用户列表&#10;2、修改base64包">
+      <option name="closed" value="true" />
+      <created>1705309483595</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1705309483595</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -361,7 +366,8 @@
     <MESSAGE value="1、登录接口新增验证码、记住我字段" />
     <MESSAGE value="1、用户登录获取信息接口" />
     <MESSAGE value="1、用户修改生日类型为时间戳" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、用户修改生日类型为时间戳" />
+    <MESSAGE value="1、根据部门获取用户列表&#10;2、修改base64包" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、根据部门获取用户列表&#10;2、修改base64包" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 4 - 4
application/pom.xml

@@ -31,12 +31,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>RELEASE</version>
+            <version>3.5.5</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>RELEASE</version>
+            <version>1.4.9</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.24</version>
+            <version>5.8.25</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis</artifactId>
-            <version>RELEASE</version>
+            <version>1.37.0</version>
         </dependency>
         <!-- 提供Redis连接池 -->
         <dependency>