Compare commits

..

No commits in common. '97d60568a8c649820c9b31b8cff2571040e0ca92' and '2261f827a5b6366c90171afc3a55eb8f2ea11957' have entirely different histories.

@ -20,7 +20,7 @@ spring:
host: 221.214.32.166
port: 3309
username: root
password: linus,.123
password: qawsed,.123
db-name: sc-product
db-schema: #金仓达梦选填
prepare-url: #自定义url

@ -17,7 +17,7 @@ spring:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL请严格按可选值填写)
host: 127.0.0.1
host: 222.71.165.188
port: 3309
username: root
password: qawsed,.123
@ -42,7 +42,7 @@ spring:
redis:
database: 0 #缓存库编号
# 生产环境
host: 127.0.0.1
host: 222.71.165.188
# 测试环境
# host: 101.34.35.69
port: 6379

@ -7,10 +7,7 @@ import jnpf.base.ActionResult;
import jnpf.base.NoDataSourceBind;
import jnpf.base.UserInfo;
import jnpf.base.entity.DictionaryDataEntity;
import jnpf.base.entity.SysConfigEntity;
import jnpf.base.model.systemconfig.SysConfigModel;
import jnpf.base.service.DictionaryDataService;
import jnpf.base.service.SysconfigService;
import jnpf.base.util.OptimizeUtil;
import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.ListVO;
@ -39,7 +36,6 @@ import java.nio.channels.FileChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -69,8 +65,6 @@ public class UtilsController {
private YozoUtils yozoUtils;
@Autowired
private MinioUploadUtil minioUploadUtil;
@Autowired
private SysconfigService sysconfigService;
/**
*
@ -281,15 +275,9 @@ public class UtilsController {
@GetMapping("/AppStartInfo/{appName}")
public ActionResult getAppStartInfo(@PathVariable("appName") String appName) {
appName = XSSEscape.escape(appName);
List<SysConfigEntity> list = sysconfigService.getList("SysConfig");
HashMap<String, String> map = new HashMap<>(16);
for (SysConfigEntity sys : list) {
map.put(sys.getFkey(), sys.getValue());
}
JSONObject object = new JSONObject();
object.put("appVersion", map.get("appVersion"));
object.put("forceUpdates", map.get("forceUpdates"));
object.put("updatesDescription", map.get("updatesDescription"));
object.put("AppVersion", configValueUtil.getAppVersion());
object.put("AppUpdateContent", configValueUtil.getAppUpdateContent());
return ActionResult.success(object);
}

@ -143,13 +143,6 @@ public class SysConfigModel {
private String sysTheme;
private String isLog;
/**
* APP
*/
private String appVersion;
private Integer forceUpdates;
private String updatesDescription;
// 短信配置
/**
*

Loading…
Cancel
Save