移动端修复版本插件路径

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Mapper
 public interface AppSubsetVersionMapper extends BaseMapper<AppSubsetVersion> {
 
-	List<AppSubsetVersionVo> selectVersionList(String linkSid);
+	List<AppSubsetVersionVo> selectVersionList(@Param("linkSid") String linkSid,@Param("path") String path);
 
 	AppSubsetVersionVo selectByAppSid(String appSid);
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectVersionList" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectVersionList" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
         SELECT asv.sortNo,
                asv.appName,
                asv.appSid,
                asv.versionCode,
-               asv.iconUrl,
+               concat(#{path}, asv.iconUrl)   iconUrl,
                asv.linkSid,
                asv.versionName,
-               asv.updateUrl,
-               asv.updateUrl,
+               concat(#{path}, asv.updateUrl) updateUrl,
                asv.upgradeInfo,
                asv.type,
                asv.modulePluginName,
@@ -25,7 +24,7 @@
           AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
         ORDER BY sortNo ASC
     </select>
-	<select id="selectByAppSid" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
+    <select id="selectByAppSid" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
         SELECT versionCode
         FROM app_subset_version
         WHERE appSid = #{appSid}
@@ -33,7 +32,7 @@
         LIMIT 1
     </select>
 
-	<select id="selectByAppSidOne" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
+    <select id="selectByAppSidOne" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
         SELECT *
         FROM app_subset_version
         WHERE appSid = #{appSid}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.portal.api.appsubsetversion.*;
 import com.yxt.anrui.portal.api.appversion.VersionVo;
 import com.yxt.anrui.portal.biz.appversion.ApkUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
@@ -38,12 +39,15 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign {
 	private ApkUtil apkUtil;
 	@Autowired
 	private AppSubsetVersionService appSubsetVersionService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
 
 	@Override
 	public ResultBean<List<AppSubsetVersionVo>> selectVersionList() {
 		//主框架sid
 		String linkSid = LINKSID;
-		List<AppSubsetVersionVo> appSubsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid);
+		String path = fileUploadComponent.getUrlPrefix();
+		List<AppSubsetVersionVo> appSubsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid,path);
 		return new ResultBean<List<AppSubsetVersionVo>>().success().setData(appSubsetVersionVoList);
 	}
 
@@ -112,7 +116,7 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign {
 		}
 		return ResultBean.fireSuccess().setMsg("保存成功");
 	}
-      
+
     @Override
 	public ResultBean update(AppSubsetVersionDto dto){
 		if (dto.getType().equals("2")) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java

@@ -23,8 +23,8 @@ import java.util.List;
 @Service
 public class AppSubsetVersionService extends MybatisBaseService<AppSubsetVersionMapper, AppSubsetVersion> {
 
-	public List<AppSubsetVersionVo> selectVersionList(String linkSid) {
-		return baseMapper.selectVersionList(linkSid);
+	public List<AppSubsetVersionVo> selectVersionList(String linkSid,String path) {
+		return baseMapper.selectVersionList(linkSid,path);
 	}
 
 	public AppSubsetVersionVo selectByAppSid(String appSid) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -2,18 +2,16 @@ package com.yxt.anrui.portal.biz.index;
 
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
 import com.yxt.anrui.portal.api.banner.BannerVo;
-import com.yxt.anrui.portal.api.formnotice.FormNotice;
 import com.yxt.anrui.portal.api.formnotice.FormNoticeQuery;
 import com.yxt.anrui.portal.api.formnotice.FormNoticeVo;
 import com.yxt.anrui.portal.api.index.AppIndexFeign;
-import com.yxt.anrui.portal.api.index.AppIndexQuery;
 import com.yxt.anrui.portal.api.index.AppIndexVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
 import com.yxt.anrui.portal.biz.banner.BannerService;
 import com.yxt.anrui.portal.biz.flow.FlowableService;
 import com.yxt.anrui.portal.biz.formnotice.FormNoticeService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -51,6 +48,8 @@ public class AppIndexRest implements AppIndexFeign {
     private FlowableService flowableService;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     private String LINKSID="147694bb-c765-4426-8f67-d19a66585f31";
 
@@ -83,7 +82,8 @@ public class AppIndexRest implements AppIndexFeign {
 
         // 子应用列表
         String linkSid = LINKSID;
-        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid);
+        String path = fileUploadComponent.getUrlPrefix();
+        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid,path);
         subsetVersionVoList.stream().forEach(item -> {
             item.setCornerNum("3");
         });