添加评价器事件地址

device-manager-ui/admin/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",
-    "dev1": "vue-cli-service serve --mode test",
     "build": "vue-cli-service build",
     "test": "vue-cli-service build --mode test",
     "build:prod": "vue-cli-service build --model prod"

device-manager-ui/admin/src/components/HeaderSite.vue

@@ -109,9 +109,7 @@ export default {
     getwaitedListdata() {
 
       let url=process.env.VUE_APP_SITETREE_URL=='undefined'?'http://192.168.0.98:11078/base/site/siteTree':process.env.VUE_APP_SITETREE_URL
-
       console.log("url:"+url)
-
       console.log("url:"+process.env.VUE_APP_SITETREE_URL)
 
       this.$get(url).then((res) => {

device-manager-ui/admin/vue.config.js

@@ -17,11 +17,11 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/m': {
-				 target: 'http://192.168.0.98:11078',
-				//target: 'http://127.0.0.1:18222',
+				// target: 'http://192.168.0.98:11078',
+				target: 'http://127.0.0.1:18222',
 				changeOrigin: true,
 				secure: false,
-				cookieDomainRewrite: 'plm.testnew.com',			
+				cookieDomainRewrite: 'plm.testnew.com',
 			}
 		}
 	}

device-manager/pom.xml

@@ -70,7 +70,7 @@
 				<profiles.datasource.uri>
 					<![CDATA[jdbc:mysql://192.168.0.98:3306/device-new-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
-				<profiles.datasource.password>nacos@2020</profiles.datasource.password>
+				<profiles.datasource.password>xhx@2022</profiles.datasource.password>
 				<profiles.redis.uri>192.168.0.252</profiles.redis.uri>
 				<profiles.redis.port>6379</profiles.redis.port>
 				<profiles.redis.username></profiles.redis.username>

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -823,7 +823,7 @@ public class DeviceApiController {
         if (!ObjectUtils.isEmpty(deviceEntity.getHomeUrl())) {
             homeUrl = deviceEntity.getHomeUrl();
         }
-        String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11091");
+        String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
 
         serverInfo.setHomeUrl(UrlBuilder.of(domain).addPath(homeUrl).toString());
         serverInfo.setEventUrl(productEntity.getEventUrl());

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -97,7 +97,6 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
         this.update(distributeEntity, context);
     }
 
-
     public static void main(String[] args) {
         ZipUtil.unzip("F:\\1664176173348.zip", "F:\\tmp");
 

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java

 package com.mortals.xhx.module.device.web;
+
 import cn.hutool.core.net.url.UrlBuilder;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
+import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
 import com.mortals.xhx.module.product.model.ProductEntity;
 import com.mortals.xhx.module.product.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
-import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
 import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
+
 import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_HTTP_URL;
 
 /**
@@ -89,7 +80,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
             homeUrl= productEntity.getHomeUrl();
         }
 
-        String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11091");
+        String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
         entity.setFilePath(UrlBuilder.of(domain).addPath(homeUrl).toString());
         return super.viewAfter(id, model, entity, context);
     }