esoe
/
teh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

profiles works

master
esoe 1 month ago
parent
b281448cea
commit
34e2368a03
12 changed files with 264 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      face/logs/teh.log
  2. BIN
      face/logs/teh.log.2024-10-15.0.gz
  3. BIN
      face/logs/teh.log.2024-10-22.0.gz
  4. 24
      face/src/main/java/gsp/technologies/face/controllers/api/v1/ApiController.java
  5. 18
      face/src/main/java/gsp/technologies/face/controllers/face/v1/MainframeController.java
  6. 7
      face/src/main/java/gsp/technologies/face/services/LinksFace.java
  7. 149
      face/src/main/java/gsp/technologies/face/services/LinksService.java
  8. 12
      face/src/main/resources/application-face.yaml
  9. 14
      face/src/main/resources/application-source.yaml
  10. 44
      face/src/main/resources/application-storage.yaml
  11. 7
      face/src/main/resources/application.yaml
  12. 69
      face/src/main/resources/links.yaml

27
face/logs/teh.log
Unescape View File

@ -1,24 +1,3 @@
{"@timestamp":"2024-10-22T05:51:13.613370900Z","log.level":"INFO","process.pid":11604,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 11604 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"} {"@timestamp":"2024-10-23T06:23:27.800975600Z","log.level":"INFO","process.pid":18696,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 18696 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T05:51:13.625339Z","log.level":"INFO","process.pid":11604,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"} {"@timestamp":"2024-10-23T06:23:27.814171300Z","log.level":"INFO","process.pid":18696,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"The following 3 profiles are active: \"face\", \"source\", \"storage\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T05:51:15.385425500Z","log.level":"INFO","process.pid":11604,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.214 seconds (process running for 3.322)","ecs.version":"8.11"} {"@timestamp":"2024-10-23T06:23:29.758343700Z","log.level":"INFO","process.pid":18696,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.446 seconds (process running for 3.608)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:13:34.478381600Z","log.level":"INFO","process.pid":24956,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 24956 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:13:34.485429Z","log.level":"INFO","process.pid":24956,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:13:36.231668100Z","log.level":"INFO","process.pid":24956,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.241 seconds (process running for 3.281)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:17:33.632635100Z","log.level":"INFO","process.pid":1720,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 1720 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:17:33.639643600Z","log.level":"INFO","process.pid":1720,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:17:35.353879300Z","log.level":"INFO","process.pid":1720,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.178 seconds (process running for 3.248)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:22:42.828757600Z","log.level":"INFO","process.pid":24008,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 24008 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:22:42.835951300Z","log.level":"INFO","process.pid":24008,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:22:44.530605400Z","log.level":"INFO","process.pid":24008,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.152 seconds (process running for 3.177)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:08.831712800Z","log.level":"INFO","process.pid":12312,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 12312 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:08.836714Z","log.level":"INFO","process.pid":12312,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:11.046571100Z","log.level":"INFO","process.pid":12312,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.662 seconds (process running for 3.882)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:25.326554400Z","log.level":"INFO","process.pid":16424,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 16424 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:25.337667100Z","log.level":"INFO","process.pid":16424,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:26:27.549622700Z","log.level":"INFO","process.pid":16424,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 3.043 seconds (process running for 4.816)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:31:27.436894Z","log.level":"INFO","process.pid":21560,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 21560 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:31:27.443382Z","log.level":"INFO","process.pid":21560,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T06:31:29.382403500Z","log.level":"INFO","process.pid":21560,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.43 seconds (process running for 3.528)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T11:41:13.485475100Z","log.level":"INFO","process.pid":2492,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Starting FaceApplicationTests using Java 17.0.7 with PID 2492 (started by devuser in C:\\Users\\devuser\\Documents\\code\\teh\\face)","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T11:41:13.491427400Z","log.level":"INFO","process.pid":2492,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"No active profile set, falling back to 1 default profile: \"default\"","ecs.version":"8.11"}
{"@timestamp":"2024-10-22T11:41:15.414923700Z","log.level":"INFO","process.pid":2492,"process.thread.name":"main","service.name":"face","service.version":"1","service.environment":"Production","service.node.name":"Primary","log.logger":"gsp.technologies.face.FaceApplicationTests","message":"Started FaceApplicationTests in 2.397 seconds (process running for 3.59)","ecs.version":"8.11"}

BIN
face/logs/teh.log.2024-10-15.0.gz
View File

Binary file not shown.

BIN
face/logs/teh.log.2024-10-22.0.gz
View File

Binary file not shown.

24
face/src/main/java/gsp/technologies/face/controllers/api/v1/ApiController.java
Unescape View File

@ -164,8 +164,30 @@ public class ApiController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping("/delete")
public String delete(@RequestParam(name="id", required = true) Long id,
HttpServletRequest request) {
//удаление поста
client.delete()
.uri("http://source:8181/api/v1/storage/post/delete/" + id)
.retrieve()
.bodyToMono(new ParameterizedTypeReference <Void>(){})
.block();
//удаление метаданных
//удаление файла
client.delete()
.uri("http://source:8181/api/v1/storage/post/delete/" + id)
.retrieve()
.bodyToMono(new ParameterizedTypeReference <Void>(){})
.block();
//переход на исходную страницу
String referer = request.getHeader("Referer");
return "redirect:"+ referer;
}
@GetMapping("/delete{id}") @GetMapping("/delete{id}")
public String delete(@PathVariable Long id, public String deleteById(@PathVariable Long id,
HttpServletRequest request) { HttpServletRequest request) {
//удаление поста //удаление поста
client.delete() client.delete()

18
face/src/main/java/gsp/technologies/face/controllers/face/v1/MainframeController.java
Unescape View File

@ -7,7 +7,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -21,6 +20,7 @@ import gsp.technologies.face.models.Content;
import gsp.technologies.face.models.ContentPage; import gsp.technologies.face.models.ContentPage;
import gsp.technologies.face.models.ContentRequest; import gsp.technologies.face.models.ContentRequest;
import gsp.technologies.face.models.Post; import gsp.technologies.face.models.Post;
import gsp.technologies.face.services.LinksService;
import gsp.technologies.face.teh.pagination.Page; import gsp.technologies.face.teh.pagination.Page;
@ -31,22 +31,18 @@ public class MainframeController {
@Autowired @Autowired
private WebClient client; private WebClient client;
@Autowired
private Environment env;
// @Autowired @Autowired
// private Storage storage; private LinksService links;
@GetMapping("") @GetMapping("")
public String mainframe(Model model, @RequestParam(name = "postContentPage", required = false) ContentPage<Post> postContentPage) { public String mainframe(Model model, @RequestParam(name = "postContentPage", required = false) ContentPage<Post> postContentPage) {
log.info("GET /face/v1/mainframe"); log.info("GET /face/v1/mainframe");
log.info("properties: "); log.info("********* properties ********* ");
// String props = env.getProperty("links.storage.api.home"); // log.info("storage.api.home: {}", env.getProperty("storage.api.home"));
// log.info("links.storage.api.home: {}", props); log.info("storage.api.home: {}", links.storageApiHome());
log.info("face.api.home: {}", links.faceApiHome());
if (postContentPage == null) { if (postContentPage == null) {
//подготовка параметров запроса //подготовка параметров запроса

7
face/src/main/java/gsp/technologies/face/services/LinksFace.java
Unescape View File

@ -0,0 +1,7 @@
package gsp.technologies.face.services;
public interface LinksFace {
String storageApiHome();
}

149
face/src/main/java/gsp/technologies/face/services/LinksService.java
Unescape View File

@ -0,0 +1,149 @@
package gsp.technologies.face.services;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
@Service
public class LinksService{
@Autowired
private Environment env;
/**
* get links from env: storage
* @return
*/
public String storageProtocol(){
return env.getProperty("storage.protocol");
}
public String storageDomain(){
return env.getProperty("storage.domain");
}
public String storagePort(){
return env.getProperty("storage.port");
}
public String storageHello(){
return env.getProperty("storage.hello");
}
public String storageApiHome(){
return env.getProperty("storage.api.home");
}
public String storageApiRoot(){
return env.getProperty("storage.api.root");
}
public String storageApiFiles(){
return env.getProperty("storage.api.files");
}
public String storageApiFileStore(){
return env.getProperty("storage.api.file-store");
}
public String storageApiFileStoreMultiple(){
return env.getProperty("storage.api.file-store-multiple");
}
public String storageApiFileDelete(){
return env.getProperty("storage.api.file-delete");
}
public String storageApiFileDownload(){
return env.getProperty("storage.api.file-download");
}
public String storageApiXlsxPage(){
return env.getProperty("storage.api.xlsx-page");
}
public String storageApiDirectoryCreate(){
return env.getProperty("storage.api.directory-create");
}
public String storageApiDirectoryDelete(){
return env.getProperty("storage.api.directory-delete");
}
public String storageApiFileCreateEmpty(){
return env.getProperty("storage.api.file-create-empty");
}
public String storageApiFileBytes(){
return env.getProperty("storage.api.file-bytes");
}
public String storageFaceHome(){
return env.getProperty("storage.face.home");
}
public String storageFaceMainframe(){
return env.getProperty("storage.face.mainframe");
}
public String storageFaceUploadFile(){
return env.getProperty("storage.face.upload-file");
}
public String storageFaceUploadMultipleFiles(){
return env.getProperty("storage.face.upload-multiple-files");
}
public String storageFaceDownloadFile(){
return env.getProperty("storage.face.download-file");
}
public String storageFaceDeleteFile(){
return env.getProperty("storage.face.delete-file");
}
public String storageFaceViewXlsx(){
return env.getProperty("storage.face.view-xlsx");
}
/**
* Get links from env: face
* @return
*/
public String faceProtocol(){
return env.getProperty("face.protocol");
}
public String faceDomain(){
return env.getProperty("face.domain");
}
public String facePort(){
return env.getProperty("face.port");
}
public String faceHello(){
return env.getProperty("face.hello");
}
public String faceApiHome(){
return env.getProperty("face.api.home");
}
public String faceApiUpload(){
return env.getProperty("face.api.upload");
}
public String faceApiDownload(){
return env.getProperty("face.api.download");
}
public String faceFaceMainframe(){
return env.getProperty("face.face.mainframe");
}
public String faceFaceStorage(){
return env.getProperty("face.face.storage");
}
/**
* get links from env: source
*/
}

12
face/src/main/resources/application-face.yaml
Unescape View File

@ -0,0 +1,12 @@
face:
protocol: http://
domain: face
port: 8383
hello: /hello
api:
home: /api/v1
upload: /api/v1/upload
download: /api/v1/download
face:
mainframe: /face/v1/mainframe
storage: /face/v1/storage

14
face/src/main/resources/application-source.yaml
Unescape View File

@ -0,0 +1,14 @@
source:
protocol: http://
domain: storage
port: 8181
hello: /hello
api:
home: /api/v1
metadata-list: /api/v1/storage/metadata/list
post-list: /api/v1/storage/post/list
post-page: /api/v1/storage/post/page
post-page-distinct: /api/v1/storage/post/page/distinct
metadata-create: /api/v1/storage/metadata/create
post-create: /api/v1/storage/post/create
metadata-update: /api/v1/storage/metadata/update

44
face/src/main/resources/application-storage.yaml
Unescape View File

@ -0,0 +1,44 @@
storage:
protocol: http://
domain: storage
port: 8282
# страница описания сервиса
hello: /hello
api:
###################################
# основные возможности api
# корневая директория сервиса "storage"
home: /api/v1
# перечень файлов, размещенных в хранилище
files: /api/v1/files
# получение пути к корню файлового хранилища
root: /api/v1/root
# сохранение файла в хранилище
file-store: /api/v1/files/store
# сохранение нескольких файлов в хранилище
file-store-multiple: /api/v1/files/store-multiple
# удаление файла из хранилища
file-delete: /api/v1/files/delete
# скачивание файла из хранилища
file-download: /api/v1/files/download
# постраничное извлечение данных xlsx-файла в json формате
xlsx-page: /api/v1/files/xlsx
###################################
# дополнительные возможности api
# создание пустого файла
file-create-empty: /api/v1/files/create
# создание диектории
directory-create: /api/v1/dirs/create
# удаление директории
directory-delete: /api/v1/dirs/delete
# получение массива байтов файла, без буферизации
file-bytes: /files/get-bytes
face:
home: /face/v1
mainframe: /face/v1/mainframe
upload-file: /face/v1/upload-file
upload-multiple-files: /face/v1/upload-multiple-files
download: /files/download-file
delete: /files/delete-file
view-xlsx: /files/view

7
face/src/main/resources/application.yaml
Unescape View File

@ -1,6 +1,9 @@
spring: spring:
# config: profiles:
# import: classpath:/links.yaml include:
- face
- source
- storage
application: application:
name: face name: face
servlet: servlet:

69
face/src/main/resources/links.yaml
Unescape View File

@ -1,69 +0,0 @@
# Ссылки на ресурсы платформы
links:
storage:
protocol: http://
domain: storage
port: 8282
# страница описания сервиса
hello: /hello
api:
###################################
# основные возможности api
# корневая директория сервиса "storage"
home: /api/v1
# перечень файлов, размещенных в хранилище
files: /api/v1/files
# получение пути к корню файлового хранилища
root: /api/v1/root
# сохранение файла в хранилище
file-store: /api/v1/files/store
# сохранение нескольких файлов в хранилище
file-store-multiple: /api/v1/files/store-multiple
# удаление файла из хранилища
file-delete: /api/v1/files/delete
# скачивание файла из хранилища
file-download: /api/v1/files/download
# постраничное извлечение данных xlsx-файла в json формате
xlsx-page: /api/v1/files/xlsx
###################################
# дополнительные возможности api
# создание пустого файла
file-create-empty: /api/v1/files/create
# создание диектории
directory-create: /api/v1/dirs/create
# удаление директории
directory-delete: /api/v1/dirs/delete
# получение массива байтов файла, без буферизации
file-bytes: /files/get-bytes
# face:
# home: /face/v1
# mainframe: /face/v1/mainframe
# upload-file: /face/v1/upload-file
# upload-multiple-files: /face/v1/upload-multiple-files
# download: /files/download-file
# delete: /files/delete-file
# view-xlsx: /files/view
# source:
# protocol: http://
# domain: storage
# port: 8181
# hello: /hello
# api:
# home: /api/v1
# metadata-list: /api/v1/storage/metadata/list
# post-list: /api/v1/storage/post/list
# post-page: /api/v1/storage/post/page
# post-page-distinct: /api/v1/storage/post/page/distinct
# metadata-create: /api/v1/storage/metadata/create
# post-create: /api/v1/storage/post/create
# metadata-update: /api/v1/storage/metadata/update
# face:
# protocol: http://
# domain: face
# port: 8383
# hello: /hello
# api:
# home: /api/v1
# upload: /api/v1/upload
# face:
Write Preview
Loading…
Cancel
Save