From 7ad0dc8a7f6e65ea1f3ae843a4abc18779360cee Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 11 Mar 2025 15:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E4=BD=BF=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 52 ----- nursing-unit-base-core/pom.xml | 2 +- .../org/jeecg/config/shiro/ShiroConfig.java | 2 +- nursing-unit-config/pom.xml | 22 +++ .../cloud/controller/DictTypeController.java | 25 +++ nursing-unit-demo/pom.xml | 3 +- .../nu-system-api/nu-system-local-api/pom.xml | 2 +- nursing-unit-system/nu-system-api/pom.xml | 4 +- nursing-unit-system/nu-system-biz/pom.xml | 5 +- nursing-unit-system/nu-system-start/pom.xml | 13 +- .../java/org/jeecg/NUSystemApplication.java | 3 +- .../src/main/resources/application-dev.yml | 1 + .../src/test/java/org/jeecg/TestMain.java | 47 ----- .../modules/message/test/SendMessageTest.java | 139 -------------- .../modules/system/test/InsertDemoTest.java | 86 --------- .../jeecg/modules/system/test/SampleTest.java | 65 ------- .../system/test/SysTableWhiteCheckTest.java | 89 --------- .../modules/system/test/SysUserTest.java | 177 ------------------ .../org/jeecg/smallTools/TestSqlHandle.java | 39 ---- .../java/org/jeecg/smallTools/TestStr.java | 76 -------- nursing-unit-system/pom.xml | 2 +- pom.xml | 21 +-- 22 files changed, 76 insertions(+), 799 deletions(-) delete mode 100644 docker-compose.yml create mode 100644 nursing-unit-config/pom.xml create mode 100644 nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/TestMain.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java delete mode 100644 nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestStr.java diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 18ba9e3..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: '2' -services: - jeecg-boot-mysql: - build: - context: ./db - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_ROOT_HOST: '%' - TZ: Asia/Shanghai - restart: always - container_name: jeecg-boot-mysql - image: jeecg-boot-mysql - command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 - --max_allowed_packet=128M - --default-authentication-plugin=caching_sha2_password - ports: - - 3306:3306 - networks: - - jeecg-boot - - jeecg-boot-redis: - image: registry.cn-hangzhou.aliyuncs.com/jeecgdocker/redis:5.0 - ports: - - 6379:6379 - restart: always - hostname: jeecg-boot-redis - container_name: jeecg-boot-redis - networks: - - jeecg-boot - - jeecg-boot-system: - build: - context: ./jeecg-module-system/jeecg-system-start - restart: on-failure - depends_on: - - jeecg-boot-mysql - - jeecg-boot-redis - container_name: jeecg-boot-system - image: jeecg-boot-system - hostname: jeecg-boot-system - ports: - - 8080:8080 - networks: - - jeecg-boot - -networks: - jeecg-boot: - name: jeecg_boot diff --git a/nursing-unit-base-core/pom.xml b/nursing-unit-base-core/pom.xml index 9102574..16bb52a 100644 --- a/nursing-unit-base-core/pom.xml +++ b/nursing-unit-base-core/pom.xml @@ -2,7 +2,7 @@ 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"> - org.nursingunit.boot + com.nursingunit.boot nursing-unit-parent 2.0.0 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 46401ee..fe38936 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -109,7 +109,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 - + filterChainDefinitionMap.put("/testDictType/abc", "anon");//TODO 待删除 //update-begin--Author:scott Date:20221116 for：排除静态资源后缀 filterChainDefinitionMap.put("/", "anon"); diff --git a/nursing-unit-config/pom.xml b/nursing-unit-config/pom.xml new file mode 100644 index 0000000..ac6554e --- /dev/null +++ b/nursing-unit-config/pom.xml @@ -0,0 +1,22 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 4.0.0 + + nursing-unit-config + + + + com.nursingunit.boot + nursing-unit-base-core + 2.0.0 + + + + diff --git a/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java b/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java new file mode 100644 index 0000000..8db9773 --- /dev/null +++ b/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.demo.cloud.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + */ +@RestController +@RequestMapping("/testDictType") +public class DictTypeController { + + /** + * 测试 + * + * @return + */ + @GetMapping("/abc") + public void abc() { + System.out.println(12313); + } + + +} diff --git a/nursing-unit-demo/pom.xml b/nursing-unit-demo/pom.xml index 0f26e8e..9486739 100644 --- a/nursing-unit-demo/pom.xml +++ b/nursing-unit-demo/pom.xml @@ -13,8 +13,9 @@ - org.nursingunit.boot + com.nursingunit.boot nursing-unit-base-core + 2.0.0 diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml b/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml index d83b961..cb1cfe2 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> nu-system-api - org.nursingunit.boot + com.nursingunit.boot 2.0.0 4.0.0 diff --git a/nursing-unit-system/nu-system-api/pom.xml b/nursing-unit-system/nu-system-api/pom.xml index 939572c..e2a6286 100644 --- a/nursing-unit-system/nu-system-api/pom.xml +++ b/nursing-unit-system/nu-system-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> nursing-unit-system - org.nursingunit.boot + com.nursingunit.boot 2.0.0 4.0.0 @@ -18,7 +18,7 @@ - org.nursingunit.boot + com.nursingunit.boot nursing-unit-base-core diff --git a/nursing-unit-system/nu-system-biz/pom.xml b/nursing-unit-system/nu-system-biz/pom.xml index 67c87f7..75c6423 100644 --- a/nursing-unit-system/nu-system-biz/pom.xml +++ b/nursing-unit-system/nu-system-biz/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> nursing-unit-system - org.nursingunit.boot + com.nursingunit.boot 2.0.0 4.0.0 @@ -12,7 +12,7 @@ - org.nursingunit.boot + com.nursingunit.boot nu-system-local-api ${nursingunit.version} @@ -30,6 +30,7 @@ org.jeecgframework weixin4j + diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 601963e..155da34 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> nursing-unit-system - org.nursingunit.boot + com.nursingunit.boot 2.0.0 4.0.0 @@ -14,16 +14,23 @@ - org.nursingunit.boot + com.nursingunit.boot nu-system-biz ${nursingunit.version} - org.nursingunit.boot + com.nursingunit.boot nursing-unit-demo ${nursingunit.version} + + + com.nursingunit.boot + nursing-unit-config + ${nursingunit.version} + + diff --git a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java index 797603c..336a392 100644 --- a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java +++ b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.ComponentScan; import org.springframework.core.env.Environment; import java.net.InetAddress; @@ -18,7 +19,7 @@ import java.util.Map; * 单体启动类 */ @Slf4j -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"com.nu","org.jeecg"}) public class NUSystemApplication extends SpringBootServletInitializer { @Override diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 01a2e81..9f08dc6 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -300,6 +300,7 @@ logging: level: org.flywaydb: debug org.jeecg.modules.system.mapper: info + #swagger knife4j: #开启增强配置 diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/TestMain.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/TestMain.java deleted file mode 100644 index e83ed12..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/TestMain.java +++ /dev/null @@ -1,47 +0,0 @@ -//package org.jeecg; -// -//import com.alibaba.fastjson.JSONObject; -//import org.jeecg.common.util.RestUtil; -//import org.springframework.http.HttpHeaders; -//import org.springframework.http.HttpMethod; -//import org.springframework.http.MediaType; -//import org.springframework.http.ResponseEntity; -// -///** -// * @Description: TODO -// * @author: scott -// * @date: 2022年05月10日 14:02 -// */ -//public class TestMain { -// public static void main(String[] args) { -// // 请求地址 -// String url = "https://api.boot.jeecg.com/sys/user/list"; -// // 请求 Header （用于传递Token） -// HttpHeaders headers = getHeaders(); -// // 请求方式是 GET 代表获取数据 -// HttpMethod method = HttpMethod.GET; -// -// System.out.println("请求地址：" + url); -// System.out.println("请求方式：" + method); -// -// // 利用 RestUtil 请求该url -// ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); -// if (result != null && result.getBody() != null) { -// System.out.println("返回结果：" + result.getBody().toJSONString()); -// } else { -// System.out.println("查询失败"); -// } -// } -// private static HttpHeaders getHeaders() { -// String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.50h-g6INOZRVnznExiawFb1U6PPjcVVA4POeYRA5a5Q"; -// System.out.println("请求Token：" + token); -// -// HttpHeaders headers = new HttpHeaders(); -// String mediaType = MediaType.APPLICATION_JSON_VALUE; -// headers.setContentType(MediaType.parseMediaType(mediaType)); -// headers.set("Accept", mediaType); -// headers.set("X-Access-Token", token); -// return headers; -// } -// -//} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java deleted file mode 100644 index b3235d2..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.jeecg.modules.message.test; - -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.exceptions.ClientException; -import org.jeecg.NUSystemApplication; -import org.jeecg.common.api.dto.message.BusMessageDTO; -import org.jeecg.common.api.dto.message.BusTemplateMessageDTO; -import org.jeecg.common.api.dto.message.MessageDTO; -import org.jeecg.common.api.dto.message.TemplateMessageDTO; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.constant.enums.DySmsEnum; -import org.jeecg.common.constant.enums.EmailTemplateEnum; -import org.jeecg.common.constant.enums.MessageTypeEnum; -import org.jeecg.common.constant.enums.SysAnnmentTypeEnum; -import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.common.util.DySmsHelper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.HashMap; -import java.util.Map; - -/** - * @Description: 消息推送测试 - * @Author: lsq - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NUSystemApplication.class) -public class SendMessageTest { - - @Autowired - ISysBaseAPI sysBaseAPI; - - /** - * 发送系统消息 - */ - @Test - public void sendSysAnnouncement() { - //发送人 - String fromUser = "admin"; - //接收人 - String toUser = "jeecg"; - //标题 - String title = "系统消息"; - //内容 - String msgContent = "TEST:今日份日程计划已送达！"; - //发送系统消息 - sysBaseAPI.sendSysAnnouncement(new MessageDTO(fromUser, toUser, title, msgContent)); - //消息类型 - String msgCategory = CommonConstant.MSG_CATEGORY_1; - //业务类型 - String busType = SysAnnmentTypeEnum.EMAIL.getType(); - //业务ID - String busId = "11111"; - //发送带业务参数的系统消息 - BusMessageDTO busMessageDTO = new BusMessageDTO(fromUser, toUser, title, msgContent, msgCategory, busType,busId); - sysBaseAPI.sendBusAnnouncement(busMessageDTO); - } - - /** - * 发送模版消息 - */ - @Test - public void sendTemplateAnnouncement() { - //发送人 - String fromUser = "admin"; - //接收人 - String toUser = "jeecg"; - //标题 - String title = "通知公告"; - //模版编码 - String templateCode = "412358"; - //模版参数 - Map templateParam = new HashMap<>(); - templateParam.put("realname","JEECG用户"); - sysBaseAPI.sendTemplateAnnouncement(new TemplateMessageDTO(fromUser,toUser,title,templateParam,templateCode)); - //业务类型 - String busType = SysAnnmentTypeEnum.EMAIL.getType(); - //业务ID - String busId = "11111"; - //发送带业务参数的模版消息 - BusTemplateMessageDTO busMessageDTO = new BusTemplateMessageDTO(fromUser, toUser, title, templateParam ,templateCode, busType,busId); - sysBaseAPI.sendBusTemplateAnnouncement(busMessageDTO); - //新发送模版消息 - MessageDTO messageDTO = new MessageDTO(); - messageDTO.setType(MessageTypeEnum.XT.getType()); - messageDTO.setToAll(false); - messageDTO.setToUser(toUser); - messageDTO.setTitle("【流程错误】"); - messageDTO.setFromUser("admin"); - HashMap data = new HashMap<>(); - data.put(CommonConstant.NOTICE_MSG_BUS_TYPE, "msg_node"); - messageDTO.setData(data); - messageDTO.setContent("TEST:流程执行失败！任务节点未找到"); - sysBaseAPI.sendTemplateMessage(messageDTO); - } - /** - * 发送邮件 - */ - @Test - public void sendEmailMsg() { - String title = "【日程提醒】您的日程任务即将开始"; - String content = "TEST:尊敬的王先生，您购买的演唱会将于本周日10：08分在国家大剧院如期举行，届时请携带好您的门票和身份证到场"; - String email = "250678106@qq.com"; - sysBaseAPI.sendEmailMsg(email,title,content); - } - /** - * 发送html模版邮件 - */ - @Test - public void sendTemplateEmailMsg() { - String title = "收到一个催办"; - String email = "250678106@qq.com"; - JSONObject params = new JSONObject(); - params.put("bpm_name","高级设置"); - params.put("bpm_task","审批人"); - params.put("datetime","2023-10-07 18:00:49"); - params.put("url","http://boot3.jeecg.com/message/template"); - params.put("remark","快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点快点"); - sysBaseAPI.sendHtmlTemplateEmail(email,title, EmailTemplateEnum.BPM_CUIBAN_EMAIL,params); - } - /** - * 发送短信 - */ - @Test - public void sendSms() throws ClientException { - //手机号 - String mobile = "159***"; - //消息模版 - DySmsEnum templateCode = DySmsEnum.LOGIN_TEMPLATE_CODE; - //模版所需参数 - JSONObject obj = new JSONObject(); - obj.put("code", "4XDP"); - DySmsHelper.sendSms(mobile, obj, templateCode); - } -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java deleted file mode 100644 index c9e1dc5..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.jeecg.modules.system.test; - -import com.alibaba.fastjson.JSONObject; -import org.jeecg.NUSystemApplication; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * 系统用户单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = NUSystemApplication.class) -public class InsertDemoTest { - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jeecg-boot//test/jeecgDemo/"; - //测试：用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - @Autowired - private RedisUtil redisUtil; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 请求地址 - String url = BASE_URL + "add" ; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - - - for (int i = 0; i < 100; i++) { - String name = "李哈哈" + i; - JSONObject params = new JSONObject(); - params.put("name", name); - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - } - - - private String getToken() { - String token = JwtUtil.sign(USERNAME, PASSWORD); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60); - return token; - } - - private HttpHeaders getHeaders() { - String token = this.getToken(); - System.out.println("请求Token：" + token); - - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java deleted file mode 100644 index 8a260f2..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.jeecg.modules.system.test; - -import org.jeecg.NUSystemApplication; -import org.jeecg.modules.demo.mock.MockController; -import org.jeecg.modules.demo.test.entity.JeecgDemo; -import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper; -import org.jeecg.modules.demo.test.service.IJeecgDemoService; -import org.jeecg.modules.system.service.ISysDataLogService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.util.List; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = NUSystemApplication.class) -public class SampleTest { - - @Resource - private JeecgDemoMapper jeecgDemoMapper; - @Resource - private IJeecgDemoService jeecgDemoService; - @Resource - private ISysDataLogService sysDataLogService; - @Resource - private MockController mock; - - @Test - public void testSelect() { - System.out.println(("----- selectAll method test ------")); - List userList = jeecgDemoMapper.selectList(null); - Assert.assertEquals(5, userList.size()); - userList.forEach(System.out::println); - } - - @Test - public void testXmlSql() { - System.out.println(("----- selectAll method test ------")); - List userList = jeecgDemoMapper.getDemoByName("Sandy12"); - userList.forEach(System.out::println); - } - - /** - * 测试事务 - */ - @Test - public void testTran() { - jeecgDemoService.testTran(); - } - - /** - * 测试数据日志添加 - */ - @Test - public void testDataLogSave() { - System.out.println(("----- datalog test ------")); - String tableName = "jeecg_demo"; - String dataId = "4028ef81550c1a7901550c1cd6e70001"; - String dataContent = mock.sysDataLogJson(); - sysDataLogService.addDataLog(tableName, dataId, dataContent); - } -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java deleted file mode 100644 index fc27870..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.jeecg.modules.system.test; - -import org.jeecg.NUSystemApplication; -import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.config.JeecgBaseConfig; -import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * @Description: 系统表白名单测试 - * @Author: sunjianlei - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NUSystemApplication.class) -public class SysTableWhiteCheckTest { - - @Autowired - IDictTableWhiteListHandler whiteListHandler; - @Autowired - ISysBaseAPI sysBaseAPI; - - @Autowired - JeecgBaseConfig jeecgBaseConfig; - - @Before - public void before() { - String lowCodeMode = this.jeecgBaseConfig.getFirewall().getLowCodeMode(); - System.out.println("当前 LowCode 模式为: " + lowCodeMode); - // 清空缓存，防止影响测试 - whiteListHandler.clear(); - } - - @Test - public void testSql() { - System.out.println("=== 开始测试 SQL 方式 ==="); - String[] sqlArr = new String[]{ - "select username from sys_user", - "select username, CONCAT(realname, SEX) from SYS_USER", - "select username, CONCAT(realname, sex) from sys_user", - }; - for (String sql : sqlArr) { - System.out.println("- 测试Sql: " + sql); - try { - sysBaseAPI.dictTableWhiteListCheckBySql(sql); - System.out.println("-- 测试通过"); - } catch (Exception e) { - System.out.println("-- 测试未通过: " + e.getMessage()); - } - } - System.out.println("=== 结束测试 SQL 方式 ==="); - } - - @Test - public void testDict() { - System.out.println("=== 开始测试 DICT 方式 ==="); - - String table = "sys_user"; - String code = "username"; - String text = "realname"; - this.testDict(table, code, text); - - table = "sys_user"; - code = "username"; - text = "CONCAT(realname, sex)"; - this.testDict(table, code, text); - - table = "SYS_USER"; - code = "username"; - text = "CONCAT(realname, SEX)"; - this.testDict(table, code, text); - - System.out.println("=== 结束测试 DICT 方式 ==="); - } - - private void testDict(String table, String code, String text) { - try { - sysBaseAPI.dictTableWhiteListCheckByDict(table, code, text); - System.out.println("- 测试通过"); - } catch (Exception e) { - System.out.println("- 测试未通过: " + e.getMessage()); - } - } - -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java deleted file mode 100644 index ad911b9..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java +++ /dev/null @@ -1,177 +0,0 @@ -package org.jeecg.modules.system.test; - -import com.alibaba.fastjson.JSONObject; -import org.jeecg.NUSystemApplication; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * 系统用户单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = NUSystemApplication.class) -public class SysUserTest { - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jeecg-boot/sys/user/"; - //测试：用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - @Autowired - private RedisUtil redisUtil; - - /** - * 测试用例：查询记录 - */ - @Test - public void testQuery() { - // 请求地址 - String url = BASE_URL + "list"; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 请求地址 - String url = BASE_URL + "add" ; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - - JSONObject params = new JSONObject(); - params.put("username", "wangwuTest"); - params.put("password", "123456"); - params.put("confirmpassword","123456"); - params.put("realname", "单元测试"); - params.put("activitiSync", "1"); - params.put("userIdentity","1"); - params.put("workNo","0025"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：修改 - */ - @Test - public void testEdit() { - // 数据Id - String dataId = "1331795062924374018"; - // 请求地址 - String url = BASE_URL + "edit"; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - - JSONObject params = new JSONObject(); - params.put("username", "wangwuTest"); - params.put("realname", "单元测试1111"); - params.put("activitiSync", "1"); - params.put("userIdentity","1"); - params.put("workNo","0025"); - params.put("id",dataId); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：删除 - */ - @Test - public void testDelete() { - // 数据Id - String dataId = "1331795062924374018"; - // 请求地址 - String url = BASE_URL + "delete" + "?id=" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - private String getToken() { - String token = JwtUtil.sign(USERNAME, PASSWORD); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60); - return token; - } - - private HttpHeaders getHeaders() { - String token = this.getToken(); - System.out.println("请求Token：" + token); - - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java deleted file mode 100644 index 375fb6a..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.smallTools; - -import org.junit.Test; - -/** - * 测试sql分割、替换等操作 - * - * @author: scott - * @date: 2023年09月05日 16:13 - */ -public class TestSqlHandle { - - /** - * Where 分割测试 - */ - @Test - public void testSqlSplitWhere() { - String tableFilterSql = " select * from data.sys_user Where name='12312' and age>100"; - String[] arr = tableFilterSql.split(" (?i)where "); - for (String sql : arr) { - System.out.println("sql片段：" + sql); - } - } - - - /** - * Where 替换 - */ - @Test - public void testSqlWhereReplace() { - String input = " Where name='12312' and age>100"; - String pattern = "(?i)where "; // (?i) 表示不区分大小写 - - String replacedString = input.replaceAll(pattern, ""); - - System.out.println("替换前的字符串：" + input); - System.out.println("替换后的字符串：" + replacedString); - } -} diff --git a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestStr.java b/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestStr.java deleted file mode 100644 index 751d63d..0000000 --- a/nursing-unit-system/nu-system-start/src/test/java/org/jeecg/smallTools/TestStr.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.jeecg.smallTools; - -import com.alibaba.fastjson.JSONArray; -import org.apache.commons.lang3.StringUtils; -import org.junit.Test; - -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.Base64; - -/** - * 字符串处理测试 - * - * @author: scott - * @date: 2023年03月30日 15:27 - */ -public class TestStr { - - /** - * 测试参数格式化的问题，数字值有问题 - */ - @Test - public void testParameterFormat() { - String url = "/pages/lowApp/process/taskDetail?tenantId={0}&procInsId={1}&taskId={2}&taskDefKey={3}"; - String cc = MessageFormat.format(url, "6364", "111", "22", "333"); - System.out.println("参数是字符串：" + cc); - - String cc2 = MessageFormat.format(url, 6364, 111, 22, 333); - System.out.println("参数是数字（出问题）：" + cc2); - } - - - @Test - public void testStringSplitError() { - String conditionValue = "qweqwe"; - String[] conditionValueArray = conditionValue.split(","); - System.out.println("length = "+ conditionValueArray.length); - Arrays.stream(conditionValueArray).forEach(System.out::println); - } - - @Test - public void testJSONArrayJoin() { - JSONArray valArray = new JSONArray(); - valArray.add("123"); - valArray.add("qwe"); - System.out.println("值: " + StringUtils.join(valArray, ",")); - } - - @Test - public void testSql() { - String sql = "select * from sys_user where sex = ${sex}"; - sql = sql.replaceAll("'?\\$\\{sex}'?","1"); - System.out.println(sql); - } - - @Test - public void base64(){ - String encodedString = "5L+d5a2Y5aSx6LSl77yM5YWN6LS554mI5pyA5aSa5Yib5bu6ezB95p2h6L+e5o6l77yM6K+35Y2H57qn5ZWG5Lia54mI77yB"; - byte[] decodedBytes = Base64.getDecoder().decode(encodedString); - String decodedString = new String(decodedBytes); - String tipMsg = MessageFormat.format(decodedString, 10); - System.out.println(tipMsg); - } - - /** - * 正则测试字符串只保存中文和数字和字母 - */ - @Test - public void testSpecialChar() { - String str = "Hello, World! 你好！这是一段特殊符号的测试，This is a test string with special characters: @#$%^&*"; - // 使用正则表达式替换特殊字符 - String replacedStr = str.replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]", ""); - System.out.println("Replaced String: " + replacedStr); - } - -} diff --git a/nursing-unit-system/pom.xml b/nursing-unit-system/pom.xml index 903ab5d..8c15948 100644 --- a/nursing-unit-system/pom.xml +++ b/nursing-unit-system/pom.xml @@ -3,7 +3,7 @@ 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"> - org.nursingunit.boot + com.nursingunit.boot nursing-unit-parent 2.0.0 diff --git a/pom.xml b/pom.xml index 21bc456..b659829 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - org.nursingunit.boot + com.nursingunit.boot nursing-unit-parent 2.0.0 pom @@ -70,6 +70,7 @@ nursing-unit-base-core nursing-unit-demo + nursing-unit-config nursing-unit-system @@ -165,7 +166,7 @@ - org.nursingunit.boot + com.nursingunit.boot nu-system-biz ${nursingunit.version} @@ -178,29 +179,17 @@ - org.nursingunit.boot + com.nursingunit.boot nursing-unit-base-core ${nursingunit.version} - org.nursingunit.boot + com.nursingunit.boot nu-local-api ${nursingunit.version} - - - org.nursingunit.boot - nu-cloud-api - ${nursingunit.version} - - - - org.jeecgframework.boot - jeecg-boot-starter-cloud - ${jeecgboot.version} - org.jeecgframework.boot