1、Springboot模板优化

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -731,10 +731,9 @@ public class SpringBootCallable implements Callable {
 
     public void generateTest(File root, Project project, DataBase dataBase, String option) {
 
-        File config = new File(root.getAbsolutePath(), "config");
-        config.mkdirs();
-
         {
+            File config = new File(root.getAbsolutePath(), "config");
+            config.mkdirs();
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("tool", Tool.class);
             ctx.put("basePackage", project.getProjectBasePackage());
@@ -744,6 +743,16 @@ public class SpringBootCallable implements Callable {
             freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "TestConfig" + ".java"), option + "/test/TestConfig.ftl", ctx);
         }
 
+        {
+            HashMap<String, Object> ctx = new HashMap<String, Object>();
+            ctx.put("tool", Tool.class);
+            ctx.put("basePackage", project.getProjectBasePackage());
+            ctx.put("moduleName", project.getProjectName());
+            ctx.put("author", project.getProjectAuthor());
+            ctx.put("date", new Date());
+            freeMarkerManager.outputTemp(new File(root, "UtilTest" + ".java"), option + "/test/UtilTest.java", ctx);
+        }
+
         for (Module md : project.getModules()) {
             File module = new File(root.getAbsolutePath(), md.getModuleName());
             module.mkdirs();

src/main/resources/modules/Java_api/module/controller/ApiController.ftl

@@ -1,12 +1,11 @@
 package ${domain}.action;
 
-import com.fasterxml.jackson.core.TreeNode;
 import ${domain}.${module}.mgr.*;
 import ${domain}.${module}.req.*;
-import ${domain}.framework.base.BaseResponse;
+import ${domain}.frame.base.BaseResponse;
-import ${domain}.framework.base.ErrorType;
+import ${domain}.frame.base.ErrorType;
-import ${domain}.framework.base.Token;
+import ${domain}.frame.base.Token;
-import ${domain}.framework.utils.*;
+import ${domain}.frame.utils.*;
 import org.springframework.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/resources/modules/SpringBoot/java/frame/utils/AESUtil.java

@@ -107,16 +107,4 @@ public class AESUtil {
         }
         return null;
     }
-
-    public static void main(String[] args) {
-        // 加密
-        String data = "我有一个苹果";
-        String secret = "1234567890123456";
-        System.out.println("加密后的Base64密文是:" + AESUtil.encrypt2Base64(data.getBytes(), secret));
-
-        // 解密
-        String encrypt2Base64 = AESUtil.encrypt2Base64(data.getBytes(), secret);
-        byte[] decrypt = AESUtil.decrypt(Base64Util.decode(encrypt2Base64), secret);
-        System.out.println("解密后的明文是:" + new String(decrypt));
-    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/Base64Util.java

@@ -494,13 +494,4 @@ public class Base64Util {
 
         return dArr;
     }
-
-    public static void main(String[] args) {
-        String s = Base64Util.encodeToString(("我搜搜").getBytes());
-        System.out.println(s);
-
-        byte[] decode = Base64Util.decode(s);
-        System.out.println(new String(decode));
-
-    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/IDgenerator.java

@@ -70,11 +70,4 @@ public class IDgenerator {
     protected static long timeGen() {
         return System.currentTimeMillis();
     }
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 10; i++) {
-            long l = IDgenerator.nextId();
-            System.out.println(l);
-        }
-    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/MD5Util.java

@@ -55,33 +55,4 @@ public class MD5Util {
 
         return hs.toString();
     }
-
-    /**
-     * 测试实例
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-//        String encode = MD5Util.encode("123456");
-//        System.out.println(encode);
-//
-//        UserCreateRequest user = new UserCreateRequest();
-//        user.setUser("wangbing");
-//
-//
-//        ArrayList<User> users = new ArrayList<>();
-//        User user1 = new User();
-//        user1.setUser("ddd");
-//        users.add(user1);
-//        user.setList(users);
-//
-//        TreeNode treeNode = MapperUtil.toTree(user);
-//        String s = MapperUtil.toJson(user,true);
-//        System.out.println(s);
-//
-//        String s1 = MD5Util.toSign(treeNode, "asasasdadasda", "wwwwwwwwwwwwwwww");
-//
-//        System.out.println(s1);
-
-    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/ProcessUtil.java

@@ -114,22 +114,4 @@ public class ProcessUtil {
             }
         }
     }
-
-    public static void main(String[] args) {
-//        try {//调用bat文件，出现黑窗口
-//            executeCmd("cmd /k start E:\\windows_amd64\\sunny.bat");
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        try {
-//            executeCmd("E:\\windows_amd64\\sunny.exe clientid 213609147996,201822147996");
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        execExe("D:\\windows_amd64\\sunny.exe clientid 213609147996,201822147996");
-//        execBat("D:\\windows_amd64\\exec.bat");
-//        System.out.println("===================");
-//        System.out.println(s);
-//        System.out.println("===================");
-    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/RSAUtil.java

@@ -219,6 +219,9 @@ public class RSAUtil {
         return null;
     }
 
+    public static String sign2Base64(byte[] data) {
+        return sign2Base64(data, signPrivateKeyBase64);
+    }
 
     public static String sign2Base64(byte[] data, String privateKey) {
         byte[] sign = sign(data, privateKey);
@@ -273,6 +276,10 @@ public class RSAUtil {
         return false;
     }
 
+    public static boolean doCheck(byte[] data, String sign) {
+        return doCheck(data, sign, signPublicKeyBase64);
+    }
+
     public static PublicKey parsePublicKey(String cryptPublicKeyBase64) {
         try {
             KeyFactory keyFactory = KeyFactory.getInstance("RSA");
@@ -298,33 +305,4 @@ public class RSAUtil {
         }
         return null;
     }
-
-    /**
-     * 测试实例
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        {//创建秘钥对
-            RSAUtil.createKey();
-        }
-
-        {//加解密
-
-            //加密
-            String encrypt = RSAUtil.encrypt2Base64("我有一个苹果".getBytes());
-            System.out.println(encrypt);
-
-            //解密
-            String decrypt = RSAUtil.decrypt2String(encrypt);
-            System.out.println(decrypt);
-        }
-
-
-        String sign = sign2Base64("我有一个苹果".getBytes(), signPrivateKeyBase64);
-        System.out.println(sign);
-
-        boolean b = doCheck("我有一个苹果".getBytes(), sign, signPublicKeyBase64);
-        System.out.println(b);
-    }
 }

src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl

@@ -38,10 +38,9 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
     private ${field.fieldType.javaType()} ${field.getFName()};
         </#if>
     </#list>
-</#if>
+    <#list table.fields as field>
-<#list table.fields as field>
     <#if !field.isSystem>
-        <#if field.fieldType.javaType() == "Enum">
+    <#if field.fieldType.javaType() == "Enum">
 
     public ${field.getCName()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -59,7 +58,8 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
     public void ${field.setterName()}(${field.fieldType.javaType()} ${field.getFName()}) {
         this.${field.getFName()} = ${field.getFName()};
     }
-        </#if>
     </#if>
-</#list>
+    </#if>
+    </#list>
+</#if>
 }

src/main/resources/modules/SpringBoot/test/UtilTest.java

@@ -0,0 +1,88 @@
+package ${basePackage};
+
+import ${basePackage}.frame.utils.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * UtilTest -  - 测试用例
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Transactional
+public class UtilTest {
+
+    @Test
+    public void testIDgenerator() {
+        for (int i = 0; i < 10; i++) {
+            long l = IDgenerator.nextId();
+            System.out.println(l);
+        }
+    }
+
+    @Test
+    public void testAESUtil() {
+        // 加密
+        String data = "我有一个苹果";
+        String secret = "1234567890123456";
+        System.out.println("加密后的Base64密文是:" + AESUtil.encrypt2Base64(data.getBytes(), secret));
+
+        // 解密
+        String encrypt2Base64 = AESUtil.encrypt2Base64(data.getBytes(), secret);
+        byte[] decrypt = AESUtil.decrypt(Base64Util.decode(encrypt2Base64), secret);
+        System.out.println("解密后的明文是:" + new String(decrypt));
+    }
+
+    @Test
+    public void testBase64Util() {
+        String s = Base64Util.encodeToString(("我搜搜").getBytes());
+        System.out.println(s);
+
+        byte[] decode = Base64Util.decode(s);
+        System.out.println(new String(decode));
+    }
+
+    @Test
+    public void testMD5Util() {
+        String encode = MD5Util.encode("123456");
+        System.out.println(encode);
+    }
+
+    @Test
+    public void testProcessUtil() {
+        ProcessUtil.execExe("D:\\example.exe");
+        ProcessUtil.execBat("D:\\example.bat");
+    }
+
+    @Test
+    public void testRSAUtil() {
+        {//创建秘钥对
+            RSAUtil.createKey();
+        }
+
+        {//加解密
+
+            //加密
+            String encrypt = RSAUtil.encrypt2Base64("我有一个苹果".getBytes());
+            System.out.println(encrypt);
+
+            //解密
+            String decrypt = RSAUtil.decrypt2String(encrypt);
+            System.out.println(decrypt);
+        }
+
+
+        String sign = RSAUtil.sign2Base64("我有一个苹果".getBytes());
+        System.out.println(sign);
+
+        boolean b = RSAUtil.doCheck("我有一个苹果".getBytes(), sign);
+        System.out.println(b);
+    }
+}