diff --git a/dsBaseWeb/Shell/debug.sh b/dsBaseWeb/Shell/debug.sh index f7cf475e..24870d44 100644 --- a/dsBaseWeb/Shell/debug.sh +++ b/dsBaseWeb/Shell/debug.sh @@ -8,4 +8,3 @@ cd /usr/local/dsMin/dsBaseWeb chmod +x dsBaseWeb # 运行为后台进程1 /usr/local/dsMin/dsBaseWeb/dsBaseWeb - diff --git a/dsBaseWeb/Shell/start.sh b/dsBaseWeb/Shell/start.sh index 464ba261..a40bd0ae 100644 --- a/dsBaseWeb/Shell/start.sh +++ b/dsBaseWeb/Shell/start.sh @@ -1,6 +1,5 @@ #!/bin/bash - # 杀掉进程 kill -9 `pgrep -f dsBaseWeb` 2>/dev/null sleep 3 @@ -8,4 +7,3 @@ sleep 3 chmod +x dsBaseWeb # 运行为后台进程 nohup /usr/local/dsMin/dsBaseWeb/dsBaseWeb >> /usr/local/dsMin/dsBaseWeb/dsBaseWeb.log 2>&1 & - diff --git a/dsBaseWeb/Shell/stop.sh b/dsBaseWeb/Shell/stop.sh index aca22ae8..2cdb3683 100644 --- a/dsBaseWeb/Shell/stop.sh +++ b/dsBaseWeb/Shell/stop.sh @@ -2,4 +2,3 @@ # kill 命令不使用 -9 参数时,会回调 onStop() 方法,确定不需要此回调建议使用 -9 参数 kill -9 `pgrep -f dsBaseWeb` 2>/dev/null - diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 412f1def..2047c6f6 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -1987,12 +1987,12 @@ var doc = `{ "version": "1.0" }, "paths": { - "/base/business/UpdateBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2000,13 +2000,6 @@ var doc = `{ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2020,20 +2013,16 @@ var doc = `{ } } }, - "summary": "修改业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { "businessCode": "6,6" - }, - { - "businessName": "1:50" } ], "x-rolelimit": [ @@ -2041,19 +2030,26 @@ var doc = `{ ] } }, - "/base/business/GetBaseBusiness": { + "/base/business/PageBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", + "description": "第几页", "in": "query", - "name": "businessCode", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -2067,17 +2063,17 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -2138,12 +2134,12 @@ var doc = `{ ] } }, - "/base/business/DeleteBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2151,6 +2147,13 @@ var doc = `{ "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2164,16 +2167,20 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { "businessCode": "6,6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2181,26 +2188,19 @@ var doc = `{ ] } }, - "/base/business/PageBaseBusiness": { + "/base/business/GetBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "获取业务系统信息(单条)", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", + "description": "业务系统编码", "in": "query", - "name": "limit", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2214,17 +2214,17 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + } ], "x-rolelimit": [ "1" @@ -6071,7 +6071,7 @@ var doc = `{ "type": "string" }, { - "description": "单位类型 2:学校 7:教辅单位 -1:全部", + "description": "单位类型 1:教育局 2:学校 7:教辅单位 -1:全部", "in": "query", "name": "orgType", "required": true, @@ -6152,7 +6152,7 @@ var doc = `{ "type": "string" }, { - "description": "单位类型 2:学校 7:教辅单位 -1:全部", + "description": "单位类型 1:教育局 2:学校 7:教辅单位 -1:全部", "in": "query", "name": "orgType", "required": true, @@ -7518,12 +7518,12 @@ var doc = `{ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7547,9 +7547,16 @@ var doc = `{ "type": "string" }, { - "description": "学校ID,增加学校时无需传,修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1:全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -7560,11 +7567,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7594,6 +7601,9 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7637,12 +7647,12 @@ var doc = `{ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7666,16 +7676,9 @@ var doc = `{ "type": "string" }, { - "description": "学校办学类型 -1:全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID,增加学校时无需传,修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -7686,11 +7689,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7720,9 +7723,6 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8858,12 +8858,12 @@ var doc = `{ ] } }, - "/base/area/AddGovArea": { + "/base/area/UpdateGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "修改行政区划信息", "parameters": [ { "description": "区域代码", @@ -8905,7 +8905,7 @@ var doc = `{ } } }, - "summary": "增加行政区划信息", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], @@ -8926,7 +8926,7 @@ var doc = `{ "masterCode": "6,6" }, { - "areaName": "3,50" + "areaName": "3:50" } ], "x-rolelimit": [ @@ -8940,19 +8940,40 @@ var doc = `{ ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/AddGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "增加行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" } ], "produces": [ @@ -8966,19 +8987,28 @@ var doc = `{ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" ], "x-intlimit": [ - "areaCode" + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3,50" } ], "x-rolelimit": [ @@ -9041,40 +9071,19 @@ var doc = `{ ] } }, - "/base/area/UpdateGovArea": { - "post": { + "/base/area/GetGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "获取行政区划信息(单条)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", - "required": true, - "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -9088,28 +9097,19 @@ var doc = `{ } } }, - "summary": "修改行政区划信息", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" + "areaCode" ], "x-intlimit": [ - "areaTypeId" + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3:50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index 274851c2..2991da3b 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -1972,12 +1972,12 @@ "version": "1.0" }, "paths": { - "/base/business/UpdateBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -1985,13 +1985,6 @@ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2005,20 +1998,16 @@ } } }, - "summary": "修改业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { "businessCode": "6,6" - }, - { - "businessName": "1:50" } ], "x-rolelimit": [ @@ -2026,19 +2015,26 @@ ] } }, - "/base/business/GetBaseBusiness": { + "/base/business/PageBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", + "description": "第几页", "in": "query", - "name": "businessCode", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -2052,17 +2048,17 @@ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -2123,12 +2119,12 @@ ] } }, - "/base/business/DeleteBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2136,6 +2132,13 @@ "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2149,16 +2152,20 @@ } } }, - "summary": "删除业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { "businessCode": "6,6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2166,26 +2173,19 @@ ] } }, - "/base/business/PageBaseBusiness": { + "/base/business/GetBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "获取业务系统信息(单条)", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", + "description": "业务系统编码", "in": "query", - "name": "limit", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2199,17 +2199,17 @@ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + } ], "x-rolelimit": [ "1" @@ -6056,7 +6056,7 @@ "type": "string" }, { - "description": "单位类型 2:学校 7:教辅单位 -1:全部", + "description": "单位类型 1:教育局 2:学校 7:教辅单位 -1:全部", "in": "query", "name": "orgType", "required": true, @@ -6137,7 +6137,7 @@ "type": "string" }, { - "description": "单位类型 2:学校 7:教辅单位 -1:全部", + "description": "单位类型 1:教育局 2:学校 7:教辅单位 -1:全部", "in": "query", "name": "orgType", "required": true, @@ -7503,12 +7503,12 @@ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7532,9 +7532,16 @@ "type": "string" }, { - "description": "学校ID,增加学校时无需传,修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1:全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -7545,11 +7552,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7579,6 +7586,9 @@ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7622,12 +7632,12 @@ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7651,16 +7661,9 @@ "type": "string" }, { - "description": "学校办学类型 -1:全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID,增加学校时无需传,修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -7671,11 +7674,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7705,9 +7708,6 @@ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8843,12 +8843,12 @@ ] } }, - "/base/area/AddGovArea": { + "/base/area/UpdateGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "修改行政区划信息", "parameters": [ { "description": "区域代码", @@ -8890,7 +8890,7 @@ } } }, - "summary": "增加行政区划信息", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], @@ -8911,7 +8911,7 @@ "masterCode": "6,6" }, { - "areaName": "3,50" + "areaName": "3:50" } ], "x-rolelimit": [ @@ -8925,19 +8925,40 @@ ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/AddGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "增加行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" } ], "produces": [ @@ -8951,19 +8972,28 @@ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" ], "x-intlimit": [ - "areaCode" + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3,50" } ], "x-rolelimit": [ @@ -9026,40 +9056,19 @@ ] } }, - "/base/area/UpdateGovArea": { - "post": { + "/base/area/GetGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "获取行政区划信息(单条)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", - "required": true, - "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -9073,28 +9082,19 @@ } } }, - "summary": "修改行政区划信息", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" + "areaCode" ], "x-intlimit": [ - "areaTypeId" + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3:50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.yaml b/dsBaseWeb/docs/swagger.yaml index 3e38a9a8..11622f7c 100644 --- a/dsBaseWeb/docs/swagger.yaml +++ b/dsBaseWeb/docs/swagger.yaml @@ -2856,7 +2856,7 @@ paths: name: areaCode required: true type: string - - description: 单位类型 2:学校 7:教辅单位 -1:全部 + - description: 单位类型 1:教育局 2:学校 7:教辅单位 -1:全部 in: query name: orgType required: true @@ -2959,7 +2959,7 @@ paths: name: areaCode required: true type: string - - description: 单位类型 2:学校 7:教辅单位 -1:全部 + - description: 单位类型 1:教育局 2:学校 7:教辅单位 -1:全部 in: query name: orgType required: true