Inicio Explorar Ayuda
Registro Iniciar sesión
GfA
/
gfaservices
5
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Änderungen am REST

Rind hace 3 años
padre
a632b51ed3
commit
fca99e6d10
Se han modificado 13 ficheros con 153 adiciones y 51 borrados
Dividir vista Mostrar estadísticas de diff
  1. 3 3
      _OEM_.cfg
  2. 2 2
      _OEM_.pri
  3. 0 0
      _OEM_.pro
  4. 7 7
      install.cfg
  5. 1 1
      projal.pri
  6. 12 0
      svc/rest/html/index.html
  7. 87 0
      svc/rest/keys.c
  8. 4 2
      svc/rest/main.cpp
  9. 0 31
      svc/rest/main.h
  10. 26 3
      svc/rest/rest.pro
  11. 9 0
      svc/rest/staticfiles.json
  12. 1 1
      usr/visu/qml/shm.qml
  13. 1 1
      usr/visu/visu.pro

+ 3 - 3
OEM.cfg → _OEM_.cfg
Ver fichero 

@@ -4,7 +4,7 @@ uuid =
 
 );
 
 
 logconf = {
 
-	database = "$(OEM)Log";
 
+	database = "_OEM_Log";
 
 	tagtable = "Tags";
 
 	logtable = "Logs";
 
 	user = "root";
 
@@ -30,7 +30,7 @@ logsumconf =
 
 };
 
 
 remlogconf = {
 
-         database = "$(OEM)Rem";
 
+         database = "_OEM_Rem";
 
          logtable = "Logs";
 
          user = "root";
 
          pass = "root";
 
@@ -43,7 +43,7 @@ restconf = {
 
 
 mqttconf =
 
 {
 
-    cfg_file_path = "/opt/GfA/$(OEM)/mqttcl/mqttcl.conf.json"
 
+    cfg_file_path = "/opt/GfA/_OEM_/mqttcl/mqttcl.conf.json"
 
 };
 
 
 sinclude = (

+ 2 - 2
OEM.pri → _OEM_.pri
Ver fichero 

@@ -1,8 +1,8 @@
 
 ###################################################
 
 
-CFG_INFILE		= $(OEM).cfg
 
+CFG_INFILE		= _OEM_.cfg
 
 CFG_OUTDIR		= .
 
-CFG_BASENAME	= $(OEM)
 
+CFG_BASENAME	= _OEM_
 
 DEPLOY_BASEDIR	= /opt/GfA
 
 DEPLOY_SUBDIR	= $$CFG_BASENAME
 
 #GEB_SEARCHDIR	= /path/to/geb/files

+ 0 - 0
OEM.pro → _OEM_.pro
Ver fichero


+ 7 - 7
install.cfg
Ver fichero 

@@ -1,21 +1,21 @@
 
 config =
 
 {
 
-	oemcontpat = "\$\(OEM\)";
 
-	oemfilepat = "OEM";
 
+	oemcontpat = "_OEM_";
 
+	oemfilepat = "_OEM_";
 
 };
 
 
 oemsubstfiles =
 
 (
 
 	"projal.pri",
 
-	"OEM.pri",
 
-	"OEM.cfg",
 
+	"_OEM_.pri",
 
+	"_OEM_.cfg",
 
 	"usr/visu/visu.pro",
 
 	"usr/visu/qml/shm.qml"
 
 );
 
 
 oemrenfiles =
 
 (
 
-	"OEM.pro",
 
-	"OEM.pri",
 
-	"OEM.cfg"
 
+	"_OEM_.pro",
 
+	"_OEM_.pri",
 
+	"_OEM_.cfg"
 
 );

+ 1 - 1
projal.pri
Ver fichero 

@@ -1,4 +1,4 @@
 
-include($(OEM).pri)
 
+include(_OEM_.pri)
 
 
 GEBVARS			= gfagebvars
 
 SHMCONF			= gfashmconf

+ 12 - 0
svc/rest/html/index.html
Ver fichero 

@@ -0,0 +1,12 @@
 
+<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+	<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 
+</head>
 
+
 
+<body>
 
+	<h1 style="text-align:center;">REST-Service auf Sitara</h1>
 
+</body>
 
+
 
+</html>

+ 87 - 0
svc/rest/keys.c
Ver fichero 

@@ -0,0 +1,87 @@
 
+static const char *g_pszKeyPem =

+"-----BEGIN PRIVATE KEY-----" \

+"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" \

+"4aG7+sOFaX+emA/IBTddOTJAcBiOL5Y=" \

+"-----END PRIVATE KEY-----";

+

+static const char *g_pszCertPem =

+"-----BEGIN CERTIFICATE-----" \

+"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" \

+"-----END CERTIFICATE-----";

+ 4 - 2
svc/rest/main.cpp
Ver fichero 

@@ -1,8 +1,10 @@
 
-//#include "main.h"
 
 #include <gfa/svc/common/instance.h>
 
 #include <gfa/svc/rest/helpers.h>
 
 #include <gfa/svc/rest/callback.h>
 
-#include "projal.h"
 
+#include "../../projal.h"
 
+
 
+#define _REST_USE_SSL				0
 
+#define _REST_LINEAR_GET			1
 
 
 #if _REST_USE_SSL
 
 #include "keys.c"

+ 0 - 31
svc/rest/main.h
Ver fichero 

@@ -1,31 +0,0 @@
 
-// main.h :

-//

-

-#if !defined(AGD_MAIN_H__DBD15368_61A6_4741_99B4_4F79DED9B2E4__INCLUDED_)

-#define AGD_MAIN_H__DBD15368_61A6_4741_99B4_4F79DED9B2E4__INCLUDED_

-

-#include <stdio.h>

-#include <string.h>

-#include <math.h>

-#include <curl/curl.h>

-#include <linux/limits.h>

-#include <sys/stat.h>

-#include <signal.h>

-#include <string>

-#include <vector>

-#include <assert.h>

-#include "debug.h"

-#include "defines.h"

-#include "fileutil.h"

-#include "apikey.h"

-

-extern "C"

-{

-#include <ulfius.h>

-}

-

-/////////////////////////////////////////////////////////////////////////////

-// main.h - Declarations:

-

-/////////////////////////////////////////////////////////////////////////////

-#endif	//	!defined(AGD_MAIN_H__DBD15368_61A6_4741_99B4_4F79DED9B2E4__INCLUDED_)

+ 26 - 3
svc/rest/rest.pro
Ver fichero 

@@ -32,11 +32,34 @@ CONFIG(release, debug|release) {
 
 
 SOURCES += main.cpp
 
 
-HEADERS += main.h
 
-
 
-INCLUDEPATH += ../../ $$(GEBGFADEV)
 
+HEADERS += 
 
 linux-buildroot-g++ {
 
     target.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/rest
 
     INSTALLS += target
 
 }
 
+
 
+################################################################
 
+#                                                              #
 
+# Wenn keine statischen Files verwendet werden, können die     #
 
+# folgenden beiden Blöcke auskommentiert oder gelöscht werden. #
 
+#                                                              #
 
+################################################################
 
+
 
+linux-g++ {
 
+	DISTFILES = staticcfg staticfiles
 
+	staticcfg.files = staticfiles.json
 
+    staticcfg.path = $$OUT_PWD
 
+    staticfiles.files = html
 
+    staticfiles.path = $$OUT_PWD
 
+    INSTALLS += staticcfg staticfiles
 
+}
 
+
 
+linux-buildroot-g++ {
 
+	DISTFILES = staticcfg staticfiles
 
+	staticcfg.files = staticfiles.json
 
+    staticcfg.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/rest
 
+    staticfiles.files = html
 
+    staticfiles.path = $$DEPLOY_BASEDIR/$$DEPLOY_SUBDIR/rest
 
+    INSTALLS += staticcfg staticfiles
 
+}

+ 9 - 0
svc/rest/staticfiles.json
Ver fichero 

@@ -0,0 +1,9 @@
 
+[
 
+	{
 
+		"method": "GET",
 
+		"URL": "index.html",
 
+		"fileName": "html/index.html",
 
+		"contentType": "text/html",
 
+		"isString": true
 
+	}
 
+]

+ 1 - 1
usr/visu/qml/shm.qml
Ver fichero 

@@ -4,7 +4,7 @@ import QtQuick.Controls 1.5
 
 import QtQuick.Controls.Styles 1.4
 
 import QtQuick.Controls.Private 1.0
 
 import com.gfa.ipc.appctrl 1.0
 
-import com.gfa.shm.$(oem) 1.0
 
+import com.gfa.shm._oem_ 1.0
 
 
 Rectangle {
 
     width: 800

+ 1 - 1
usr/visu/visu.pro
Ver fichero 

@@ -31,7 +31,7 @@ INCLUDEPATH += ../../
 
 SOURCES += main.cpp
 
 
 HEADERS +=  \
 
-    ../../$(OEM)_qt.h
 
+    ../../_OEM__qt.h
 
 
 RESOURCES += qml.qrc