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 | 83 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 41 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 bb151ea..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,71 +1,72 @@
{
- "templateName":"鏉冮檺",
- "templateCode":"basePrivilege",
- "templateKey":"pId",
- "templateKeyName":"鏉冮檺ID",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
"searchCode": "name",
- "searchName": "鏉冮檺鍚嶇О",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "鏉冮檺鍚嶇О",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
"code": "name",
- "whereCondition": "like"
- },
- {
- "name": "鏉冮檺缂栫爜",
- "inputType": "input",
- "code": "pId",
"whereCondition": "equal"
},
{
- "name": "鍟嗘埛绫诲瀷",
- "inputType": "select",
- "code": "domain",
- "selectValue":"800900000001,800900000002,800900000003,800900000000",
- "selectValueName":"杩愯惀鍥㈤槦,浠ｇ悊鍟�,鐗╀笟,寮�鍙戝洟闃�",
+ "name": "appId",
+ "inputType": "input",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
"code":"name",
- "cnCode":"鏉冮檺鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鏉冮檺鍚嶇О",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxin",
- "limitParam":"2,10",
- "limitErrInfo":"鏉冮檺鍚嶇О蹇呴』鍦�2鑷�10瀛楃涔嬮棿",
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code":"domain",
- "cnCode":"鍟嗘埛绫诲瀷",
- "desc":"蹇呭～锛岃閫夋嫨鍟嗘埛绫诲瀷",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
- "inputType":"select",
- "selectValue":"800900000001,800900000002,800900000003,800900000000",
- "selectValueName":"杩愯惀鍥㈤槦,浠ｇ悊鍟�,鐗╀笟,寮�鍙戝洟闃�",
+ "inputType": "input",
"limit":"maxin",
- "limitParam":"1,12",
- "limitErrInfo":"鍟嗘埛绫诲瀷閿欒",
+ "limitParam":"1,100",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code":"description",
- "cnCode":"鎻忚堪",
- "desc":"鍙～锛岃濉啓鎻忚堪",
- "required":false,
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
+ "required":true,
"hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"textarea",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"澶囨敞鍐呭涓嶈兘瓒呰繃200",
- "show": false
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
+ },
+ {
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
+ "required":true,
+ "hasDefaultValue":false,
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
}
]
}
\ No newline at end of file
--
Gitblit v1.8.0