From 6e670a95d253ffef6d8baf66adb7bc08e6ea14e3 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:39:07 +0800
Subject: [PATCH] bug修复
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 057538d..6090035 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -5,10 +5,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.*;
import com.matrix.system.app.authority.AppAuthorityManager;
-import com.matrix.system.app.dto.LoginDto;
-import com.matrix.system.app.dto.PwdResetDto;
-import com.matrix.system.app.dto.SmsCodeDto;
-import com.matrix.system.app.dto.UploadPhotoDto;
+import com.matrix.system.app.dto.*;
import com.matrix.system.app.utils.Sms106Send;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
@@ -225,17 +222,22 @@
@ApiOperation(value = "获取api接口地址", notes = "获取api接口地址")
@GetMapping(value = "/findApiUrl")
public AjaxResult findApiUrl() {
- Map<String, String> url = new HashMap<>();
- url.put("prd", "http://myapp.jyymatrix.cc/");
- url.put("test", "http://test.hive.jyymatrix.cc/");
+ List<UrlDto> data = new ArrayList<>();
+ UrlDto urlDto = new UrlDto();
+ urlDto.setUrl("http://myapp.jyymatrix.cc");
+ urlDto.setName("正式环境");
+ data.add(urlDto);
- Map<String, String> des = new HashMap<>();
- des.put("prd", "正式环境");
- des.put("test", "测试环境");
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://test.hive.jyymatrix.cc");
+ urlDto.setName("测试环境");
+ data.add(urlDto);
- Map<String, Object> data = new HashMap<>();
- data.put("url", url);
- data.put("des", des);
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://hive.mydoline.com");
+ urlDto.setName("美度专线");
+ data.add(urlDto);
+
return AjaxResult.buildSuccessInstance(data);
}
--
Gitblit v1.9.1