From faf2ef5db9dec1d06bc1ecfef3af1a2522c03d65 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 19 Aug 2024 20:16:49 +0800
Subject: [PATCH] 1、修改redis配置 2、修改代码生成器 3、修改base依赖
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 16
dyh-service/dyh-cust/src/main/resources/config/application-test.yml | 20 +
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRoledata.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CRoleBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRoledataMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CRoleWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/config/RedisConfig.java | 60 +++++
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CRole.java | 2
dyh-service/dyh-utils/src/test/java/cn/huge/module/DyhUtilsApplicationTest.java | 1
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRolefun.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoledataService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRoledataMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaAccountMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaUser.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java | 2
dyh-service/dyh-base/pom.xml | 8
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUseroleWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaAccount.java | 2
dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java | 15 +
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaUserWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRolefunMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUsepostWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtDeptWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRolefunBO.java | 2
dyh-service/dyh-base/src/main/resources/template/wechatController.ftl | 22 -
dyh-service/dyh-cust/src/main/resources/config/application-prod.yml | 20 +
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaUserBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRoledataBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaAccountBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRolefunMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtPostService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaUserMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaAccountWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaUserService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRolefunWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CRoleService.java | 2
dyh-service/dyh-cust/src/main/resources/config/application-dev.yml | 20 +
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java | 2
dyh-gateway/src/main/resources/config/application.yml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUserBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CRoleMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtPostWebController.java | 16
dyh-service/dyh-utils/src/main/java/cn/huge/module/DyhUtilsApplication.java | 2
dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java | 1
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRolefunService.java | 2
dyh-service/dyh-base/src/main/resources/template/webController.ftl | 14
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUser.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaUserMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java | 2
dyh-service/dyh-cust/src/main/resources/logback-spring.xml | 18 -
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaAccountService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/service/RedisService.java | 63 +++++
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/utils/JwtUtils.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml | 2
dyh-gateway/src/main/java/cn/huge/gateway/filter/AuthFilter.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java | 16
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java | 2
dyh-service/dyh-cust/src/main/resources/config/application.yml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CRoleMapper.java | 2
dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/controller/RedisTestController.java | 76 ++++++
90 files changed, 432 insertions(+), 228 deletions(-)
diff --git a/dyh-gateway/src/main/java/cn/huge/gateway/filter/AuthFilter.java b/dyh-gateway/src/main/java/cn/huge/gateway/filter/AuthFilter.java
index bf68357..c1481a9 100644
--- a/dyh-gateway/src/main/java/cn/huge/gateway/filter/AuthFilter.java
+++ b/dyh-gateway/src/main/java/cn/huge/gateway/filter/AuthFilter.java
@@ -46,7 +46,7 @@
@Value("${jwt.secret-key}")
private String secretKey;
- @Value("${jwt.iss_user.format}")
+ @Value("${jwt.iss-user}")
private String issUser;
@Value("${jwt.auth-skip-urls}")
diff --git a/dyh-gateway/src/main/resources/config/application.yml b/dyh-gateway/src/main/resources/config/application.yml
index da3a3a2..f264411 100644
--- a/dyh-gateway/src/main/resources/config/application.yml
+++ b/dyh-gateway/src/main/resources/config/application.yml
@@ -40,7 +40,7 @@
#jwt生成密钥
secret-key: asdfghjkl
#用户
- iss_user: HUGEINFO
+ iss-user: HUGEINFO
refresh-token-key:
#refreshToken 存储key
format: JWT_REFRESH_TOKEN::%s
diff --git a/dyh-service/dyh-base/pom.xml b/dyh-service/dyh-base/pom.xml
index 0794a4f..08a6fdf 100644
--- a/dyh-service/dyh-base/pom.xml
+++ b/dyh-service/dyh-base/pom.xml
@@ -87,10 +87,10 @@
<artifactId>spring-test</artifactId>
<version>RELEASE</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
+ </dependency> -->
<!-- spring end -->
<!-- reactor-core -->
@@ -135,10 +135,6 @@
<!-- mockito测试类 end -->
<!-- Redis -->
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
diff --git a/dyh-service/dyh-base/src/main/resources/template/webController.ftl b/dyh-service/dyh-base/src/main/resources/template/webController.ftl
index 7f6fcbe..4e65301 100644
--- a/dyh-service/dyh-base/src/main/resources/template/webController.ftl
+++ b/dyh-service/dyh-base/src/main/resources/template/webController.ftl
@@ -120,19 +120,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web<#if classPath??>/${classPath}</#if>/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web<#if classPath??>/${classPath}</#if>/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-base/src/main/resources/template/wechatController.ftl b/dyh-service/dyh-base/src/main/resources/template/wechatController.ftl
index f19b6ae..3d94759 100644
--- a/dyh-service/dyh-base/src/main/resources/template/wechatController.ftl
+++ b/dyh-service/dyh-base/src/main/resources/template/wechatController.ftl
@@ -71,7 +71,7 @@
/**
* 条件查询多个
- * @url {ctx}/api/v1<#if classPath??>/${classPath}</#if>/listQuery
+ * @url {ctx}/api/wechat<#if classPath??>/${classPath}</#if>/listQuery
* @return Object
*/
@GetMapping("/listQuery")
@@ -87,7 +87,7 @@
/**
* 条件分页查询
- * @url {ctx}/api/v1<#if classPath??>/${classPath}</#if>/pageQuery
+ * @url {ctx}/api/wechat<#if classPath??>/${classPath}</#if>/pageQuery
* @param page 页码
* @param size 每页数量
* @return Object
@@ -107,7 +107,7 @@
/**
* 根据编号查询单个
- * @url {ctx}/api/v1<#if classPath??>/${classPath}</#if>/getById
+ * @url {ctx}/api/wechat<#if classPath??>/${classPath}</#if>/getById
* @param id 主键编号
* @return Object
*/
@@ -121,19 +121,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/v1<#if classPath??>/${classPath}</#if>/removeByIds
+ * 根据主键单个
+ * @url {ctx}/api/wechat<#if classPath??>/${classPath}</#if>/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/removeByIds")
- public Object removeByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.deleteById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
@@ -142,7 +138,7 @@
/**
* 新增或更新对象
- * @url {ctx}/api/v1<#if classPath??>/${classPath}</#if>/save${className}
+ * @url {ctx}/api/wechat<#if classPath??>/${classPath}</#if>/save${className}
* @param ${lowerName} 实体对象
* @return Object
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/config/RedisConfig.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/config/RedisConfig.java
new file mode 100644
index 0000000..42c1b1f
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/config/RedisConfig.java
@@ -0,0 +1,60 @@
+package cn.huge.module.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+
+/**
+ * @title: MybatisPlus配置
+ * @description: MybatisPlus配置
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+@Configuration
+public class RedisConfig {
+
+ @Bean
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ // 创建RedisTemplate实例
+ RedisTemplate<String, Object> template = new RedisTemplate<>();
+ // 设置链接工厂
+ template.setConnectionFactory(factory);
+ // 设置key和value的序列化方式
+ template.setKeySerializer(new StringRedisSerializer());
+ // 使用GenericJackson2JsonRedisSerializer，反序列化时保留泛型信息
+ template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+ template.afterPropertiesSet();
+
+ return template;
+ }
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CRoleWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CRoleWebController.java
index 6fd803c..f2e3026 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CRoleWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CRoleWebController.java
@@ -23,7 +23,7 @@
* @description: 角色表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -146,19 +146,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/cRole/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/cRole/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java
index 3fd3cbb..2cc0014 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java
@@ -23,7 +23,7 @@
* @description: 客户角色数据权限表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -141,19 +141,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctRoledata/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctRoledata/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRolefunWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRolefunWebController.java
index a62dbc0..e4c5cf1 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRolefunWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRolefunWebController.java
@@ -23,7 +23,7 @@
* @description: 客户角色菜单权限表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -166,19 +166,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctRolefun/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctRolefun/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CRoleMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CRoleMapper.java
index 03d8d0d..715752b 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CRoleMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CRoleMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRoledataMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRoledataMapper.java
index 9441058..8a06b6c 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRoledataMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRoledataMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:33:41
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRolefunMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRolefunMapper.java
index c96a95e..d01a2a6 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRolefunMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/CtRolefunMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:33:41
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CRoleMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CRoleMapper.xml
index 3ebc546..282ae9b 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CRoleMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CRoleMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctrole.dao.mapper.CRoleMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRoledataMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRoledataMapper.xml
index 9d96934..6a6f248 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRoledataMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRoledataMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:33:41
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctrole.dao.mapper.CtRoledataMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRolefunMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRolefunMapper.xml
index 8419dd9..d889579 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRolefunMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/dao/mapper/xml/CtRolefunMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:33:41
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctrole.dao.mapper.CtRolefunMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CRoleBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CRoleBO.java
index a18a1d6..41b5921 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CRoleBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CRoleBO.java
@@ -7,7 +7,7 @@
* @description: 角色表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctrole.domain.po.CRole
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRoledataBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRoledataBO.java
index d1a33eb..9397111 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRoledataBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRoledataBO.java
@@ -7,7 +7,7 @@
* @description: 客户角色数据权限表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctrole.domain.po.CtRoledata
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRolefunBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRolefunBO.java
index 34df6a6..7def60d 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRolefunBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/bo/CtRolefunBO.java
@@ -7,7 +7,7 @@
* @description: 客户角色菜单权限表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctrole.domain.po.CtRolefun
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CRole.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CRole.java
index 7e692a0..9d56009 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CRole.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CRole.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_role")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRoledata.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRoledata.java
index 6304f1f..3ed25da 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRoledata.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRoledata.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_roledata")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRolefun.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRolefun.java
index a8918df..7039438 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRolefun.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/domain/po/CtRolefun.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_rolefun")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CRoleService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CRoleService.java
index 7275c97..1b803dc 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CRoleService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CRoleService.java
@@ -26,7 +26,7 @@
* @Description 角色表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoledataService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoledataService.java
index f8ed414..745c030 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoledataService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRoledataService.java
@@ -26,7 +26,7 @@
* @Description 客户角色数据权限表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:33:41
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRolefunService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRolefunService.java
index 23fcfbe..1445e02 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRolefunService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/service/CtRolefunService.java
@@ -26,7 +26,7 @@
* @Description 客户角色菜单权限表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:33:41
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
index e483601..026c70d 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
@@ -23,7 +23,7 @@
* @description: 客户用户账号表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:56
+ * @time: 2024-08-19 20:04:18
* @version: 1.0.0
*/
@Slf4j
@@ -166,19 +166,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctAccount/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctAccount/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtDeptWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtDeptWebController.java
index 0eb6025..4509b7a 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtDeptWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtDeptWebController.java
@@ -23,7 +23,7 @@
* @description: 客户部门表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -171,19 +171,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctDept/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctDept/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtPostWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtPostWebController.java
index 4b3e29c..b283aa8 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtPostWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtPostWebController.java
@@ -23,7 +23,7 @@
* @description: 客户岗位表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -141,19 +141,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctPost/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctPost/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
index edab2ef..e0f5e63 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
@@ -23,7 +23,7 @@
* @description: 客户组织信息表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -276,19 +276,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctUnit/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctUnit/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUsepostWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUsepostWebController.java
index e78c010..d06fbe0 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUsepostWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUsepostWebController.java
@@ -23,7 +23,7 @@
* @description: 客户用户配岗表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -151,19 +151,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctUsepost/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctUsepost/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
index 730926e..af5df0f 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
@@ -23,7 +23,7 @@
* @description: 客户用户表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -291,19 +291,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctUser/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctUser/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUseroleWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUseroleWebController.java
index 73f2116..e948ce7 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUseroleWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUseroleWebController.java
@@ -23,7 +23,7 @@
* @description: 客户用户角色表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -141,19 +141,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/ctUserole/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/ctUserole/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java
index 1019962..d2e30b5 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtAccountMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:56
+* @time: 2024-08-19 20:04:18
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java
index 35a2080..dae0302 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtDeptMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java
index 4863e8b..6e54e5e 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtPostMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java
index c4fa7f2..3aeb9db 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java
index aec5ddb..2b10981 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUsepostMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java
index 798702a..19609a5 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java
index 0c95871..e78833b 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUseroleMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:30:57
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml
index 2fddfe3..ddfcde4 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtAccountMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:56
+ * @time:2024-08-19 20:04:18
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtAccountMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml
index 1ec581e..9f98b41 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtDeptMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtDeptMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
index 51a77f8..f1f09cf 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtPostMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtPostMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
index e1b5686..b35c0eb 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUnitMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
index a99b8da..2c66342 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUsepostMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUsepostMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
index 5bf0e64..eb876ed 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUserMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
index 162c278..d54d5dd 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUseroleMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:30:57
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUseroleMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java
index f2d56f6..5291f62 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtAccountBO.java
@@ -7,7 +7,7 @@
* @description: 客户用户账号表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:56
+ * @time: 2024-08-19 20:04:18
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtAccount
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java
index 69e6bbd..2d4f509 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtDeptBO.java
@@ -7,7 +7,7 @@
* @description: 客户部门表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtDept
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java
index d31a085..8cd54a9 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtPostBO.java
@@ -7,7 +7,7 @@
* @description: 客户岗位表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtPost
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java
index 8bb7a20..9e9de90 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUnitBO.java
@@ -7,7 +7,7 @@
* @description: 客户组织信息表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtUnit
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java
index bd948db..edcd04f 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUsepostBO.java
@@ -7,7 +7,7 @@
* @description: 客户用户配岗表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtUsepost
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUserBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUserBO.java
index 16ed3d4..9609b66 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUserBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUserBO.java
@@ -7,7 +7,7 @@
* @description: 客户用户表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtUser
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java
index 087b0af..0522f96 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/bo/CtUseroleBO.java
@@ -7,7 +7,7 @@
* @description: 客户用户角色表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.ctuser.domain.po.CtUserole
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
index 7498e64..ccec82a 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtAccount.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:56
+ * @time: 2024-08-19 20:04:18
* @version 1.0.0
*/
@TableName(value = "dyh_ct_account")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java
index 03479f5..37b788a 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtDept.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_dept")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java
index 14a8c7d..10c9983 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtPost.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_post")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
index cec1cd6..09a7f4e 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_unit")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java
index b166e46..22e216a 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUsepost.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_usepost")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUser.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUser.java
index 842f047..dde2324 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUser.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUser.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_user")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java
index 9888ef9..a82a021 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUserole.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_ct_userole")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index edd2bca..33acd57 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -26,7 +26,7 @@
* @Description 客户用户账号表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:56
+ * @Time 2024-08-19 20:04:18
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java
index 5cf56f2..4ebcf35 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtDeptService.java
@@ -26,7 +26,7 @@
* @Description 客户部门表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtPostService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtPostService.java
index 9dacb4a..6724868 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtPostService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtPostService.java
@@ -26,7 +26,7 @@
* @Description 客户岗位表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index 6b35afe..16e00d5 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -26,7 +26,7 @@
* @Description 客户组织信息表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java
index 157f6f8..f43c4da 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUsepostService.java
@@ -26,7 +26,7 @@
* @Description 客户用户配岗表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
index 7bbf41b..ad899a4 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -26,7 +26,7 @@
* @Description 客户用户表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java
index 9abd698..a801d7e 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUseroleService.java
@@ -26,7 +26,7 @@
* @Description 客户用户角色表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:30:57
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaAccountWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaAccountWebController.java
index c469ead..4878af5 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaAccountWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaAccountWebController.java
@@ -23,7 +23,7 @@
* @description: 公众用户账号表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -166,19 +166,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/paAccount/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/paAccount/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaUserWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaUserWebController.java
index ead1690..a546ab3 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaUserWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/web/PaUserWebController.java
@@ -23,7 +23,7 @@
* @description: 公众用户表接口api
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:42
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -241,19 +241,15 @@
}
/**
- * 根据主键单个/批量删除
- * @url {ctx}/api/web/paUser/deleteByIds
+ * 根据主键单个
+ * @url {ctx}/api/web/paUser/deleteById
* @param ids 主键编号
* @return Object
*/
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
+ @GetMapping("/deleteById")
+ public Object deleteById(@RequestParam(value = "id") String id) {
try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
+ service.removeById(id);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaAccountMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaAccountMapper.java
index 98abde9..c3b8429 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaAccountMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaAccountMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:33:41
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaUserMapper.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaUserMapper.java
index 0521120..9112217 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaUserMapper.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/PaUserMapper.java
@@ -14,7 +14,7 @@
* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
* @company: hugeinfo
* @author: liyj
-* @time: 2024-08-17 15:33:42
+* @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@Repository
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
index cb2ce84..e62f550 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:33:41
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.pauser.dao.mapper.PaAccountMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaUserMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaUserMapper.xml
index d8ed868..3606821 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaUserMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaUserMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-08-17 15:33:42
+ * @time:2024-08-19 20:04:19
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.pauser.dao.mapper.PaUserMapper">
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaAccountBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaAccountBO.java
index 6c813e8..908b8b3 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaAccountBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaAccountBO.java
@@ -7,7 +7,7 @@
* @description: 公众用户账号表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.pauser.domain.po.PaAccount
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaUserBO.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaUserBO.java
index 78397f5..388ab88 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaUserBO.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/bo/PaUserBO.java
@@ -7,7 +7,7 @@
* @description: 公众用户表业务扩展类
* @company: hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:42
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
* @see cn.huge.module.pauser.domain.po.PaUser
*/
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaAccount.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaAccount.java
index ef4b9a5..ed2d399 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaAccount.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaAccount.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:41
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_pa_account")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaUser.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaUser.java
index 5034981..101bd8a 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaUser.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/domain/po/PaUser.java
@@ -13,7 +13,7 @@
* @description: PO中的属性与数据表是一一对应关系，如需根据业务处理不同，请使用BO对象。
* @company:hugeinfo
* @author: liyj
- * @time: 2024-08-17 15:33:42
+ * @time: 2024-08-19 20:04:19
* @version 1.0.0
*/
@TableName(value = "dyh_pa_user")
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaAccountService.java
index 5b0940e..0713b9b 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaAccountService.java
@@ -26,7 +26,7 @@
* @Description 公众用户账号表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:33:41
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaUserService.java
index 054c1b8..303f7b4 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/service/PaUserService.java
@@ -26,7 +26,7 @@
* @Description 公众用户表业务逻辑处理
* @company hugeinfo
* @author liyj
- * @Time 2024-08-17 15:33:42
+ * @Time 2024-08-19 20:04:19
* @version 1.0.0
*/
@Slf4j
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/controller/RedisTestController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/controller/RedisTestController.java
new file mode 100644
index 0000000..4738ec0
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/controller/RedisTestController.java
@@ -0,0 +1,76 @@
+package cn.huge.module.redis.controller;
+
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.redis.service.RedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @title: redis简单测试
+ * @description: redis简单测试
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2024-08-17 15:30:56
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/redis/test")
+public class RedisTestController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private RedisService redisService;
+
+
+ /**
+ * 作用: 处理 HTTP POST 请求，设置 Redis 中的键值对
+ * 1.使用 @RequestParam 注解获取请求参数 key 和 value
+ * 2.调用 redisService.setValue(key, value) 方法，将 key 和 value 存储到 Redis 中
+ * 3.返回一个简单的字符串 "Value set" 作为响应
+ * 请求：POST /set?key=myKey&value=myValue
+ * 响应："Value set"
+ * RequestParam注解：获取请求参数: 它从 HTTP 请求中获取参数，并将这些参数绑定到控制器方法的参数上
+ * @url {ctx}/api/redis/test/setValue?key=&value=
+ */
+ @GetMapping("/setValue")
+ public Object setValue(@RequestParam String key, @RequestParam String value) {
+ redisService.setValue(key, value);
+ return ReturnSucUtils.getRepInfo("Value：(" + key + ") set");
+ }
+
+ /**
+ * 作用: 处理 HTTP GET 请求，从 Redis 中获取指定键的值
+ * 1.使用 @RequestParam 注解获取请求参数 key
+ * 2.调用 redisService.getValue(key) 方法，从 Redis 中获取 key 对应的值，并将结果转换为 String 类型
+ * 3.返回获取的值
+ * 请求：GET /get?key=myKey
+ * 响应："myValue" // Redis 中对应 `myKey` 的值
+ * @url {ctx}/api/redis/test/getValue?key=
+ */
+ @GetMapping("/getValue")
+ public Object getValue(@RequestParam String key) {
+ return ReturnSucUtils.getRepInfo(redisService.getValue(key));
+ }
+
+ /**
+ * 作用: 处理 HTTP POST 请求，删除 Redis 中指定键的值
+ * 1.使用 @RequestParam 注解获取请求参数 key
+ * 2.调用 redisService.deleteValue(key) 方法，从 Redis 中删除 key 对应的键值对
+ * 3.返回一个简单的字符串 "Value deleted" 作为响应
+ * 请求：POST /delete?key=myKey
+ * 响应："Value deleted"
+ * @url {ctx}/api/redis/test/deleteValue?key=
+ */
+ @GetMapping("/deleteValue")
+ public Object deleteValue(@RequestParam String key) {
+ redisService.deleteValue(key);
+ return ReturnSucUtils.getRepInfo("Value：(" + key + ") deleted");
+ }
+
+}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/service/RedisService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/service/RedisService.java
new file mode 100644
index 0000000..ec0f9de
--- /dev/null
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/redis/service/RedisService.java
@@ -0,0 +1,63 @@
+package cn.huge.module.redis.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @title: RedisService 类提供了简化的 Redis 操作接口，用于在 Spring Boot 应用中存储和检索数据。
+ * @Description 它通过 RedisTemplate 与 Redis 服务器交互，执行常见的操作如设置值、获取值、设置值带过期时间和删除值。
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2024-08-17 15:30:56
+ * @version 1.0.0
+ */
+@Service
+public class RedisService {
+
+ /**
+ * 意义: RedisTemplate 是 Spring 提供的一个 Redis 操作模板，它抽象了 Redis 的底层访问，
+ * 使开发者可以用 Java 对象操作 Redis。使用 @Autowired 注解，Spring 自动将配置好的 RedisTemplate 注入到 RedisService 类中
+ */
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ /**
+ * 向 Redis 中存储一个键值对
+ * @param key
+ * @param value
+ */
+ public void setValue(String key, Object value) {
+ redisTemplate.opsForValue().set(key, value);
+ }
+
+ /**
+ * 从 Redis 中获取指定键的值
+ * @param key
+ * @return
+ */
+ public Object getValue(String key) {
+ return redisTemplate.opsForValue().get(key);
+ }
+
+ /**
+ * 向 Redis 中存储一个键值对，并设置其过期时间
+ * @param key
+ * @param value
+ * @param timeout
+ * @param timeUnit
+ */
+ public void setValueWithExpiry(String key, Object value, long timeout, TimeUnit timeUnit) {
+ redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+ }
+
+ /**
+ * 从 Redis 中删除指定键及其对应的值
+ * @param key
+ */
+ public void deleteValue(String key) {
+ redisTemplate.delete(key);
+ }
+}
\ No newline at end of file
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/utils/JwtUtils.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/utils/JwtUtils.java
index 341efd9..555a694 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/utils/JwtUtils.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/utils/JwtUtils.java
@@ -53,7 +53,7 @@
secretKey = secret_Key;
}
- @Value("${jwt.iss_user}")
+ @Value("${jwt.iss-user}")
public void setIssUser(String iss_user) {
issUser = iss_user;
}
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application-dev.yml b/dyh-service/dyh-cust/src/main/resources/config/application-dev.yml
index 6970d61..3694c88 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application-dev.yml
@@ -24,6 +24,26 @@
# 用来验证数据库连接是否仍然可用的 SQL 查询
validation-query: SELECT 1
+ # redis配置，单机版，集群另外配置
+ redis:
+ host: 183.2.142.21
+ port: 9017
+ password: hugeinfo123
+ # 使用的Redis数据库索引（默认为0）
+ database: 0
+ # 连接超时时间（毫秒）
+ timeout: 5000
+ lettuce:
+ pool:
+ # 连接池最大连接数
+ max-active: 100
+ # 连接池最大阻塞等待时间
+ max-wait: 100000
+ # 连接池中的最大空闲连接
+ max-idle: 10
+ # 连接池中的最小空闲连接
+ min-idle: 0
+
#注册中心配置
eureka:
client:
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application-prod.yml b/dyh-service/dyh-cust/src/main/resources/config/application-prod.yml
index 6970d61..3694c88 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application-prod.yml
@@ -24,6 +24,26 @@
# 用来验证数据库连接是否仍然可用的 SQL 查询
validation-query: SELECT 1
+ # redis配置，单机版，集群另外配置
+ redis:
+ host: 183.2.142.21
+ port: 9017
+ password: hugeinfo123
+ # 使用的Redis数据库索引（默认为0）
+ database: 0
+ # 连接超时时间（毫秒）
+ timeout: 5000
+ lettuce:
+ pool:
+ # 连接池最大连接数
+ max-active: 100
+ # 连接池最大阻塞等待时间
+ max-wait: 100000
+ # 连接池中的最大空闲连接
+ max-idle: 10
+ # 连接池中的最小空闲连接
+ min-idle: 0
+
#注册中心配置
eureka:
client:
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application-test.yml b/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
index 6970d61..3694c88 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
@@ -24,6 +24,26 @@
# 用来验证数据库连接是否仍然可用的 SQL 查询
validation-query: SELECT 1
+ # redis配置，单机版，集群另外配置
+ redis:
+ host: 183.2.142.21
+ port: 9017
+ password: hugeinfo123
+ # 使用的Redis数据库索引（默认为0）
+ database: 0
+ # 连接超时时间（毫秒）
+ timeout: 5000
+ lettuce:
+ pool:
+ # 连接池最大连接数
+ max-active: 100
+ # 连接池最大阻塞等待时间
+ max-wait: 100000
+ # 连接池中的最大空闲连接
+ max-idle: 10
+ # 连接池中的最小空闲连接
+ min-idle: 0
+
#注册中心配置
eureka:
client:
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application.yml b/dyh-service/dyh-cust/src/main/resources/config/application.yml
index 1193643..7726b04 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application.yml
@@ -66,7 +66,7 @@
#jwt生成密钥
secret-key: asdfghjkl
#用户
- iss_user: HUGEINFO
+ iss-user: HUGEINFO
refresh-token-key:
#refreshToken 存储key
format: JWT_REFRESH_TOKEN::%s
diff --git a/dyh-service/dyh-cust/src/main/resources/logback-spring.xml b/dyh-service/dyh-cust/src/main/resources/logback-spring.xml
index f2f3177..778aff7 100644
--- a/dyh-service/dyh-cust/src/main/resources/logback-spring.xml
+++ b/dyh-service/dyh-cust/src/main/resources/logback-spring.xml
@@ -22,21 +22,15 @@
</encoder>
</appender>
- <!-- 为 MyBatis 设置 DEBUG 级别的日志 -->
- <logger name="org.apache.ibatis" level="DEBUG"/>
- <!-- 输出 SQL 语句和参数 -->
- <logger name="org.apache.ibatis.binding" level="DEBUG"/>
- <!-- 输出 SQL 语句执行情况 -->
- <logger name="org.apache.ibatis.session" level="DEBUG"/>
- <!-- 输出 SQL 语句执行结果 -->
- <logger name="org.apache.ibatis.executor" level="DEBUG"/>
- <!-- 输出 SQL 语句 -->
- <logger name="org.apache.ibatis.scripting" level="DEBUG"/>
-
<!-- 设置根日志级别，如果日志级别低于设置的级别，则该日志不会被记录。如果日志级别高于设置的级别，那么这条日志将会被记录 -->
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="CONSOLE" />
</root>
+
+ <!-- 为 MyBatis 设置 DEBUG 级别的日志 -->
+ <logger name="com.baomidou.mybatisplus" level="INFO" additivity="false">
+ <appender-ref ref="CONSOLE" />
+ </logger>
</springProfile>
<!-- 测试环境+生产环境，多个使用逗号隔开 -->
diff --git a/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java b/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
index 5e60de0..961834a 100644
--- a/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
+++ b/dyh-service/dyh-cust/src/test/java/cn/huge/module/BuildCodeServiceTest.java
@@ -21,7 +21,20 @@
@Test
public void buildAllTest() {
- service.buildAll(basePackage, packageName, className, tableSchema, tableName, author, version);
+ service.buildAll(basePackage, "ctuser", "CtAccount", tableSchema, "dyh_ct_account", author, version);
+ service.buildAll(basePackage, "ctuser", "CtDept", tableSchema, "dyh_ct_dept", author, version);
+ service.buildAll(basePackage, "ctuser", "CtPost", tableSchema, "dyh_ct_post", author, version);
+ service.buildAll(basePackage, "ctuser", "CtUnit", tableSchema, "dyh_ct_unit", author, version);
+ service.buildAll(basePackage, "ctuser", "CtUsepost", tableSchema, "dyh_ct_usepost", author, version);
+ service.buildAll(basePackage, "ctuser", "CtUser", tableSchema, "dyh_ct_user", author, version);
+ service.buildAll(basePackage, "ctuser", "CtUserole", tableSchema, "dyh_ct_userole", author, version);
+
+ service.buildAll(basePackage, "ctrole", "CRole", tableSchema, "dyh_ct_role", author, version);
+ service.buildAll(basePackage, "ctrole", "CtRoledata", tableSchema, "dyh_ct_roledata", author, version);
+ service.buildAll(basePackage, "ctrole", "CtRolefun", tableSchema, "dyh_ct_rolefun", author, version);
+
+ service.buildAll(basePackage, "pauser", "PaAccount", tableSchema, "dyh_pa_account", author, version);
+ service.buildAll(basePackage, "pauser", "PaUser", tableSchema, "dyh_pa_user", author, version);
}
diff --git a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java b/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
index 9961f7d..ea13d11 100644
--- a/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
+++ b/dyh-service/dyh-sync/src/test/java/cn/huge/module/DyhSyncApplicationTest.java
@@ -1,6 +1,5 @@
package cn.huge.module;
-import cn.huge.base.common.utils.JwtUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/DyhUtilsApplication.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/DyhUtilsApplication.java
index 8c5620a..5a16bf4 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/DyhUtilsApplication.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/DyhUtilsApplication.java
@@ -16,6 +16,6 @@
public class DyhUtilsApplication {
public static void main(String[] args) {
- SpringApplication.run(DyhSyncApplication.class, args);
+ SpringApplication.run(DyhUtilsApplication.class, args);
}
}
diff --git a/dyh-service/dyh-utils/src/test/java/cn/huge/module/DyhUtilsApplicationTest.java b/dyh-service/dyh-utils/src/test/java/cn/huge/module/DyhUtilsApplicationTest.java
index 7176214..36d46cb 100644
--- a/dyh-service/dyh-utils/src/test/java/cn/huge/module/DyhUtilsApplicationTest.java
+++ b/dyh-service/dyh-utils/src/test/java/cn/huge/module/DyhUtilsApplicationTest.java
@@ -1,6 +1,5 @@
package cn.huge.module;
-import cn.huge.base.common.utils.JwtUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
--
Gitblit v1.8.0