From 66a5919f09d41a272be1e4204e846bd36576cba1 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Thu, 10 Aug 2023 17:09:31 +0800
Subject: [PATCH] =?UTF-8?q?APP=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml       |  2 +-
 .../java/jnpf/controller/UtilsController.java    | 16 ++++++++++++++--
 .../base/model/systemconfig/SysConfigModel.java  |  7 +++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
index 3be9b752..4b9a4a4c 100644
--- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml
+++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
@@ -20,7 +20,7 @@ spring:
     host: 221.214.32.166
     port: 3309
     username: root
-    password: qawsed,.123
+    password: linus,.123
     db-name: sc-product
     db-schema: #金仓达梦选填
     prepare-url: #自定义url
diff --git a/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java b/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java
index d4412450..4fb49142 100644
--- a/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java
+++ b/SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java
@@ -7,7 +7,10 @@ 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;
@@ -36,6 +39,7 @@ 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;
@@ -65,6 +69,8 @@ public class UtilsController {
     private YozoUtils yozoUtils;
     @Autowired
     private MinioUploadUtil minioUploadUtil;
+    @Autowired
+    private SysconfigService sysconfigService;
 
     /**
      * 语言列表
@@ -275,9 +281,15 @@ 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", configValueUtil.getAppVersion());
-        object.put("AppUpdateContent", configValueUtil.getAppUpdateContent());
+        object.put("appVersion", map.get("appVersion"));
+        object.put("forceUpdates", map.get("forceUpdates"));
+        object.put("updatesDescription", map.get("updatesDescription"));
         return ActionResult.success(object);
     }
 
diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/model/systemconfig/SysConfigModel.java b/SC-boot/linkage-system/src/main/java/jnpf/base/model/systemconfig/SysConfigModel.java
index af5d52e7..9f16b512 100644
--- a/SC-boot/linkage-system/src/main/java/jnpf/base/model/systemconfig/SysConfigModel.java
+++ b/SC-boot/linkage-system/src/main/java/jnpf/base/model/systemconfig/SysConfigModel.java
@@ -143,6 +143,13 @@ public class SysConfigModel {
     private String sysTheme;
     private String isLog;
 
+    /**
+     * APP配置
+     */
+    private String appVersion;
+    private Integer forceUpdates;
+    private String updatesDescription;
+
     // 短信配置
     /**
      * 阿里