From a9193cfd5ae8d7fa7e0824b5f77e4deb72695dae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:29:00 +0800
Subject: [PATCH] 合并代码

---
 java110-code-generator/src/main/resources/web/template_1.json |  107 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/java110-code-generator/src/main/resources/web/template_1.json b/java110-code-generator/src/main/resources/web/template_1.json
index 702b0cc..f9c92a0 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/java110-code-generator/src/main/resources/web/template_1.json
@@ -1,67 +1,72 @@
 {
-  "templateName":"搴旂敤",
-  "templateCode":"app",
-  "templateKey":"appId",
-  "templateKeyName":"搴旂敤Id",
+  "templateName":"灏忕▼搴忕鐞�",
+  "templateCode":"smallWeChat",
+  "templateKey":"weChatId",
+  "templateKeyName":"缂栫爜",
+  "searchCode": "name",
+  "searchName": "灏忕▼搴忓悕绉�",
+  "conditions": [
+    {
+      "name": "灏忕▼搴忓悕绉�",
+      "inputType": "input",
+      "code": "name",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "appId",
+      "inputType": "input",
+      "code": "appId",
+      "whereCondition": "equal"
+    }
+  ],
   "columns":[
     {
       "code":"name",
-      "cnCode":"搴旂敤鍚嶇О",
-      "desc":"蹇呭~锛岃濉啓搴旂敤鍚嶇О",
+      "cnCode":"灏忕▼搴忓悕绉�",
+      "desc":"蹇呭~锛岃濉啓灏忕▼搴忓悕绉�",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "input",
+      "limit":"max",
+      "limitParam":"1,100",
+      "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
+      "show": true
+    },
+    {
+      "code": "appId",
+      "cnCode":"appId",
+      "desc":"蹇呭~锛岃濉啓appId",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"2,50",
-      "limitErrInfo":"搴旂敤鍚嶇О蹇呴』鍦�2鑷�50瀛楃涔嬮棿"
+      "limitParam":"1,100",
+      "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
+      "show": true
     },
     {
-      "code":"securityCode",
-      "cnCode":"绉橀挜",
-      "desc":"鍙~锛岃濉啓绉橀挜锛屽鏋滃~鍐欎簡闇�瑕佸姞瀵嗕紶杈�",
-      "required":false,
+      "code":"appSecret",
+      "cnCode":"搴旂敤瀵嗛挜",
+      "desc":"蹇呭~锛岃濉啓搴旂敤瀵嗛挜",
+      "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"绉橀挜澶暱瓒呰繃64浣�"
+      "inputType": "input",
+      "limit":"maxin",
+      "limitParam":"1,200",
+      "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     },
     {
-      "code":"whileListIp",
-      "cnCode":"鐧藉悕鍗�",
-      "desc":"鍙~锛岃濉啓鐧藉悕鍗旾P锛屼互锛屽彿鍒嗗壊",
-      "required":false,
+      "code": "payPassword",
+      "cnCode":"鏀粯瀵嗙爜",
+      "desc":"蹇呭~锛岃濉啓鏀粯瀵嗙爜",
+      "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"鐧藉悕鍗曞唴瀹逛笉鑳借秴杩�200"
-    },
-    {
-      "code":"blackListIp",
-      "cnCode":"榛戝悕鍗�",
-      "desc":"鍙~锛岃濉啓榛戝悕鍗旾P锛屼互锛屽彿鍒嗗壊",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"榛戝悕鍗曞唴瀹逛笉鑳借秴杩�200"
-    },
-
-    {
-      "code":"remark",
-      "cnCode":"澶囨敞",
-      "desc":"鍙~锛岃濉啓澶囨敞",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"澶囨敞鍐呭涓嶈兘瓒呰繃200"
+      "inputType": "input",
+      "limit":"maxin",
+      "limitParam":"1,200",
+      "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     }
-
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0