root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-16 13:45:14 +08:00
parent 49e50b18b1 42997687ef
commit 8612940e4f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java
View File

@@ -15,9 +15,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
@Slf4j
public class AppUpdateController {
private final ISysParamService iSysParamService;
@PostMapping
@Log("app更新")
@@ -40,9 +39,8 @@ public class AppUpdateController {
public ResponseEntity<Object> appUpdate() {
JSONObject obj=new JSONObject();
// obj.put("versionName","1.0.1");
ISysParamService paramService = SpringContextHolder.getBean(SysParamServiceImpl.class);
String app_rul = paramService.findByCode("APP_URL").getValue();
String app_version = paramService.findByCode("APP_VERSION").getValue();
String app_rul = iSysParamService.findByCode("APP_URL").getValue();
String app_version = iSysParamService.findByCode("APP_VERSION").getValue();
// obj.put("url","http://172.17.2.163:8080/apk/app.apk");
obj.put("url",app_rul);
obj.put("versionName",app_version);