commit

aarch64/plugin-compile/main/main.go

@@ -17,7 +17,7 @@ const serviceName = "plugin-compile"
 func init() {
 	c_log.InitLog(serviceName)
 	c_oss.InitOss(false)
-	c_nacos.InitNacos(serviceName, servicePort, map[string]string{
+	c_nacos.InitNacos(true, serviceName, servicePort, map[string]string{
 		"开发者":  "孟令鑫",
 		"内网IP": "10.14.85.228",
 		"外网IP": "36.110.106.142",

amd64/kubernetes-scheduler/main/main.go

@@ -23,7 +23,7 @@ func init() {
 	c_log.InitLog("kubernetes-scheduler")
 	c_log.InitLog(serviceName)
 	c_oss.InitOss(false)
-	c_nacos.InitNacos(serviceName, servicePort, map[string]string{
+	c_nacos.InitNacos(false, serviceName, servicePort, map[string]string{
 		"开发者":  "孟令鑫",
 		"内网IP": "10.14.85.228",
 		"外网IP": "36.110.106.156",

amd64/kubernetes-scheduler/package/handler/start_project.go

@@ -7,6 +7,115 @@ import (
 	"net/http"
 )
 
+/**
+ * {
+ *     "info": {
+ *         "project_id": 766,
+ *         "task_id": 2789,
+ *         "task_path": "jobs/RT_EY%402022-01-25_13%3A57%3A30_1643090250/SharingVan_20220125_0",
+ *         "default_time": 30
+ *     },
+ *     "scenario": {
+ *         "scenario_osc": "scenarios/SharingVAN_20220125/SharingVAN.xml",
+ *         "scenario_odr": "scenarios/SharingVAN_20220125/Road_DFMC.xodr",
+ *         "scenario_osgb": "scenarios/SharingVAN_20220125/Road_DFMC.opt.osgb"
+ *     },
+ *     "vehicle":{
+ * 		"model": {
+ * 			"model_label": "AudiA6_10"
+ *                },
+ * 		"dynamics": {
+ * 			"dynamics_maxspeed": 67,
+ * 			"dynamics_enginepower": 150000,
+ * 			"dynamics_maxdecel": 9.5,
+ * 			"dynamics_maxsteering": 0.48,
+ * 			"dynamics_mass": 1700,
+ * 			"dynamics_frontsurfaceeffective": 2.2,
+ * 			"dynamics_airdragcoefficient": 0.31,
+ * 			"dynamics_rollingresistance": 0,
+ * 			"dynamics_wheeldiameter": 0.684,
+ * 			"dynamics_wheeldrive": "wheel_drive_front",
+ * 			"dynamics_overallefficiency": 0.75,
+ * 			"dynamics_distfront": 3.838,
+ * 			"dynamics_distrear": 1.086,
+ * 			"dynamics_distleft": 0.94,
+ * 			"dynamics_distright": 0.94,
+ * 			"dynamics_distheight": 1.444,
+ * 			"dynamics_wheelbase": 2.91
+ *        },
+ * 		"sensors": {
+ * 			"camera": [
+ *                {
+ * 					"sensor_name": "following_view_camera",
+ * 					"sensor_fovH": 45,
+ * 					"sensor_fovV": 27,
+ * 					"sensor_near": 1,
+ * 					"sensor_far": 1500,
+ * 					"sensor_resolution": "800x600",
+ * 					"sensor_frameRate": 60,
+ * 					"sensor_x": -15,
+ * 					"sensor_y": 0,
+ * 					"sensor_z": 5,
+ * 					"sensor_h": 0,
+ * 					"sensor_p": 10,
+ * 					"sensor_r": 0
+ *                },
+ *                {
+ * 					"sensor_name": "plan_view_camera",
+ * 					"sensor_fovH": 45,
+ * 					"sensor_fovV": 27,
+ * 					"sensor_near": 1,
+ * 					"sensor_far": 1500,
+ * 					"sensor_resolution": "800x600",
+ * 					"sensor_frameRate": 60,
+ * 					"sensor_x": 35,
+ * 					"sensor_y": 0,
+ * 					"sensor_z": 200,
+ * 					"sensor_h": 0,
+ * 					"sensor_p": 90,
+ * 					"sensor_r": 0
+ *                }
+ * 			],
+ * 			"OGT": [
+ *                {
+ * 					"sensor_name": "360_perfect_sensor",
+ * 					"sensor_fovH": 360,
+ * 					"sensor_fovV": 20,
+ * 					"sensor_near": 0,
+ * 					"sensor_far": 100,
+ * 					"sensor_x": 0,
+ * 					"sensor_y": 0,
+ * 					"sensor_z": 1.7,
+ * 					"sensor_h": 0,
+ * 					"sensor_p": 0,
+ * 					"sensor_r": 0,
+ * 					"sensor_filter": [0,1,5],
+ * 					"sensor_display": true,
+ * 					"sensor_maxObjects": 10,
+ * 					"sensor_port": 10
+ *                },
+ *                {
+ * 					"sensor_name": "120_perfect_sensor",
+ * 					"sensor_fovH": 120,
+ * 					"sensor_fovV": 20,
+ * 					"sensor_near": 0,
+ * 					"sensor_far": 100,
+ * 					"sensor_x": 0,
+ * 					"sensor_y": 0,
+ * 					"sensor_z": 1.7,
+ * 					"sensor_h": 0,
+ * 					"sensor_p": 0,
+ * 					"sensor_r": 0,
+ * 					"sensor_filter": [0,1,5],
+ * 					"sensor_display": true,
+ * 					"sensor_maxObjects": 10,
+ * 					"sensor_port": 10
+ *                }
+ * 			]
+ *        }* 	}
+ * }
+ */
+
 type StartProjectParam struct {
 	ProjectId          int `json:"projectId"`
 	AlgorithmObjectKey int `json:"algorithmObjectKey"`

common/config/c_nacos/nacos_config.go

@@ -11,20 +11,22 @@ import (
 )
 
 var (
-	//nacosIp     = "36.110.106.142"
-	nacosIp     = "10.14.85.228"
-	nacosPort   = 8848
-	namespaceId = "45e828a5-1a1d-4c46-a746-d4dfa3ca8f5f"
-	username    = "cicv"
-	password    = "cicv"
-	serviceIp   = "36.110.106.142"
-	servicePort = 12340
+	nacosPrivateIp = "10.14.85.228"
+	nacosPublicIp  = "36.110.106.142"
+	nacosPort      = 8848
+	namespaceId    = "45e828a5-1a1d-4c46-a746-d4dfa3ca8f5f"
+	username       = "cicv"
+	password       = "cicv"
+	serviceIp      = "36.110.106.142"
 )
 
-func InitNacos(serviceName string, servicePort uint64, metadata map[string]string) {
+func InitNacos(private bool, serviceName string, servicePort uint64, metadata map[string]string) {
 	//create ServerConfig
-	sc := []constant.ServerConfig{
-		*constant.NewServerConfig(nacosIp, uint64(nacosPort), constant.WithContextPath("/nacos")),
+	var sc []constant.ServerConfig
+	if private {
+		sc = []constant.ServerConfig{*constant.NewServerConfig(nacosPrivateIp, uint64(nacosPort), constant.WithContextPath("/nacos"))}
+	} else {
+		sc = []constant.ServerConfig{*constant.NewServerConfig(nacosPublicIp, uint64(nacosPort), constant.WithContextPath("/nacos"))}
 	}
 
 	//create ClientConfig