diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml index 7cc14459..2be5ef63 100644 --- a/jeecg-boot/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot/jeecg-boot-module-system/pom.xml @@ -61,10 +61,28 @@ org.springframework.boot spring-boot-maven-plugin - + ${skip.springboot.maven} + + + + + SpringCloud + + + + src/main/resources + + application.yml + application-*.yml + + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml index d8730e25..49eef6b9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -174,16 +174,16 @@ mybatis-plus: # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 -minidao : +minidao: base-package: org.jeecg.modules.jmreport.* -jeecg : +jeecg: # 是否启用安全模式 safeMode: false # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss uploadType: local - path : + path: #文件上传根目录 设置 upload: /opt/upFiles #webapp文件路径 @@ -268,7 +268,7 @@ cas: #Mybatis输出sql日志 logging: level: - org.jeecg.modules.system.mapper : info + org.jeecg.modules.system.mapper: info #swagger knife4j: #开启增强配置 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 index 23c630f6..4d5fbfc3 100644 --- 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 @@ -14,16 +14,16 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 10MB + max-request-size: 10MB mail: host: smtp.163.com username: jeecgos@163.com @@ -79,8 +79,8 @@ spring: static-path-pattern: /** resource: static-locations: classpath:/static/,classpath:/public/ -# autoconfigure: -# exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + # autoconfigure: + # exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: type: com.alibaba.druid.pool.DruidDataSource druid: @@ -132,14 +132,14 @@ mybatis-plus: # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 -jeecg : +jeecg: # 是否启用安全模式 safeMode: false # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss uploadType: alioss - path : + path: #文件上传根目录 设置 upload: D://opt//upFiles #webapp文件路径 @@ -197,7 +197,7 @@ jeecg : port: 30007 logPath: logs/jeecg/job/jobhandler/ logRetentionDays: 30 - #自定义路由配置 yml nacos database + #自定义路由配置 yml nacos database route: config: data-id: jeecg-gateway-router @@ -215,7 +215,7 @@ cas: #Mybatis输出sql日志 logging: level: - org.jeecg.modules.system.mapper : info + org.jeecg.modules.system.mapper: info #enable swagger swagger: enable: true diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml index 8f557c04..c4ad62e1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml @@ -174,22 +174,22 @@ mybatis-plus: # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 -minidao : +minidao: base-package: org.jeecg.modules.jmreport.* -jeecg : +jeecg: # 是否启用安全模式 safeMode: false # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss uploadType: alioss - path : + path: #文件上传根目录 设置 upload: /opt/jeecg-boot/upload #webapp文件路径 webapp: /opt/jeecg-boot/webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? @@ -262,7 +262,7 @@ cas: #Mybatis输出sql日志 logging: level: - org.jeecg.modules.system.mapper : info + org.jeecg.modules.system.mapper: info #swagger knife4j: #开启增强配置 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml index 25531525..678d3c54 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml @@ -133,34 +133,34 @@ spring: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: - master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: root - driver-class-name: com.mysql.cj.jdbc.Driver + master: + url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver + #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 0 - host: 192.168.1.199 - lettuce: - pool: - max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 - shutdown-timeout: 100ms - password: '' - port: 6379 + database: 0 + host: 192.168.1.199 + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 + 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: + mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml + global-config: # 关闭MP3.0自带的banner banner: false db-config: @@ -168,28 +168,28 @@ mybatis-plus: id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true - configuration: + configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 -minidao : +minidao: base-package: org.jeecg.modules.jmreport.* -jeecg : +jeecg: # 是否启用安全模式 safeMode: false # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss uploadType: local - path : + path: #文件上传根目录 设置 upload: D://opt//upFiles #webapp文件路径 webapp: D://opt//webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? @@ -259,7 +259,7 @@ jeecg : #Mybatis输出sql日志 logging: level: - org.jeecg.modules.system.mapper : info + org.jeecg.modules.system.mapper: info #cas单点登录 cas: prefixUrl: http://cas.example.org:8443/cas 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 eedbe5d1..aaa0c964 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,64 +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.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); - } -} +//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/modules/system/test/SysUserTest.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java index a02448ad..00441bbe 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 @@ -1,179 +1,179 @@ -package org.jeecg.modules.system.test; - -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.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import com.alibaba.fastjson.JSONObject; -import org.springframework.http.ResponseEntity; - -/** - * 系统用户单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -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; - } -} +//package org.jeecg.modules.system.test; +// +//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.test.context.ActiveProfiles; +//import org.springframework.test.context.junit4.SpringRunner; +//import org.springframework.http.HttpHeaders; +//import org.springframework.http.HttpMethod; +//import org.springframework.http.MediaType; +//import com.alibaba.fastjson.JSONObject; +//import org.springframework.http.ResponseEntity; +// +///** +// * 系统用户单元测试 +// */ +//@RunWith(SpringRunner.class) +//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) +//@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) +//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/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml deleted file mode 100644 index e69de29b..00000000