Monday hotfix
This commit is contained in:
15
.idea/workspace.xml
generated
15
.idea/workspace.xml
generated
@@ -20,7 +20,8 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
|
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
@@ -204,7 +205,7 @@
|
|||||||
<option name="Make" enabled="true" />
|
<option name="Make" enabled="true" />
|
||||||
</method>
|
</method>
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
|
<configuration default="true" type="JetRunConfigurationType">
|
||||||
<module name="eureka" />
|
<module name="eureka" />
|
||||||
<option name="VM_PARAMETERS" />
|
<option name="VM_PARAMETERS" />
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
<option name="PROGRAM_PARAMETERS" />
|
||||||
@@ -217,7 +218,7 @@
|
|||||||
<option name="Make" enabled="true" />
|
<option name="Make" enabled="true" />
|
||||||
</method>
|
</method>
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
|
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
|
||||||
<module name="eureka" />
|
<module name="eureka" />
|
||||||
<option name="filePath" />
|
<option name="filePath" />
|
||||||
<option name="vmParameters" />
|
<option name="vmParameters" />
|
||||||
@@ -313,6 +314,7 @@
|
|||||||
<workItem from="1612609113694" duration="13936000" />
|
<workItem from="1612609113694" duration="13936000" />
|
||||||
<workItem from="1612777983977" duration="14203000" />
|
<workItem from="1612777983977" duration="14203000" />
|
||||||
<workItem from="1612868404302" duration="13841000" />
|
<workItem from="1612868404302" duration="13841000" />
|
||||||
|
<workItem from="1613384221052" duration="2559000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00077" summary="testing jenkins docker">
|
<task id="LOCAL-00077" summary="testing jenkins docker">
|
||||||
<created>1601453886631</created>
|
<created>1601453886631</created>
|
||||||
@@ -661,7 +663,7 @@
|
|||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
<option name="version" value="1" />
|
<option name="version" value="2" />
|
||||||
</component>
|
</component>
|
||||||
<component name="UnknownFeatures">
|
<component name="UnknownFeatures">
|
||||||
<option featureType="com.intellij.fileTypeFactory" implementationName="*.js" />
|
<option featureType="com.intellij.fileTypeFactory" implementationName="*.js" />
|
||||||
@@ -671,13 +673,12 @@
|
|||||||
<map>
|
<map>
|
||||||
<entry key="MAIN">
|
<entry key="MAIN">
|
||||||
<value>
|
<value>
|
||||||
<State>
|
<State />
|
||||||
<option name="COLUMN_ORDER" />
|
|
||||||
</State>
|
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="oldMeFiltersMigrated" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||||
|
|||||||
@@ -44,8 +44,9 @@ public class MockController {
|
|||||||
@ResponseBody
|
@ResponseBody
|
||||||
@GetMapping({"/mock/json", "/mock/json/{uuidValue}"})
|
@GetMapping({"/mock/json", "/mock/json/{uuidValue}"})
|
||||||
public List<MockedMessageDto> getJson(@PathVariable(required = false) String uuidValue){
|
public List<MockedMessageDto> getJson(@PathVariable(required = false) String uuidValue){
|
||||||
UUID clientUUID = UUID.fromString(uuidValue);
|
UUID clientUUID;
|
||||||
if(clientUUID == null) clientUUID = UUID.randomUUID();
|
if(uuidValue == null || uuidValue.equals("")) clientUUID = UUID.randomUUID();
|
||||||
|
else clientUUID = UUID.fromString(uuidValue);
|
||||||
List<MockedMessageDto> messages = klausService.getAllMockedResponses(clientUUID);
|
List<MockedMessageDto> messages = klausService.getAllMockedResponses(clientUUID);
|
||||||
if(messages.size() == 0) {
|
if(messages.size() == 0) {
|
||||||
klausService.setMockedResponse(buildDefaultMessage(clientUUID));
|
klausService.setMockedResponse(buildDefaultMessage(clientUUID));
|
||||||
|
|||||||
@@ -4,12 +4,13 @@
|
|||||||
<title>R11 MockedServices</title>
|
<title>R11 MockedServices</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<link rel="stylesheet" href="/css/main.css" type="text/css">
|
<link rel="stylesheet" href="/css/main.css" type="text/css">
|
||||||
|
<!-- <link rel="stylesheet" href="/css/wojtas.css" type="text/css">-->
|
||||||
<link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/>
|
<link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/>
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com">
|
<link rel="preconnect" href="https://fonts.gstatic.com">
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet">
|
||||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
|
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
|
||||||
<script type="text/javascript" src="/js/datatransfer.js"></script>
|
<script type="text/javascript" src="/js/datatransfer.js"></script>
|
||||||
<script type="text/javascript" src="historyloader.js"></script>
|
<!-- <script type="text/javascript" src="historyloader.js"></script>-->
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="container">
|
<div id="container">
|
||||||
|
|||||||
Reference in New Issue
Block a user