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 | 122 +++++++++++-----------------------------
1 files changed, 33 insertions(+), 89 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 fb8806f..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,127 +1,71 @@
{
- "templateName":"鏃ц揣",
- "templateCode":"junkRequirement",
- "templateKey":"junkRequirementId",
- "templateKeyName":"鏃ц揣缂栫爜",
- "searchCode": "junkRequirementId",
- "searchName": "鏃ц揣缂栫爜",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
+ "searchCode": "name",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "绫诲埆",
- "inputType": "select",
- "selectValue":"10001,10002",
- "selectValueName":"瀹跺叿,鐢靛櫒",
- "code": "classification",
- "whereCondition": "equal"
- },
- {
- "name": "鍙戝竷浜�",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
- "code": "publishUserName",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "鐘舵��",
- "inputType": "select",
- "selectValue":"12001,13001,14001,15001",
- "selectValueName":"鏈鏍�,瀹℃牳閫氳繃,瀹℃牳澶辫触,澶勭悊瀹屾垚",
- "code": "publishUserLink",
- "whereCondition": "equal"
- },
- {
- "name": "鍙戝竷鐢佃瘽",
+ "name": "appId",
"inputType": "input",
- "code": "publishUserLink",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
- "code":"classification",
- "cnCode":"绫诲埆",
- "desc":"蹇呭～锛岃閫夋嫨绫诲埆",
+ "code":"name",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"10001,10002",
- "selectValueName":"瀹跺叿,鐢靛櫒",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"浠诲姟缂栫爜鏍煎紡閿欒",
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code": "inspectionPlanId",
- "cnCode":"宸℃璁″垝",
- "desc":"蹇呭～锛岃濉啓鏀惰垂椤圭洰",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
"limit":"maxin",
"limitParam":"1,100",
- "limitErrInfo":"鏀惰垂椤圭洰涓嶈兘瓒呰繃100浣�",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code":"context",
- "cnCode":"鍐呭",
- "desc":"蹇呭～锛岃閫夋嫨鍐呭",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鍐呭涓嶈兘瓒呰繃200涓瓧绗�",
- "show": false
- },
- {
- "code": "referencePrice",
- "cnCode":"鍙傝�冧环鏍�",
- "desc":"蹇呭～锛岃濉啓鍙傝�冧环鏍�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"money",
- "limitParam":"",
- "limitErrInfo":"鍙傝�冧环鏍兼牸寮忛敊璇�",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
},
{
- "code": "publishUserName",
- "cnCode":"鍙戝竷浜�",
- "desc":"蹇呭～锛屽彂甯冧汉涓嶈兘涓虹┖",
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"鍙戝竷浜轰笉鑳借秴杩�50",
- "show": true
- },
- {
- "code":"publishUserLink",
- "cnCode":"鑱旂郴鏂瑰紡",
- "desc":"蹇呭～锛岃濉啓鑱旂郴鏂瑰紡",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"鑱旂郴鏂瑰紡涓嶆槸鏈夋晥鐨勭數璇濇牸寮�",
- "show": true
- },
- {
- "code":"state",
- "cnCode":"鐘舵��",
- "desc":"蹇呭～锛岃濉啓鐘舵��",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"12001,13001,14001,15001",
- "selectValueName":"鏈鏍�,瀹℃牳閫氳繃,瀹℃牳澶辫触,澶勭悊瀹屾垚",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鐘舵�佹牸寮忛敊璇�",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
}
]
--
Gitblit v1.8.0