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 | 185 +++++++++-------------------------------------
1 files changed, 37 insertions(+), 148 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 270bf8f..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,183 +1,72 @@
{
- "templateName":"鏈嶅姟",
- "templateCode":"service",
- "templateKey":"serviceId",
- "templateKeyName":"鏈嶅姟ID",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
"searchCode": "name",
- "searchName": "鏈嶅姟鍚嶇О",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "搴旂敤鍚嶇О",
- "inputType": "choose",
- "componentName": "chooseApp",
- "code": "appName",
- "key": "appId",
+ "name": "灏忕▼搴忓悕绉�",
+ "inputType": "input",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "鏈嶅姟鍚嶇О",
+ "name": "appId",
"inputType": "input",
- "code": "serviceName",
- "whereCondition": "like"
- },
- {
- "name": "鏈嶅姟缂栫爜",
- "inputType": "input",
- "code": "serviceCode",
- "whereCondition": "like"
- },
- {
- "name": "璋冪敤鍦板潃",
- "inputType": "input",
- "code": "serviceUrl",
- "whereCondition": "like"
+ "code": "appId",
+ "whereCondition": "equal"
}
],
"columns":[
{
"code":"name",
- "cnCode":"鏈嶅姟鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鏈嶅姟鍚嶇О",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"鏈嶅姟鍚嶇О涓嶈兘瓒呰繃50",
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code":"serviceCode",
- "cnCode":"鏈嶅姟缂栫爜",
- "desc":"蹇呭～锛岃濉啓鏈嶅姟缂栫爜濡� service.saveService",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
+ "inputType": "input",
"limit":"maxin",
- "limitParam":"2,50",
- "limitErrInfo":"鏈嶅姟缂栫爜蹇呴』鍦�2鑷�50瀛楃涔嬮棿",
+ "limitParam":"1,100",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code":"businessTypeCd",
- "cnCode":"绉橀挜",
- "desc":"鍙～锛岃濉啓绉橀挜锛屽鏋滃～鍐欎簡闇�瑕佸姞瀵嗕紶杈�",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
- "hasDefaultValue":true,
- "defaultValue":"API",
- "inputType":"none",
+ "hasDefaultValue":false,
+ "inputType": "input",
"limit":"maxin",
- "limitParam":"2,4",
- "limitErrInfo":"涓氬姟绫诲瀷蹇呴』涓篈PI",
- "show": false
- },
-
- {
- "code":"seq",
- "cnCode":"搴忓垪",
- "desc":"蹇呭～锛岃濉啓搴忓垪",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"1",
- "inputType":"none",
- "limit":"maxLength",
- "limitParam":"1",
- "limitErrInfo":"搴忓垪鏍煎紡閿欒",
- "show": false
- },
- {
- "code":"messageQueueName",
- "cnCode":"娑堟伅闃熷垪",
- "desc":"鍙～锛岃濉啓娑堟伅闃熷垪锛岃鍗曞湪寮傛璋冪敤鏃朵娇鐢�",
- "required":false,
- "hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"娑堟伅闃熷垪涓嶈兘瓒呰繃50",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
},
{
- "code":"isInstance",
- "cnCode":"鏄惁瀹炰緥",
- "desc":"鍙～锛岃濉啓瀹炰緥 Y 鎴朜",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"Y",
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"瀹炰緥涓嶈兘瓒呰繃50",
- "show": false
- }
- ,
-
- {
- "code":"url",
- "cnCode":"璋冪敤鍦板潃",
- "desc":"鍙～锛岃濉啓璋冪敤鍦板潃",
- "required":false,
- "hasDefaultValue":true,
- "defaultValue":"http://order-service/orderApi/service",
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"璋冪敤鍦板潃涓嶈兘瓒呰繃200",
- "show": true
- },
- {
- "code":"method",
- "cnCode":"璋冪敤鏂瑰紡",
- "desc":"蹇呭～锛岃濉啓璋冪敤鏂瑰紡",
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
"required":true,
"hasDefaultValue":false,
- "inputType":"select",
- "selectValue":"GET,POST",
- "selectValueName":"http get,http post",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"璋冪敤鏂瑰紡涓嶈兘瓒呰繃50",
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
- },
- {
- "code":"timeout",
- "cnCode":"瓒呮椂鏃堕棿",
- "desc":"蹇呭～锛岃濉啓瓒呮椂鏃堕棿",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"60",
- "inputType":"input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"瓒呮椂鏃堕棿蹇呴』涓烘暟瀛�",
- "show": false
- },
- {
- "code":"retryCount",
- "cnCode":"閲嶈瘯娆℃暟",
- "desc":"蹇呭～锛岃濉啓閲嶈瘯娆℃暟",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"3",
- "inputType":"input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�",
- "show": false
- },
- {
- "code":"provideAppId",
- "cnCode":"鎻愪緵鏈嶅姟",
- "desc":"蹇呭～锛岃濉啓鎻愪緵鏈嶅姟",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"8000418002",
- "inputType":"none",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�",
- "show": false
}
]
}
\ No newline at end of file
--
Gitblit v1.8.0