diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index 2afc4193f..682f3f93d 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi
- 2.2.0
+ 2.3.0
jar
ruoyi
@@ -25,7 +25,7 @@
1.8
1.3.2
1.2.5
- 1.2.68
+ 1.2.70
1.1.14
2.5
1.3.3
@@ -63,26 +63,26 @@
org.springframework.boot
spring-boot-starter-web
-
+
org.springframework.boot
spring-boot-devtools
true
-
+
org.springframework.boot
spring-boot-starter-security
-
+
org.springframework.boot
spring-boot-starter-data-redis
-
+
org.apache.commons
@@ -102,7 +102,7 @@
mybatis-spring-boot-starter
${mybatis.spring.boot.starter.version}
-
+
com.github.pagehelper
@@ -112,10 +112,10 @@
- com.alibaba
- druid-spring-boot-starter
- ${druid.version}
-
+ com.alibaba
+ druid-spring-boot-starter
+ ${druid.version}
+
@@ -129,14 +129,14 @@
commons-io
${commons.io.version}
-
+
commons-fileupload
commons-fileupload
${commons.fileupload.version}
-
+
eu.bitwalker
@@ -156,68 +156,68 @@
org.springframework
spring-context-support
-
-
+
+
io.jsonwebtoken
jjwt
${jwt.version}
-
+
io.springfox
springfox-swagger2
${swagger.version}
-
- io.swagger
- swagger-annotations
-
-
- io.swagger
- swagger-models
-
+
+ io.swagger
+ swagger-annotations
+
+
+ io.swagger
+ swagger-models
+
-
+
-
- io.swagger
- swagger-annotations
- 1.5.21
-
-
-
- io.swagger
- swagger-models
- 1.5.21
-
-
+
+ io.swagger
+ swagger-annotations
+ 1.5.21
+
+
+
+ io.swagger
+ swagger-models
+ 1.5.21
+
+
io.springfox
springfox-swagger-ui
${swagger.version}
-
-
+
+
com.github.oshi
oshi-core
${oshi.version}
-
+
net.java.dev.jna
jna
-
+
net.java.dev.jna
jna-platform
-
+
org.apache.poi
@@ -231,8 +231,8 @@
velocity
${velocity.version}
-
-
+
+
org.quartz-scheduler
quartz
diff --git a/ruoyi/src/main/java/com/ruoyi/project/axsystem/controller/UserBaseController.java b/ruoyi/src/main/java/com/ruoyi/project/axsystem/controller/UserBaseController.java
index a32f08f23..c959cf2d7 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/axsystem/controller/UserBaseController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/axsystem/controller/UserBaseController.java
@@ -98,14 +98,10 @@ public class UserBaseController extends BaseController
@PreAuthorize("@ss.hasPermi('axsystem:base:remove')")
@Log(title = "用户基础信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{uids}")
- public AjaxResult remove(@PathVariable Long[] uids)
+ public AjaxResult remove(@PathVariable String[] uids)
{
return toAjax(userBaseService.deleteUserBaseByIds(uids));
}
- public static void main(String[] args) {
- String s = UUID.randomUUID().toString();
- System.out.println(s);
- }
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/axsystem/mapper/UserBaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/axsystem/mapper/UserBaseMapper.java
index 62b66ff7a..b64597c34 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/axsystem/mapper/UserBaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/axsystem/mapper/UserBaseMapper.java
@@ -49,7 +49,7 @@ public interface UserBaseMapper
* @param uid 用户基础信息ID
* @return 结果
*/
- public int deleteUserBaseById(Long uid);
+ public int deleteUserBaseById(String uid);
/**
* 批量删除用户基础信息
@@ -57,5 +57,5 @@ public interface UserBaseMapper
* @param uids 需要删除的数据ID
* @return 结果
*/
- public int deleteUserBaseByIds(Long[] uids);
+ public int deleteUserBaseByIds(String[] uids);
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/IUserBaseService.java b/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/IUserBaseService.java
index f29c00b9e..a8b6f8b8b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/IUserBaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/IUserBaseService.java
@@ -49,7 +49,7 @@ public interface IUserBaseService
* @param uids 需要删除的用户基础信息ID
* @return 结果
*/
- public int deleteUserBaseByIds(Long[] uids);
+ public int deleteUserBaseByIds(String[] uids);
/**
* 删除用户基础信息信息
@@ -57,5 +57,5 @@ public interface IUserBaseService
* @param uid 用户基础信息ID
* @return 结果
*/
- public int deleteUserBaseById(Long uid);
+ public int deleteUserBaseById(String uid);
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/impl/UserBaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/impl/UserBaseServiceImpl.java
index 3e2a6562f..22a71a4f2 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/impl/UserBaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/axsystem/service/impl/UserBaseServiceImpl.java
@@ -81,7 +81,7 @@ public class UserBaseServiceImpl implements IUserBaseService
* @return 结果
*/
@Override
- public int deleteUserBaseByIds(Long[] uids)
+ public int deleteUserBaseByIds(String[] uids)
{
return userBaseMapper.deleteUserBaseByIds(uids);
}
@@ -93,7 +93,7 @@ public class UserBaseServiceImpl implements IUserBaseService
* @return 结果
*/
@Override
- public int deleteUserBaseById(Long uid)
+ public int deleteUserBaseById(String uid)
{
return userBaseMapper.deleteUserBaseById(uid);
}