From 7208ffbeaeafb9af8d822ef73a51e477e1da4e1f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Jun 2021 11:15:59 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 6a882aa..057538d 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
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
-import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.*;
import com.matrix.system.app.authority.AppAuthorityManager;
@@ -15,7 +14,6 @@
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
@@ -41,10 +39,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
@@ -227,19 +222,24 @@
}
+ @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/");
- @ApiOperation(value = "获取app配置", notes = "获取app配置")
- @ApiResponses({
- @ApiResponse(code = 200, message = "ok", response = AppVersion.class)
- })
- @GetMapping(value = "/findAppSettings")
- public AjaxResult findAppSettings() {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");
- result.putInMap(AppConstance.APP_BANNER_GL, busParameterSettingsDao.selectCompanyParamByCode(AppConstance.APP_BANNER_GL,user.getCompanyId()));
- return result;
+ 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);
+ return AjaxResult.buildSuccessInstance(data);
}
+
}
--
Gitblit v1.9.1