From 1460de97df6d4235ba8a6e4debd079c28027d137 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Jun 2021 11:36:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/dto/UrlDto.java | 12 ++++++++++++
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 24 ++++++++++--------------
2 files changed, 22 insertions(+), 14 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..29ddb90 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,16 @@
@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", "测试环境");
-
- Map<String, Object> data = new HashMap<>();
- data.put("url", url);
- data.put("des", des);
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://test.hive.jyymatrix.cc/");
+ urlDto.setName("测试环境");
+ data.add(urlDto);
return AjaxResult.buildSuccessInstance(data);
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/UrlDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/UrlDto.java
new file mode 100644
index 0000000..5faef85
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/UrlDto.java
@@ -0,0 +1,12 @@
+package com.matrix.system.app.dto;
+
+
+import lombok.Data;
+
+@Data
+public class UrlDto {
+
+ private String url;
+
+ private String name;
+}
--
Gitblit v1.9.1