项目更改

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -1494,7 +1494,7 @@ public class ActTaskController extends BaseController {
 	 * */
 	@ResponseBody
 	@RequestMapping(value = "nonPowerMiddleTask")
-	public AjaxJson nonPowerMiddleTask(Act act,String pic, UploadImages uploadImages) {
+	public AjaxJson nonPowerMiddleTask(Act act,String pic,String imgName, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
 			if (pic!=null&&pic!="") {

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -20,6 +20,7 @@ import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleB
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleBlockVersionService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.service.ModuleListingService;
 import com.jeeplus.modules.sg.managementcenter.moduleacquisition.util.ModuleUtil;
+import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sys.entity.DictValue;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -98,11 +99,20 @@ public class ModuleBlockWeb extends BaseController {
 		//当判定系统为linux的时候
 		if (Global.SYS_TYPE.equals("2")) {
 			List<ModuleBlock> list = page.getList();
-			for (ModuleBlock moduleBlock1: list) {
-				String mdImg = moduleBlock1.getMdImg();
-				if (mdImg!=null&&!"".equals(mdImg)) {
-					moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+			for (ModuleBlock upload :
+					list) {
+				String mdImg = upload.getMdImg();
+				String newMdImg = "";
+				String[] split = mdImg.split("\\|");
+//            String reg = "(?i).+?\\.(jpg|gif|bmp)";
+				for (int i = 0; i < split.length; i++) {
+/*                if (split[i].matches(reg)) {
+                    newMdImg += split[i] + "|";
+                    continue;
+                }*/
+					newMdImg += "http://" + request.getServerName() + split[i] + "|";
 				}
+				upload.setMdImg(newMdImg);
 			}
 		}
 		return getBootstrapData(page);