diff --git a/.gitignore b/.gitignore index 3e9140ca613c38df9820a5fe15c1594faeeb0db4..795059d147abca94617510677dc7de049b9d4def 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -/.idea/ -/clouddo.iml -/clouddo-*/clouddo-*.iml -/clouddo-*/mvnw -/clouddo-*/mvnw.cmd -/clouddo-*/.mvn/ -/clouddo-base/mvnw +.idea/ +clouddo.iml +clouddo-*/clouddo-*.iml +clouddo-*/mvnw +clouddo-*/mvnw.cmd +clouddo-*/.mvn/ +clouddo-*/target/ +clouddo-base/mvnw diff --git a/clouddo-admin/pom.xml b/clouddo-admin/pom.xml index 05d182ef7aa93ca0e8ffeff02e83ba680f6f6999..a52858432a48f2525c7abd5bcacc50b5ee5a57c7 100644 --- a/clouddo-admin/pom.xml +++ b/clouddo-admin/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.8 Finchley.SR1 - 1.1.0.Final + 1.4.1.Final diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml index f5b1ce1924140dba00758b2bf40f1ecfd171e0e8..a90a0850ed67503b6fc4f0e0e75cdd92a1122fab 100644 --- a/clouddo-admin/src/main/resources/application.yml +++ b/clouddo-admin/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: application: name: api-admin datasource: - url: jdbc:mysql://127.0.0.1:3306/clouddo?useUnicode=true&characterEncoding=utf8 + url: jdbc:mysql://127.0.0.1:3306/clouddo?useUnicode=true&characterEncoding=utf8&useSSL=false username: root password: root jackson: diff --git a/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java b/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java index 0216b0cf3a63cdbeaf559c09d1e0630e25171ffc..259fd28a77a3a8d222f2476fef700ec8404dd1f3 100644 --- a/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java +++ b/clouddo-admin/src/test/java/com/bootdo/clouddoadmin/ClouddoAdminApplicationTests.java @@ -1,51 +1,19 @@ -//package com.bootdo.clouddoadmin; -// -//import org.junit.runner.RunWith; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//@RunWith(SpringRunner.class) -//@SpringBootTest -//public class ClouddoAdminApplicationTests { -// -// public static void main(String[] args) { -// MobileCardCompanyDO cardPayOrderModel = new MobileCardCompanyDO(); -// cardPayOrderModel.setCompanyCode("HS"); -// cardPayOrderModel.setCompanyDesc("a1231241241awdasdf"); -// cardPayOrderModel.setCompanyName("123124dzvsds"); -// cardPayOrderModel.setId(2l); -// cardPayOrderModel.setStatus("1"); -// CompanyModel companyModel = new CompanyModel(); -// -// /** -// * 10W次 -// * BeanUtils.copyProperties:718 -// * beanCopier.copy:56 -// */ -// -// /** -// * 100W次 -// * BeanUtils.copyProperties:5673 -// * beanCopier.copy:70 -// */ -// -// //BeanUtils性能 -// long start = System.currentTimeMillis(); -// for (int i = 0; i < 1000000; i++) { -// BeanUtils.copyProperties(cardPayOrderModel, companyModel); -// } -// long end = System.currentTimeMillis(); -// System.out.println(end - start); -// -// //BeanCopier性能 -// long start1 = System.currentTimeMillis(); -// BeanCopier beanCopier = BeanCopier.create(MobileCardCompanyDO.class, CompanyModel.class, -// false); -// for (int i = 0; i < 1000000; i++) { -// beanCopier.copy(cardPayOrderModel, companyModel, null); -// } -// long end1 = System.currentTimeMillis(); -// System.out.println(end1 - start1); -// } -// -//} +package com.bootdo.clouddoadmin; + +import com.bootdo.clouddoadmin.dao.UserDao; +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.List; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ClouddoAdminApplicationTests { + + @Test + public void contextLoads() { + } +} diff --git a/clouddo-zuul/src/test/java/com/bootdo/clouddozuul/ClouddoZuulApplicationTests.java b/clouddo-zuul/src/test/java/com/bootdo/clouddozuul/ClouddoZuulApplicationTests.java index df8ef4f7c34a9fad263560d4a97347a2a2a62adc..35b114b6a5b0f1558a8f4a0bb2a02f0313ae773f 100644 --- a/clouddo-zuul/src/test/java/com/bootdo/clouddozuul/ClouddoZuulApplicationTests.java +++ b/clouddo-zuul/src/test/java/com/bootdo/clouddozuul/ClouddoZuulApplicationTests.java @@ -1,9 +1,7 @@ package com.bootdo.clouddozuul; -import com.bootdo.clouddozuul.prc.admin.MenuService; 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;