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 |  158 ++++++++++++----------------------------------------
 1 files changed, 38 insertions(+), 120 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 d42dd21..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,154 +1,72 @@
 {
-  "templateName":"鏈嶅姟鎻愪緵",
-  "templateCode":"serviceProvide",
-  "templateKey":"id",
-  "templateKeyName":"鎻愪緵ID",
+  "templateName":"灏忕▼搴忕鐞�",
+  "templateCode":"smallWeChat",
+  "templateKey":"weChatId",
+  "templateKeyName":"缂栫爜",
   "searchCode": "name",
-  "searchName": "鏈嶅姟鍚嶇О",
+  "searchName": "灏忕▼搴忓悕绉�",
   "conditions": [
-
     {
-      "name": "鎻愪緵ID",
-      "inputType": "input",
-      "code": "id",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "鏈嶅姟缂栫爜",
-      "inputType": "input",
-      "code": "serviceCode",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "鏈嶅姟鍚嶇О",
+      "name": "灏忕▼搴忓悕绉�",
       "inputType": "input",
       "code": "name",
       "whereCondition": "equal"
     },
     {
-      "name": "瀹炵幇鏂瑰紡",
-      "inputType": "select",
-      "code": "queryModel",
-      "selectValue":"1,3,2",
-      "selectValueName":"sql鏂瑰紡,java鏂瑰紡,瀛樺偍杩囩▼鏂瑰紡",
+      "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":"serviceCode",
-      "cnCode":"鏈嶅姟缂栫爜",
-      "desc":"蹇呭~锛岃濉啓鏈嶅姟缂栫爜",
+      "code":"appSecret",
+      "cnCode":"搴旂敤瀵嗛挜",
+      "desc":"蹇呭~锛岃濉啓搴旂敤瀵嗛挜",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"2,50",
-      "limitErrInfo":"鏈嶅姟缂栫爜蹇呴』鍦�2鑷�50瀛楃涔嬮棿",
+      "limitParam":"1,200",
+      "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
       "show": true
     },
     {
-      "code":"params",
-      "cnCode":"鍙傛暟",
-      "desc":"蹇呭~锛岃濉啓鍙傛暟",
+      "code": "payPassword",
+      "cnCode":"鏀粯瀵嗙爜",
+      "desc":"蹇呭~锛岃濉啓鏀粯瀵嗙爜",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"500",
-      "limitErrInfo":"鍙傛暟鍐呭涓嶈兘瓒呰繃200",
-      "show": true
-    },
-    {
-      "code":"queryModel",
-      "cnCode":"瀹炵幇鏂瑰紡",
-      "desc":"蹇呭~锛岃閫夋嫨鏄惁鏄剧ず鑿滃崟",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType":"select",
-      "selectValue":"1,3,2",
-      "selectValueName":"sql鏂瑰紡,java鏂瑰紡,瀛樺偍杩囩▼鏂瑰紡",
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"1,12",
-      "limitErrInfo":"瀹炵幇鏂瑰紡閿欒",
+      "limitParam":"1,200",
+      "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
       "show": true
-    },
-    {
-      "code":"sql",
-      "cnCode":"sql",
-      "desc":"鍙~锛岃濉啓sql",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"2000",
-      "limitErrInfo":"sql涓嶈兘瓒呰繃2000",
-      "show": false
-    },
-    {
-      "code":"template",
-      "cnCode":"杈撳嚭妯℃澘",
-      "desc":"鍙~锛岃濉啓杈撳嚭妯℃澘",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"2000",
-      "limitErrInfo":"杈撳嚭妯℃澘涓嶈兘瓒呰繃2000",
-      "show": false
-    },
-    {
-      "code":"proc",
-      "cnCode":"瀛樺偍杩囩▼",
-      "desc":"鍙~锛岃濉啓瀛樺偍杩囩▼",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"瀛樺偍杩囩▼涓嶈兘瓒呰繃200",
-      "show": false
-    },
-    {
-      "code":"javaScript",
-      "cnCode":"java",
-      "desc":"鍙~锛岃濉啓java璇彞",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"2000",
-      "limitErrInfo":"java涓嶈兘瓒呰繃2000",
-      "show": false
-    },
-    {
-      "code":"remark",
-      "cnCode":"鎻忚堪",
-      "desc":"鍙~锛岃濉啓鎻忚堪",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"textarea",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"澶囨敞鍐呭涓嶈兘瓒呰繃200",
-      "show": false
     }
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0