From 191069ccace44afe9ba300ed33ba560ef769c3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=85=89?= <1992lcg@163.com>
Date: Fri, 30 Apr 2021 11:06:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20mapstruct=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0idea,?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 15 ++--
 clouddo-admin/pom.xml                         |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../ClouddoAdminApplicationTests.java         | 70 +++++--------------
 .../ClouddoZuulApplicationTests.java          |  2 -
 5 files changed, 29 insertions(+), 62 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e9140c..795059d 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 05d182e..a528584 100644
--- a/clouddo-admin/pom.xml
+++ b/clouddo-admin/pom.xml
@@ -23,7 +23,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.SR1</spring-cloud.version>
-        <org.mapstruct.version>1.1.0.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
     </properties>
 
     <dependencies>
diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml
index f5b1ce1..a90a085 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 0216b0c..259fd28 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 df8ef4f..35b114b 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;
 
-- 
Gitee