|
|
@@ -5,6 +5,7 @@ import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
|
import com.qmth.themis.business.bean.exam.EnvBean;
|
|
|
import com.qmth.themis.business.bean.exam.OrgInfoBean;
|
|
|
import com.qmth.themis.business.bean.exam.VersionBean;
|
|
|
+import com.qmth.themis.business.config.SystemConfig;
|
|
|
import com.qmth.themis.business.entity.TBOrg;
|
|
|
import com.qmth.themis.business.enums.UploadFileEnum;
|
|
|
import com.qmth.themis.business.service.TBOrgService;
|
|
|
@@ -37,6 +38,9 @@ public class SysController {
|
|
|
@Resource
|
|
|
DictionaryConfig dictionaryConfig;
|
|
|
|
|
|
+ @Resource
|
|
|
+ SystemConfig systemConfig;
|
|
|
+
|
|
|
@ApiOperation(value = "获取环境接口")
|
|
|
@RequestMapping(value = "/env", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
|
|
|
@@ -60,9 +64,9 @@ public class SysController {
|
|
|
}
|
|
|
env.setCurrentTime(System.currentTimeMillis());
|
|
|
VersionBean v = new VersionBean();
|
|
|
- v.setName("1.2.0");
|
|
|
- v.setValue(12);
|
|
|
- v.setUrl("http://qmth-test.oss-cn-shenzhen.aliyuncs.com/client/v1.0.0/index.json");
|
|
|
+ v.setName(systemConfig.getProperty("client.config.version"));
|
|
|
+ v.setValue(Integer.parseInt(systemConfig.getProperty("client.config.value")));
|
|
|
+ v.setUrl(systemConfig.getProperty("client.config.url"));
|
|
|
env.setVersion(v);
|
|
|
boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
|
String url = null;
|
wangliang