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 | 138 +++++++++++++--------------------------------
1 files changed, 40 insertions(+), 98 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 05a6ef3..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,129 +1,71 @@
{
- "templateName":"璁惧",
- "templateCode":"machine",
- "templateKey":"machineId",
- "templateKeyName":"璁惧ID",
- "searchCode": "machineName",
- "searchName": "璁惧鍚嶇О",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
+ "searchCode": "name",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "璁惧缂栫爜",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
- "code": "machineCode",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "璁惧绫诲瀷",
- "inputType": "select",
- "code": "machineTypeCd",
- "selectValue":"9999,9998",
- "selectValueName":"閿愮洰闂ㄧ,鍏朵粬",
- "whereCondition": "equal"
- },
- {
- "name": "璁惧鍚嶇О",
+ "name": "appId",
"inputType": "input",
- "code": "machineName",
- "whereCondition": "equal"
- },
- {
- "name": "璁惧IP",
- "inputType": "input",
- "code": "machineIp",
- "whereCondition": "equal"
- },
- {
- "name": "璁惧MAC",
- "inputType": "input",
- "code": "machineMac",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
- "code":"machineCode",
- "cnCode":"璁惧缂栫爜",
- "desc":"蹇呭～锛岃濉啓璁惧缂栫爜",
+ "code":"name",
+ "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":"1,30",
- "limitErrInfo":"璁惧缂栫爜涓嶈兘瓒呰繃30浣�",
+ "limitParam":"1,100",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code": "machineVersion",
- "cnCode":"鐗堟湰鍙�",
- "desc":"蹇呭～锛岃濉啓璁惧鐗堟湰鍙�",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limitParam":"1,30",
- "limitParam":"",
- "limitErrInfo":"璁惧鐗堟湰鍙蜂笉鑳借秴杩�30浣�",
- "show": true
- },
- {
- "code": "machineName",
- "cnCode":"璁惧鍚嶇О",
- "desc":"蹇呭～锛岃濉啓璁惧鍚嶇О",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
+ "limit":"maxin",
"limitParam":"1,200",
- "limitParam":"",
- "limitErrInfo":"璁惧鍚嶇О涓嶈兘瓒呰繃200浣�",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
},
{
- "code":"machineTypeCd",
- "cnCode":"璁惧绫诲瀷",
- "desc":"蹇呭～锛岃閫夋嫨璁惧绫诲瀷",
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
"required":true,
"hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"9999,9998",
- "selectValueName":"閿愮洰闂ㄧ,鍏朵粬",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"璁惧绫诲瀷鏍煎紡閿欒",
- "show": true
- },
- {
- "code":"authCode",
- "cnCode":"閴存潈缂栫爜",
- "desc":"蹇呭～锛岃濉啓閴存潈缂栫爜",
- "required":true,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"閴存潈缂栫爜涓嶈兘澶т簬64浣�",
- "show": false
- },
- {
- "code":"machineIp",
- "cnCode":"璁惧IP",
- "desc":"鍙�夛紝璇峰～鍐欒澶嘔P",
- "required":false,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"璁惧IP鏍煎紡閿欒",
- "show": true
- },
- {
- "code":"machineMac",
- "cnCode":"璁惧MAC",
- "desc":"鍙�夛紝璇峰～鍐欒澶嘙AC",
- "required":false,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"璁惧MAC 鏍煎紡閿欒",
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
}
]
--
Gitblit v1.8.0