From 918bfb7afa967b575a57f5880d492534c6e7de4f Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 23 Jun 2021 18:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 2b580f6..d2730e9 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;
@@ -39,10 +36,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -226,7 +220,21 @@
+ @ApiOperation(value = "获取api接口地址", notes = "获取api接口地址")
+ @GetMapping(value = "/findApiUrl")
+ public AjaxResult findApiUrl() {
+ List<UrlDto> data = new ArrayList<>();
+ UrlDto urlDto = new UrlDto();
+ urlDto.setUrl("http://myapp.jyymatrix.cc");
+ urlDto.setName("正式环境");
+ data.add(urlDto);
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://test.hive.jyymatrix.cc");
+ urlDto.setName("测试环境");
+ data.add(urlDto);
+ return AjaxResult.buildSuccessInstance(data);
+ }
--
Gitblit v1.9.1