lith 3 år sedan
förälder
incheckning
358abb8646

+ 33 - 11
dotnet/ServiceCenter/App.Gover.Gateway/wwwroot/JsStation/JsStation.html

@@ -93,13 +93,40 @@ function (isSuccess, replyData_bytes, replyRpcData_object) {
             }
         };
 
-        txt_appsettings.value = JSON.stringify(appsettings, null, 2);
+
+
+        //type: info/error
+		//e: pass error when type is error
+		//function(message,type,e){ }
+        vit.logger.onmessage = function (message, type, e) {
+            if (e) message = message + '\n' + e.stack;
+
+            console.log(message);
+            txt_log.value = txt_log.value + '\n' + message;
+            txt_log.scrollTop = txt_log.scrollHeight;
+        };
 
 
         var serviceStation = new sers.ServiceStation();
 
+        //(Error e,requestData_bytes,rpcData,replyRpcDta)
+        //localApiService.onError = function(e,requestData_bytes,rpcData,replyRpcDta){ return {success:false}; }
+        serviceStation.localApiService.onError = function (e, requestData_bytes, rpcData, replyRpcDta) {
+            logger.error(e);
+            var reply = {
+                success: false,
+                error: {
+                    errorMessage: e.message,
+                    errorDetail: { name: e.name, stack: e.stack }
+                }
+            };
+            return reply;
+        };
+
+
+
         /*
-           user_ApiNode demo:
+           apiNodes demo:
            //onInvoke:   function(requestData_bytes,rpcData_object,reply_rpcData_object){}
             {
                 route: '/JsStation/api1', httpMethod: 'GET', apiName: 'js作为服务站点',
@@ -121,15 +148,6 @@ function (isSuccess, replyData_bytes, replyRpcData_object) {
 
 
 
-        vit.logger.onmessage = function (message, type, e) {
-            if (e) message = message + '\n' + e.stack;
-
-            console.log(message);
-            txt_log.value = txt_log.value + '\n' + message;
-            txt_log.scrollTop = txt_log.scrollHeight;
-        };
-
-
         function startService() {
             try {
                 vit.logger.info('');
@@ -196,6 +214,10 @@ function (isSuccess, replyData_bytes, replyRpcData_object) {
             }
         }
 
+
+
+
+        txt_appsettings.value = JSON.stringify(appsettings, null, 2);
     </script>
 </body>
 </html>

+ 21 - 15
dotnet/ServiceCenter/App.Gover.Gateway/wwwroot/JsStation/sers.ServiceStation.js

@@ -822,6 +822,20 @@
 			self.addApiNode(apiDesc, Invoke);
 		};
 
+		//(Error e,requestData_bytes,rpcData,replyRpcDta)
+	    //localApiService.onError = function(e,requestData_bytes,rpcData,replyRpcDta){ return {success:false}; }
+		self.onError = function (e, requestData_bytes, rpcData, replyRpcDta) {
+			logger.error(e);
+			var reply = {
+				success: false,
+				error: {
+					errorMessage: e.message,
+					errorDetail: { name: e.name, stack: e.stack }
+				}
+			};
+			return reply;
+		};
+
 		//apiRequestMessage bytes
 		//return apiReplyMessage bytes
 		self.callApi = function (apiRequestMessage) {
@@ -844,26 +858,18 @@
 			if (apiNode && apiNode.Invoke) {
 				try {
 					replyData = apiNode.Invoke(requestData_bytes, rpcData, replyRpcDta);
-				} catch (e) {
-					logger.error(e);
-					var reply = {
-						"success": false,
-						"error": {
-							"errorMessage": e.message,
-							"errorDetail": { name: e.name, stack:e.stack }
-						}
-					};
-
+				} catch (e) {					
+					var reply = self.onError(e, requestData_bytes, rpcData, replyRpcDta);
 					replyData = vit.objectSerializeToBytes(reply);
 				}
 
 			} else {
 				var reply = {
-					"success": false,
-					"error": {
-						"errorCode": 404,
-						"errorMessage": "Not Found",
-						"errorDetail": { source: 'from JsStation' }
+					success: false,
+					error: {
+						errorCode: 404,
+						errorMessage: "Api Not Found",
+						errorDetail: { source: 'from JsStation' }
 					}
 				};
 

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dotnet/ServiceCenter/App.Gover.Gateway/wwwroot/JsStation/sers.ServiceStation.min.js


Vissa filer visades inte eftersom för många filer har ändrats