Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

JOY---2020年6月3日 20:30:06

Browse Source
This commit is contained in:
JOY 2020-06-03 20:30:22 +08:00
parent 0a60660686
commit 9e2cd5e1f1
5 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
ruoyi/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<packaging>jar</packaging>
<name>ruoyi</name>
@ -25,7 +25,7 @@
<java.version>1.8</java.version>
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
<pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
<fastjson.version>1.2.68</fastjson.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.1.14</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
@ -63,26 +63,26 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- spring security 安全认证 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>org.apache.commons</groupId>
@ -102,7 +102,7 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis.spring.boot.starter.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
@ -112,10 +112,10 @@
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!--常用工具类 -->
<dependency>
@ -129,14 +129,14 @@
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
@ -156,68 +156,68 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<!--Token生成与解析-->
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- 获取系统信息 -->
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
@ -231,8 +231,8 @@
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- 定时任务 -->
<!-- 定时任务 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>

6
ruoyi/src/main/java/com/ruoyi/project/axsystem/controller/UserBaseController.java
View File

@ -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);
}
}

4
ruoyi/src/main/java/com/ruoyi/project/axsystem/mapper/UserBaseMapper.java
View File

@ -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);
}

4
ruoyi/src/main/java/com/ruoyi/project/axsystem/service/IUserBaseService.java
View File

@ -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);
}

4
ruoyi/src/main/java/com/ruoyi/project/axsystem/service/impl/UserBaseServiceImpl.java
View File

@ -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);
}