From e38d1bbed17b75e406145d7ba116f7c3a6cf1069 Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Tue, 11 Aug 2020 15:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                   |  2 +-
 src/main/resources/application.yml        |  3 +++
 src/main/webapp/WEB-INF/manager/index.ftl | 12 ++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e36c8273..d95a89b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-upgrader</artifactId>
-			<version>1.0.17</version>
+			<version>1.0.18-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.stuxuhai</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fef6b14a..094d3956 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,6 +10,9 @@ logging:
     path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
 
 ms:
+  mstore:
+    http: http://store.i.mingsoft.net
+    host: store.i.mingsoft.net
   swagger:
     enable: true #启用swagger文档，生产的时候务必关掉
   manager:
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index 9af6daf6..e26dd6eb 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -566,6 +566,18 @@
                     that.mstore = data;
                 }
             })
+            var sub ={
+                modelUrl:'http://store.i.mingsoft.net/#/'+"?client=${client}",
+                modelTitle:'mstore',
+                isStore:true,
+                modelModelId:'mstore',
+            }
+            this.editableTabs.push(sub)
+            this.currentTab = sub.modelTitle;
+            this.headMenuActive = sub.modelModelId
+            this.$nextTick(function () {
+                that.asideMenuActive = sub.modelId;
+            })
 
         },
     })