machaoyi 1 год назад
Родитель
Сommit
14a1b39825
3 измененных файлов с 20 добавлено и 12 удалено
  1. 15 8
      .idea/workspace.xml
  2. 3 3
      application/pom.xml
  3. 2 1
      core/pom.xml

+ 15 - 8
.idea/workspace.xml

@@ -4,12 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、设置考勤打卡信息接口">
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、pom版本整理">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/JwtUtil.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/work/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/work/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/core/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -156,7 +154,8 @@
       <workItem from="1705278479826" duration="43131000" />
       <workItem from="1705392945258" duration="4784000" />
       <workItem from="1705397771531" duration="2808000" />
-      <workItem from="1705452083011" duration="7584000" />
+      <workItem from="1705452083011" duration="7637000" />
+      <workItem from="1705460446625" duration="3516000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -462,7 +461,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705458383023</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="1、pom版本整理">
+      <option name="closed" value="true" />
+      <created>1705460362540</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1705460362540</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -511,7 +518,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="1、登录接口包修改" />
     <MESSAGE value="1、用户角色表" />
     <MESSAGE value="1、用户绑定角色&#10;2、用户接口包修改" />
     <MESSAGE value="1、获取用户当前角色" />
@@ -536,7 +542,8 @@
     <MESSAGE value="1、新增打卡上班模块" />
     <MESSAGE value="1、打卡接口新增经纬度字段" />
     <MESSAGE value="1、设置考勤打卡信息接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、设置考勤打卡信息接口" />
+    <MESSAGE value="1、pom版本整理" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、pom版本整理" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 3 - 3
application/pom.xml

@@ -3,7 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.ctsi</groupId>
     <artifactId>application</artifactId>
     <version>2.5.15</version>
     <packaging>jar</packaging>
@@ -72,8 +71,9 @@
             <artifactId>sa-token-redis</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.mindrot</groupId>

+ 2 - 1
core/pom.xml

@@ -24,11 +24,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.5.20</version>
+            <version>1.6.8</version>
             <scope>compile</scope>
         </dependency>
         <dependency>