diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java new file mode 100644 index 00000000..5201267c --- /dev/null +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java @@ -0,0 +1,32 @@ +package org.jeecg.common.system.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 下拉树 model + * + * @author jeecg-boot + */ +@Data +public class SelectTreeModel implements Serializable { + + private String key; + private String title; + private String value; + /** + * 父Id + */ + private String parentId; + /** + * 是否是叶节点 + */ + private boolean isLeaf; + /** + * 子节点 + */ + private List children; + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dm8.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dm8.yml new file mode 100644 index 00000000..23c630f6 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dm8.yml @@ -0,0 +1,274 @@ +server: + port: 8080 + tomcat: + max-swallow-size: -1 + error: + include-exception: true + include-stacktrace: ALWAYS + include-message: ALWAYS + servlet: + context-path: /jeecg-boot + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +management: + endpoints: + web: + exposure: + include: metrics,httptrace + +spring: + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + mail: + host: smtp.163.com + username: jeecgos@163.com + password: ?? + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + ## quartz定时任务,采用数据库方式 + quartz: + job-store-type: jdbc + jdbc: + initialize-schema: never + auto-startup: true + #启动时更新己存在的Job + overwrite-existing-jobs: true + #json 时间戳统一转换 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + jpa: + open-in-view: false + properties: + hibernate: + dialect: org.hibernate.dialect.Oracle8iDialect + activiti: + check-process-definitions: false + #启用作业执行器 + async-executor-activate: false + #启用异步执行器 + job-executor-activate: false + aop: + proxy-target-class: true + #配置freemarker + freemarker: + # 设置模板后缀名 + suffix: .ftl + # 设置文档类型 + content-type: text/html + # 设置页面编码格式 + charset: UTF-8 + # 设置页面缓存 + cache: false + prefer-file-system-access: false + # 设置ftl文件路径 + template-loader-path: + - classpath:/templates + # 设置静态文件路径，js,css等 + mvc: + static-path-pattern: /** + resource: + static-locations: classpath:/static/,classpath:/public/ +# autoconfigure: +# exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + type: com.alibaba.druid.pool.DruidDataSource + druid: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 5 + # 最大连接池数量 + maxActive: 10 + stat-view-servlet: + enabled: true + loginUsername: admin + loginPassword: 123456 + allow: + web-stat-filter: + enabled: true + driverClassName: dm.jdbc.driver.DmDriver + url: jdbc:dm://127.0.0.1:5236/?JEECG&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 + username: ?? + password: ?? + validationQuery: SELECT 1 FROM DUAL + #redis 配置 + redis: + database: 0 + host: 127.0.0.1 + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 0 为没有限制 + max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 + max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: '' + port: 6379 +#mybatis plus 设置 +mybatis-plus: + mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml + global-config: + # 关闭MP3.0自带的banner + banner: false + db-config: + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; + id-type: ASSIGN_ID + # 默认数据库表下划线命名 + table-underline: true + configuration: + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # 返回类型为Map,显示null对应的字段 + call-setters-on-nulls: true +#jeecg专用配置 +jeecg : + # 是否启用安全模式 + safeMode: false + # 签名密钥串(前后端要一致，正式发布请自行修改) + signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a + # 本地：local\Minio：minio\阿里云：alioss + uploadType: alioss + path : + #文件上传根目录 设置 + upload: D://opt//upFiles + #webapp文件路径 + webapp: D://opt//webapp + shiro: + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + #阿里云oss存储配置 + oss: + accessKey: ?? + secretKey: ?? + endpoint: oss-cn-beijing.aliyuncs.com + bucketName: ?? + # ElasticSearch 6设置 + elasticsearch: + cluster-name: jeecg-ES + cluster-nodes: 127.0.0.1:9200 + check-enabled: false + # 表单设计器配置 + desform: + # 主题颜色（仅支持 16进制颜色代码） + theme-color: "#1890ff" + # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） + upload-type: system + map: + # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home + baidu: ?? + # 在线预览文件服务器地址配置 + file-view-domain: 127.0.0.1:8012 + # minio文件上传 + minio: + minio_url: http://minio.jeecg.com + minio_name: ?? + minio_pass: ?? + bucketName: otatest + #大屏报表参数设置 + jmreport: + mode: dev + #是否需要校验token + is_verify_token: false + #必须校验方法 + verify_methods: remove,delete,save,add,update + #Wps在线文档 + wps: + domain: https://wwo.wps.cn/office/ + appid: ?? + appsecret: ?? + #xxl-job配置 + xxljob: + enabled: false + adminAddresses: http://127.0.0.1:9080/xxl-job-admin + appname: ${spring.application.name} + accessToken: '' + address: 127.0.0.1:30007 + ip: 127.0.0.1 + port: 30007 + logPath: logs/jeecg/job/jobhandler/ + logRetentionDays: 30 + #自定义路由配置 yml nacos database + route: + config: + data-id: jeecg-gateway-router + group: DEFAULT_GROUP + data-type: yml + #分布式锁配置 + redisson: + address: 127.0.0.1:6379 + password: + type: STANDALONE + enabled: true +#cas单点登录 +cas: + prefixUrl: http://cas.example.org:8443/cas +#Mybatis输出sql日志 +logging: + level: + org.jeecg.modules.system.mapper : info +#enable swagger +swagger: + enable: true + production: false + basic: + enable: false + username: jeecg + password: jeecg1314 +#第三方登录 +justauth: + enabled: true + type: + GITHUB: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback + WECHAT_ENTERPRISE: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback + agent-id: 1000002 + DINGTALK: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback + WECHAT_OPEN: + client-id: ?? + client-secret: ?? + redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback + cache: + type: default + prefix: 'demo::' + timeout: 1h +#第三方APP对接 +third-app: + enabled: true + type: + #企业微信 + WECHAT_ENTERPRISE: + enabled: true + #CORP_ID + client-id: ?? + #SECRET + client-secret: ??-ij8 + #自建应用id + agent-id: 1000004 + #自建应用秘钥（新版企微需要配置） + agent-app-secret: ?? + #钉钉 + DINGTALK: + enabled: false + # appKey + client-id: ?? + # appSecret + client-secret: ?? + agent-id: ?? \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java index 22e9255b..eedbe5d1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java +++ b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java @@ -1,65 +1,64 @@ -//package org.jeecg; -// -//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.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 = JeecgSystemApplication.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(); -// } -// -// //author:lvdandan-----date：20190315---for:添加数据日志测试---- -// /** -// * 测试数据日志添加 -// */ -//// @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); -//// } -// //author:lvdandan-----date：20190315---for:添加数据日志测试---- -//} +package org.jeecg; + +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 = JeecgSystemApplication.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/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/TestMain.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/TestMain.java new file mode 100644 index 00000000..aed920e7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/TestMain.java @@ -0,0 +1,47 @@ +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/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java deleted file mode 100644 index 103a6141..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java +++ /dev/null @@ -1,192 +0,0 @@ -package org.jeecg.modules.online.desform.test; - -import com.alibaba.fastjson.JSONObject; -import org.jeecg.JeecgSystemApplication; -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; - -/** - * 表单设计器 API 接口单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -public class DesformApiTest { - - @Autowired - private RedisUtil redisUtil; - - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jeecg-boot/desform/api/"; - - // 请实际使用时替换成你自己的用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - - /** - * 表单code，实际使用时可以替换成你要测试的表单code - */ - private final String DESFORM_CODE = "qingjiadan"; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("begin_time", "2019-12-27"); - params.put("remarks", "生病了"); - - 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 = "f43ea15c654337fbcb2336dd5422ffc3"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "李四"); - params.put("sex", "0"); - params.put("begin_time", "2019-12-27"); - params.put("remarks", "感冒了"); - - 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 = "f43ea15c654337fbcb2336dd5422ffc3"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 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 testQuery() { - // 数据Id - String dataId = "18146ddaa062296442a9310a51baf67b"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 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) { - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java deleted file mode 100644 index b3bb6275..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java +++ /dev/null @@ -1,190 +0,0 @@ -package org.jeecg.modules.online.desform.test; - -import com.alibaba.fastjson.JSONObject; -import org.jeecg.JeecgSystemApplication; -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; - -/** - * online api online表单单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -public class OnlineApiTest { - @Autowired - private RedisUtil redisUtil; - - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jeecg-boot/online/cgform/api/"; - - // 请实际使用时替换成你自己的用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - - /** - * online表单code，实际使用时可以替换成你要测试的表单code - * （测试表test_demo） - */ - private final String ONLINE_CODE = "d35109c3632c4952a19ecc094943dd71"; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("age",15); - params.put("descc", "

富文本编辑

"); - - 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() { - // dataId - String dataId = "1331797913880883201"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("id", dataId); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("age",30); - params.put("descc", "

富文本编辑，重新编辑

"); - - 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 = "1331797913880883201"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 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 testQuery() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "getData/"+ ONLINE_CODE ; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 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) { - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java index 25ebb1c8..a02448ad 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java +++ b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java @@ -9,6 +9,7 @@ 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.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -23,35 +24,54 @@ import org.springframework.http.ResponseEntity; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) public class SysUserTest { - @Autowired - private RedisUtil redisUtil; - /** * 测试地址：实际使用时替换成你自己的地址 */ 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() { - // 用户Token - String token = this.getToken(); // 请求地址 String url = BASE_URL + "add" ; // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); + HttpHeaders headers = this.getHeaders(); // 请求方式是 POST 代表提交新增数据 HttpMethod method = HttpMethod.POST; System.out.println("请求地址：" + url); System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); JSONObject params = new JSONObject(); params.put("username", "wangwuTest"); @@ -81,18 +101,15 @@ public class SysUserTest { public void testEdit() { // 数据Id String dataId = "1331795062924374018"; - // 用户Token - String token = this.getToken(); // 请求地址 String url = BASE_URL + "edit"; // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); + HttpHeaders headers = this.getHeaders(); // 请求方式是 PUT 代表提交修改数据 HttpMethod method = HttpMethod.PUT; System.out.println("请求地址：" + url); System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); JSONObject params = new JSONObject(); params.put("username", "wangwuTest"); @@ -121,18 +138,15 @@ public class SysUserTest { public void testDelete() { // 数据Id String dataId = "1331795062924374018"; - // 用户Token - String token = this.getToken(); // 请求地址 String url = BASE_URL + "delete" + "?id=" + dataId; // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); + HttpHeaders headers = this.getHeaders(); // 请求方式是 DELETE 代表删除数据 HttpMethod method = HttpMethod.DELETE; System.out.println("请求地址：" + url); System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); // 利用 RestUtil 请求该url ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); @@ -143,32 +157,6 @@ public class SysUserTest { } } - /** - * 测试用例：查询记录 - */ - @Test - public void testQuery() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "list"; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 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); @@ -177,9 +165,12 @@ public class SysUserTest { return token; } - private HttpHeaders getHeaders(String token) { + private HttpHeaders getHeaders() { + String token = this.getToken(); + System.out.println("请求Token：" + token); + HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; + String mediaType = MediaType.APPLICATION_JSON_VALUE; headers.setContentType(MediaType.parseMediaType(mediaType)); headers.set("Accept", mediaType); headers.set("X-Access-Token", token); diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java index 91881b21..a927b0c0 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java @@ -4,10 +4,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -import javax.servlet.http.HttpServletResponse; /** * Nacos 启动类 @@ -38,15 +34,4 @@ public class JeecgNacosApplication { SpringApplication.run(JeecgNacosApplication.class, args); } - /** - * 默认跳转首页 - * - * @param model - * @return - */ - @GetMapping("/") - public String index(Model model, HttpServletResponse response) { - // 视图重定向 - 跳转 - return "/nacos"; - } }