From c9b60458218aeda1cf8947b189d698b208b088c5 Mon Sep 17 00:00:00 2001 From: wubin Date: Mon, 24 Aug 2020 15:28:23 +0800 Subject: [PATCH] update --- dsSupport/Html/AccessSystemIcon/占位.txt | 1 - .../970F16C2-393F-4FE1-92CA-2AC6EDED3961.jpg | Bin 0 -> 36082 bytes .../AccessSystemController.go | 39 +++++++++++------- dsSupport/Utils/ConfigUtil/ConfigUtil.go | 6 +-- 4 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 dsSupport/Html/AccessSystemIcon/占位.txt create mode 100644 dsSupport/Html/Icon/970F16C2-393F-4FE1-92CA-2AC6EDED3961.jpg diff --git a/dsSupport/Html/AccessSystemIcon/占位.txt b/dsSupport/Html/AccessSystemIcon/占位.txt deleted file mode 100644 index 56a6051c..00000000 --- a/dsSupport/Html/AccessSystemIcon/占位.txt +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/dsSupport/Html/Icon/970F16C2-393F-4FE1-92CA-2AC6EDED3961.jpg b/dsSupport/Html/Icon/970F16C2-393F-4FE1-92CA-2AC6EDED3961.jpg new file mode 100644 index 0000000000000000000000000000000000000000..29f37fa7f8bfa3720aed5dec1c8fb9919e563891 GIT binary patch literal 36082 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 s1lj4V5EYul^7J*_LaOrvLx| literal 0 HcmV?d00001 diff --git a/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go b/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go index a60df640..a531ac5f 100644 --- a/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go +++ b/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/gin-gonic/gin" "net/http" + "os" "strings" ) @@ -38,7 +39,7 @@ func Routers(r *gin.RouterGroup) { // @Param page query int true "第几页" // @Param limit query int true "一页显示多少条" // @Success 200 {object} Model.Res -// @Router /base/support/PageAccessSystemInfo [get] +// @Router /support/accessSystem/PageAccessSystemInfo [get] // @X-EmptyLimit ["page","limit"] // @X-IntRangeLimit [{"page":"1,1000"},{"limit":"1,1000"}] // @X-TableName ["t_app_base"] @@ -75,7 +76,7 @@ func PageAccessSystemInfo(c *gin.Context) { // @Param appCode formData string true "系统编码" // @Param sortId formData int false "排序号" // @Success 200 {object} Model.Res -// @Router /base/support/AddAccessSystemInfo [post] +// @Router /support/accessSystem/AddAccessSystemInfo [post] // @X-EmptyLimit ["appName","appCode"] // @X-LengthLimit [{"appName":"2,30"},{"appCode":"2,20"}] // @X-TableName ["t_app_base"] @@ -111,7 +112,7 @@ func AddAccessSystemInfo(c *gin.Context) { // @Param appCode formData string true "系统编码" // @Param sortId formData int false "排序号" // @Success 200 {object} Model.Res -// @Router /base/support/UpdateAccessSystemInfo [post] +// @Router /support/accessSystem/UpdateAccessSystemInfo [post] // @X-EmptyLimit ["appId","appName","appCode"] // @X-LengthLimit [{"appId":"36,36"},{"appName":"2,30"},{"appCode":"2,20"}] // @X-TableName ["t_app_base"] @@ -146,7 +147,7 @@ func UpdateAccessSystemInfo(c *gin.Context) { // @Produce json // @Param appId formData string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/DeleteAccessSystemInfo [post] +// @Router /support/accessSystem/DeleteAccessSystemInfo [post] // @X-EmptyLimit ["appId"] // @X-LengthLimit [{"appId":"36,36"}] // @X-TableName ["t_app_base"] @@ -175,7 +176,7 @@ func DeleteAccessSystemInfo(c *gin.Context) { // @Produce json // @Param appId query string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/GetAccessSystemRangeInfo [get] +// @Router /support/accessSystem/GetAccessSystemRangeInfo [get] // @X-EmptyLimit ["appId"] // @X-LengthLimit [{"appId":"36,36"}] // @X-TableName ["t_app_base"] @@ -183,6 +184,7 @@ func DeleteAccessSystemInfo(c *gin.Context) { func GetAccessSystemRangeInfo(c *gin.Context) { //系统ID appId := c.Query("appId") + fmt.Println(appId) } // @Summary 设置接入系统的使用范围 @@ -193,7 +195,7 @@ func GetAccessSystemRangeInfo(c *gin.Context) { // @Param appId formData string true "系统ID" // @Param rangeCode formData string true "使用范围的行政区划码、单位ID,多个用逗号分隔" // @Success 200 {object} Model.Res -// @Router /base/support/SettingAccessSystemRange [post] +// @Router /support/accessSystem/SettingAccessSystemRange [post] // @X-EmptyLimit ["orgId","rangeCode"] // @X-LengthLimit [{"orgId":"36,36"},{"rangeCode":"1,3700"}] // @X-TableName ["t_app_base"] @@ -229,7 +231,7 @@ func SettingAccessSystemRangeInfo(c *gin.Context) { // @Produce json // @Param appId query string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/GetAccessSystemSsoInfo [get] +// @Router /support/accessSystem/GetAccessSystemSsoInfo [get] // @X-EmptyLimit ["appId"] // @X-LengthLimit [{"appId":"36,36"}] // @X-TableName ["t_app_base"] @@ -261,7 +263,7 @@ func GetAccessSystemSsoInfo(c *gin.Context) { // @Param redirectUri formData string true "统一认证回调地址" // @Param logoutUri formData string false "统一认证登出地址" // @Success 200 {object} Model.Res -// @Router /base/support/SettingAccessSystemSsoInfo [post] +// @Router /support/accessSystem/SettingAccessSystemSsoInfo [post] // @X-EmptyLimit ["appId","redirectUri"] // @X-LengthLimit [{"appId":"36,36"},{"redirectUri":"2,300"},{"logoutUri":"2,300"}] // @X-TableName ["t_app_base"] @@ -297,7 +299,7 @@ func SettingAccessSystemSsoInfo(c *gin.Context) { // @Produce json // @Param appId formData string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/EmptyAccessSystemSsoInfo [post] +// @Router /support/accessSystem/EmptyAccessSystemSsoInfo [post] // @X-EmptyLimit ["orgId"] // @X-LengthLimit [{"orgId":"36,36"}] // @X-TableName ["t_app_base"] @@ -327,7 +329,7 @@ func EmptyAccessSystemSsoInfo(c *gin.Context) { // @Produce json // @Param appId query string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/GetAccessSystemIntegratedInfo [get] +// @Router /support/accessSystem/GetAccessSystemIntegratedInfo [get] // @X-EmptyLimit ["appId"] // @X-LengthLimit [{"appId":"36,36"}] // @X-TableName ["t_app_base"] @@ -360,7 +362,7 @@ func GetAccessSystemIntegratedInfo(c *gin.Context) { // @Param appUrl formData string true "接入系统在集成页面的调用地址" // @Param appIcon formData file true "接入系统在集成页面的图标" // @Success 200 {object} Model.Res -// @Router /base/support/SettingAccessSystemIntegratedInfo [post] +// @Router /support/accessSystem/SettingAccessSystemIntegratedInfo [post] // @X-EmptyLimit ["appId","redirectUri"] // @X-LengthLimit [{"appId":"36,36"},{"redirectUri":"2,300"},{"logoutUri":"2,300"}] // @X-TableName ["t_app_base"] @@ -371,12 +373,17 @@ func SettingAccessSystemIntegratedInfo(c *gin.Context) { //接入系统在集成页面的调用地址 redirectUri := c.PostForm("redirectUri") //接入系统在集成页面的图标 - header, _ := c.FormFile("excelFile") + header, _ := c.FormFile("icon") + rootPath, _ := os.Getwd() + iconDir := rootPath + "/Html/Icon/" //生成图标的ID - //iconFileId := CommonUtil.GetUUID() - fmt.Println(header) + iconFileId := CommonUtil.GetUUID() + iconFileName := strings.Split(header.Filename, ".")[1] + iconPath := iconDir + iconFileId + "." + iconFileName + //保存图标 + c.SaveUploadedFile(header, iconPath) - err := AccessSystemDao.UpdateIntegration(appId, redirectUri, "") + err := AccessSystemDao.UpdateIntegration(appId, redirectUri, "/dsSupport/Icon/"+iconFileName) if err != nil { c.JSON(http.StatusOK, Model.Res{ @@ -399,7 +406,7 @@ func SettingAccessSystemIntegratedInfo(c *gin.Context) { // @Produce json // @Param appId formData string true "系统ID" // @Success 200 {object} Model.Res -// @Router /base/support/EmptyAccessSystemIntegratedInfo [post] +// @Router /support/accessSystem/EmptyAccessSystemIntegratedInfo [post] // @X-EmptyLimit ["orgId"] // @X-LengthLimit [{"orgId":"36,36"}] // @X-TableName ["t_app_base"] diff --git a/dsSupport/Utils/ConfigUtil/ConfigUtil.go b/dsSupport/Utils/ConfigUtil/ConfigUtil.go index 37529fe8..84823875 100644 --- a/dsSupport/Utils/ConfigUtil/ConfigUtil.go +++ b/dsSupport/Utils/ConfigUtil/ConfigUtil.go @@ -32,8 +32,8 @@ var ( StartPathWindows string StartPathLinux string - // rpc 服务器的暴露地址 - RpcServerPort string + //服务器的端口 + ServerPort string //项目名称 ProjectName string @@ -88,7 +88,7 @@ func init() { RedisExpireTime = iniParser.GetInt64("redis", "expireTime") //rpc连接池大小 - RpcServerPort = iniParser.GetString("rpcServer", "port") + ServerPort = iniParser.GetString("server", "port") //项目名称 ProjectName = iniParser.GetString("project", "project_name")