From b784175e978b0fcfca8ca8bed7953ae4eacf49e8 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 02 九月 2019 20:18:58 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-code-generator/src/main/resources/web/template_1.json |  220 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 113 insertions(+), 107 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 e4565d6..d42dd21 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/java110-code-generator/src/main/resources/web/template_1.json
@@ -1,10 +1,39 @@
 {
-  "templateName":"鏈嶅姟",
-  "templateCode":"service",
-  "templateKey":"serviceId",
-  "templateKeyName":"鏈嶅姟ID",
+  "templateName":"鏈嶅姟鎻愪緵",
+  "templateCode":"serviceProvide",
+  "templateKey":"id",
+  "templateKeyName":"鎻愪緵ID",
   "searchCode": "name",
   "searchName": "鏈嶅姟鍚嶇О",
+  "conditions": [
+
+    {
+      "name": "鎻愪緵ID",
+      "inputType": "input",
+      "code": "id",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "鏈嶅姟缂栫爜",
+      "inputType": "input",
+      "code": "serviceCode",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "鏈嶅姟鍚嶇О",
+      "inputType": "input",
+      "code": "name",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "瀹炵幇鏂瑰紡",
+      "inputType": "select",
+      "code": "queryModel",
+      "selectValue":"1,3,2",
+      "selectValueName":"sql鏂瑰紡,java鏂瑰紡,瀛樺偍杩囩▼鏂瑰紡",
+      "whereCondition": "equal"
+    }
+  ],
   "columns":[
     {
       "code":"name",
@@ -13,136 +42,113 @@
       "required":true,
       "hasDefaultValue":false,
       "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"50",
-      "limitErrInfo":"鏈嶅姟鍚嶇О涓嶈兘瓒呰繃50"
+      "limit":"maxin",
+      "limitParam":"2,50",
+      "limitErrInfo":"鏈嶅姟鍚嶇О蹇呴』鍦�2鑷�50瀛楃涔嬮棿",
+      "show": true
     },
     {
       "code":"serviceCode",
       "cnCode":"鏈嶅姟缂栫爜",
-      "desc":"蹇呭~锛岃濉啓鏈嶅姟缂栫爜濡� service.saveService",
+      "desc":"蹇呭~锛岃濉啓鏈嶅姟缂栫爜",
       "required":true,
       "hasDefaultValue":false,
       "inputType":"input",
       "limit":"maxin",
       "limitParam":"2,50",
-      "limitErrInfo":"鏈嶅姟缂栫爜蹇呴』鍦�2鑷�50瀛楃涔嬮棿"
+      "limitErrInfo":"鏈嶅姟缂栫爜蹇呴』鍦�2鑷�50瀛楃涔嬮棿",
+      "show": true
     },
     {
-      "code":"businessTypeCd",
-      "cnCode":"绉橀挜",
-      "desc":"鍙~锛岃濉啓绉橀挜锛屽鏋滃~鍐欎簡闇�瑕佸姞瀵嗕紶杈�",
+      "code":"params",
+      "cnCode":"鍙傛暟",
+      "desc":"蹇呭~锛岃濉啓鍙傛暟",
       "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"API",
-      "inputType":"none",
-      "limit":"maxin",
-      "limitParam":"2,4",
-      "limitErrInfo":"涓氬姟绫诲瀷蹇呴』涓篈PI"
-    },
-
-    {
-      "code":"seq",
-      "cnCode":"搴忓垪",
-      "desc":"蹇呭~锛岃濉啓搴忓垪",
-      "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"1",
-      "inputType":"none",
-      "limit":"maxLength",
-      "limitParam":"1",
-      "limitErrInfo":"搴忓垪鏍煎紡閿欒"
-    },
-
-    {
-      "code":"messageQueueName",
-      "cnCode":"娑堟伅闃熷垪",
-      "desc":"鍙~锛岃濉啓娑堟伅闃熷垪锛岃鍗曞湪寮傛璋冪敤鏃朵娇鐢�",
-      "required":false,
       "hasDefaultValue":false,
-      "defaultValue":"",
       "inputType":"input",
       "limit":"maxLength",
-      "limitParam":"50",
-      "limitErrInfo":"娑堟伅闃熷垪涓嶈兘瓒呰繃50"
-    }
-  ,
-
-    {
-      "code":"isInstance",
-      "cnCode":"鏄惁瀹炰緥",
-      "desc":"鍙~锛岃濉啓瀹炰緥 Y 鎴朜",
-      "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"Y",
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"50",
-      "limitErrInfo":"瀹炰緥涓嶈兘瓒呰繃50"
-    }
-  ,
-
-    {
-      "code":"url",
-      "cnCode":"璋冪敤鍦板潃",
-      "desc":"鍙~锛岃濉啓璋冪敤鍦板潃",
-      "required":false,
-      "hasDefaultValue":true,
-      "defaultValue":"http://order-service/orderApi/service",
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"璋冪敤鍦板潃涓嶈兘瓒呰繃200"
+      "limitParam":"500",
+      "limitErrInfo":"鍙傛暟鍐呭涓嶈兘瓒呰繃200",
+      "show": true
     },
     {
-      "code":"method",
-      "cnCode":"璋冪敤鏂瑰紡",
-      "desc":"蹇呭~锛岃濉啓璋冪敤鏂瑰紡",
+      "code":"queryModel",
+      "cnCode":"瀹炵幇鏂瑰紡",
+      "desc":"蹇呭~锛岃閫夋嫨鏄惁鏄剧ず鑿滃崟",
       "required":true,
       "hasDefaultValue":false,
       "inputType":"select",
-      "selectValue":"GET,POST",
-      "selectValueName":"http get,http post",
+      "selectValue":"1,3,2",
+      "selectValueName":"sql鏂瑰紡,java鏂瑰紡,瀛樺偍杩囩▼鏂瑰紡",
+      "limit":"maxin",
+      "limitParam":"1,12",
+      "limitErrInfo":"瀹炵幇鏂瑰紡閿欒",
+      "show": true
+    },
+    {
+      "code":"sql",
+      "cnCode":"sql",
+      "desc":"鍙~锛岃濉啓sql",
+      "required":false,
+      "hasDefaultValue":false,
+      "defaultValue":"",
+      "inputType":"textarea",
       "limit":"maxLength",
-      "limitParam":"50",
-      "limitErrInfo":"璋冪敤鏂瑰紡涓嶈兘瓒呰繃50"
+      "limitParam":"2000",
+      "limitErrInfo":"sql涓嶈兘瓒呰繃2000",
+      "show": false
     },
     {
-      "code":"timeout",
-      "cnCode":"瓒呮椂鏃堕棿",
-      "desc":"蹇呭~锛岃濉啓瓒呮椂鏃堕棿",
-      "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"60",
-      "inputType":"input",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"瓒呮椂鏃堕棿蹇呴』涓烘暟瀛�"
+      "code":"template",
+      "cnCode":"杈撳嚭妯℃澘",
+      "desc":"鍙~锛岃濉啓杈撳嚭妯℃澘",
+      "required":false,
+      "hasDefaultValue":false,
+      "defaultValue":"",
+      "inputType":"textarea",
+      "limit":"maxLength",
+      "limitParam":"2000",
+      "limitErrInfo":"杈撳嚭妯℃澘涓嶈兘瓒呰繃2000",
+      "show": false
     },
     {
-      "code":"retryCount",
-      "cnCode":"閲嶈瘯娆℃暟",
-      "desc":"蹇呭~锛岃濉啓閲嶈瘯娆℃暟",
-      "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"3",
-      "inputType":"input",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�"
+      "code":"proc",
+      "cnCode":"瀛樺偍杩囩▼",
+      "desc":"鍙~锛岃濉啓瀛樺偍杩囩▼",
+      "required":false,
+      "hasDefaultValue":false,
+      "defaultValue":"",
+      "inputType":"textarea",
+      "limit":"maxLength",
+      "limitParam":"200",
+      "limitErrInfo":"瀛樺偍杩囩▼涓嶈兘瓒呰繃200",
+      "show": false
     },
     {
-      "code":"provideAppId",
-      "cnCode":"鎻愪緵鏈嶅姟",
-      "desc":"蹇呭~锛岃濉啓鎻愪緵鏈嶅姟",
-      "required":true,
-      "hasDefaultValue":true,
-      "defaultValue":"8000418002",
-      "inputType":"none",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"閲嶈瘯娆℃暟蹇呴』涓烘暟瀛�"
+      "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