Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iotgateway
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
0Tyler
iotgateway
Commits
de08a87e
Commit
de08a87e
authored
Jun 03, 2019
by
0Tyler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
defaultData
parent
cd8a5094
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
97 additions
and
137 deletions
+97
-137
.gradle/4.10.3/fileHashes/fileHashes.bin
.gradle/4.10.3/fileHashes/fileHashes.bin
+0
-0
.gradle/4.10.3/fileHashes/fileHashes.lock
.gradle/4.10.3/fileHashes/fileHashes.lock
+0
-0
.idea/workspace.xml
.idea/workspace.xml
+79
-136
cloud/build.gradle
cloud/build.gradle
+1
-0
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java
.../edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java
+17
-1
gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock
gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+0
-0
gateway/build/test-results/test/binary/output.bin
gateway/build/test-results/test/binary/output.bin
+0
-0
gateway/build/test-results/test/binary/output.bin.idx
gateway/build/test-results/test/binary/output.bin.idx
+0
-0
No files found.
.gradle/4.10.3/fileHashes/fileHashes.bin
View file @
de08a87e
No preview for this file type
.gradle/4.10.3/fileHashes/fileHashes.lock
View file @
de08a87e
No preview for this file type
.idea/workspace.xml
View file @
de08a87e
...
...
@@ -7,21 +7,14 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"d3a5f2c9-d22f-4974-88fb-d506b4e5feaf"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/cloud/src/main/resources/document/溫溼度感測器檢測報告.pdf"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/cloud/src/main/resources/document/粉塵濃度感測器檢測報告.pdf"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cloud/build.gradle"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cloud/build.gradle"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/build.gradle"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/build.gradle"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/out/production/classes/META-INF/iotgateway.gateway.main.kotlin_module"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.class"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.class"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.class"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.class"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin.idx"
beforeDir=
"false"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/out/"
/>
<ignored
path=
"$PROJECT_DIR$/build/"
/>
...
...
@@ -145,11 +138,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
033
"
>
<caret
line=
"
69"
column=
"25"
lean-forward=
"true"
selection-start-line=
"69"
selection-start-column=
"25"
selection-end-line=
"69"
selection-end-column=
"25
"
/>
<state
relative-caret-position=
"1
45
"
>
<caret
line=
"
44"
lean-forward=
"true"
selection-start-line=
"44"
selection-end-line=
"44
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
...
...
@@ -157,10 +150,10 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
165
"
>
<state
relative-caret-position=
"
-51
"
>
<caret
line=
"33"
column=
"29"
selection-start-line=
"33"
selection-start-column=
"29"
selection-end-line=
"33"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
...
...
@@ -169,6 +162,24 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/cloud/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"39"
selection-start-line=
"39"
selection-end-line=
"39"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/gateway/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"717"
>
<caret
line=
"50"
column=
"14"
selection-start-line=
"50"
selection-start-column=
"14"
selection-end-line=
"50"
selection-end-column=
"14"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -217,24 +228,6 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"jar://C:/Program Files/Java/jdk1.8.0_201/src.zip!/java/net/SocketInputStream.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1530"
>
<caret
line=
"115"
selection-start-line=
"115"
selection-end-line=
"115"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"270"
>
<caret
line=
"21"
selection-start-line=
"21"
selection-end-line=
"21"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/DocumentService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -350,14 +343,14 @@
<option
value=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/PrivacyChoiceIndex.java"
/>
<option
value=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/model/PrivacyPolicyReportResponse.java"
/>
<option
value=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java"
/>
<option
value=
"$PROJECT_DIR$/cloud/build.gradle"
/>
<option
value=
"$PROJECT_DIR$/gateway/build.gradle"
/>
<option
value=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java"
/>
<option
value=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java"
/>
<option
value=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"
/>
<option
value=
"$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"
/>
<option
value=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
/>
<option
value=
"$PROJECT_DIR$/gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java"
/>
<option
value=
"$PROJECT_DIR$/cloud/build.gradle"
/>
<option
value=
"$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
/>
</list>
</option>
</component>
...
...
@@ -540,65 +533,6 @@
<item
name=
"resources"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"document"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"cloud"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"cloud"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"java"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"cloud"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"java"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"cloud"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"contract"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"contract"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"contract"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"contract"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"java"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"contract"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"test"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
<item
name=
"java"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"contract"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"iotgateway"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"iotgateway"
type=
"8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode"
/>
...
...
@@ -801,8 +735,8 @@
</option>
<option
name=
"contentProportion"
value=
"0.18181819"
/>
</component>
<component
name=
"RunManager"
selected=
"
JUnit.GatewayHttpApiTest
"
>
<configuration
name=
"iotgateway:cloud [b
ootJar
]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<component
name=
"RunManager"
selected=
"
Multirun.iotgateway
"
>
<configuration
name=
"iotgateway:cloud [b
uild
]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<ExternalSystemSettings>
<option
name=
"executionName"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$/cloud"
/>
...
...
@@ -813,7 +747,7 @@
</option>
<option
name=
"taskNames"
>
<list>
<option
value=
"b
ootJar
"
/>
<option
value=
"b
uild
"
/>
</list>
</option>
<option
name=
"vmOptions"
/>
...
...
@@ -821,10 +755,10 @@
<GradleScriptDebugEnabled>
true
</GradleScriptDebugEnabled>
<method
v=
"2"
/>
</configuration>
<configuration
name=
"iotgateway:
cloud
[build]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<configuration
name=
"iotgateway:
gateway
[build]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<ExternalSystemSettings>
<option
name=
"executionName"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$/
cloud
"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$/
gateway
"
/>
<option
name=
"externalSystemIdString"
value=
"GRADLE"
/>
<option
name=
"scriptParameters"
/>
<option
name=
"taskDescriptions"
>
...
...
@@ -840,10 +774,10 @@
<GradleScriptDebugEnabled>
true
</GradleScriptDebugEnabled>
<method
v=
"2"
/>
</configuration>
<configuration
name=
"iotgateway:
cloud
[clean]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<configuration
name=
"iotgateway:
gateway
[clean]"
type=
"GradleRunConfiguration"
factoryName=
"Gradle"
temporary=
"true"
>
<ExternalSystemSettings>
<option
name=
"executionName"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$/
cloud
"
/>
<option
name=
"externalProjectPath"
value=
"$PROJECT_DIR$/
gateway
"
/>
<option
name=
"externalSystemIdString"
value=
"GRADLE"
/>
<option
name=
"scriptParameters"
/>
<option
name=
"taskDescriptions"
>
...
...
@@ -917,8 +851,6 @@
</method>
</configuration>
<list>
<item
itemvalue=
"Gradle.iotgateway:cloud [bootJar]"
/>
<item
itemvalue=
"Gradle.iotgateway:cloud [clean]"
/>
<item
itemvalue=
"Gradle.iotgateway:cloud [build]"
/>
<item
itemvalue=
"JUnit.GatewayHttpApiTest"
/>
<item
itemvalue=
"JUnit.ContractTester"
/>
...
...
@@ -926,14 +858,16 @@
<item
itemvalue=
"Spring Boot.GatewayApplication"
/>
<item
itemvalue=
"Spring Boot.CloudApplication"
/>
<item
itemvalue=
"Spring Boot.ContractApplication"
/>
<item
itemvalue=
"Gradle.iotgateway:gateway [clean]"
/>
<item
itemvalue=
"Gradle.iotgateway:gateway [build]"
/>
</list>
<recent_temporary>
<list>
<item
itemvalue=
"Gradle.iotgateway:gateway [build]"
/>
<item
itemvalue=
"Gradle.iotgateway:gateway [clean]"
/>
<item
itemvalue=
"JUnit.GatewayHttpApiTest"
/>
<item
itemvalue=
"JUnit.ContractTester"
/>
<item
itemvalue=
"Gradle.iotgateway:cloud [build]"
/>
<item
itemvalue=
"Gradle.iotgateway:cloud [clean]"
/>
<item
itemvalue=
"Gradle.iotgateway:cloud [bootJar]"
/>
</list>
</recent_temporary>
</component>
...
...
@@ -956,7 +890,7 @@
<workItem
from=
"1558076620952"
duration=
"30942000"
/>
<workItem
from=
"1558531083647"
duration=
"61839000"
/>
<workItem
from=
"1559030426004"
duration=
"26881000"
/>
<workItem
from=
"1559534946076"
duration=
"2
078
000"
/>
<workItem
from=
"1559534946076"
duration=
"2
991
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"git init"
>
<created>
1556204675975
</created>
...
...
@@ -1119,7 +1053,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1559028497214
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"24"
/>
<task
id=
"LOCAL-00024"
summary=
"defaultData"
>
<created>
1559537091307
</created>
<option
name=
"number"
value=
"00024"
/>
<option
name=
"presentableId"
value=
"LOCAL-00024"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1559537091307
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"25"
/>
<servers
/>
</component>
<component
name=
"TestHistory"
>
...
...
@@ -1155,7 +1096,7 @@
</history-entry>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"32
1780
000"
/>
<option
name=
"totallyTimeSpent"
value=
"32
2693
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -1168,6 +1109,7 @@
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
<editor
active=
"true"
/>
<layout>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.1988273"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
...
...
@@ -1175,11 +1117,11 @@
<window_info
id=
"UI Designer"
order=
"3"
/>
<window_info
id=
"Favorites"
order=
"4"
side_tool=
"true"
/>
<window_info
id=
"Web"
order=
"5"
side_tool=
"true"
/>
<window_info
anchor=
"bottom"
id=
"Run Dashboard"
order=
"0"
sideWeight=
"0.49946696"
visible=
"true"
weight=
"0.422049"
/>
<window_info
anchor=
"bottom"
id=
"Run Dashboard"
order=
"0"
sideWeight=
"0.49946696"
weight=
"0.422049"
/>
<window_info
anchor=
"bottom"
id=
"Messages"
order=
"1"
sideWeight=
"0.49733475"
weight=
"0.2806236"
/>
<window_info
anchor=
"bottom"
id=
"Message"
order=
"2"
/>
<window_info
anchor=
"bottom"
id=
"Find"
order=
"3"
sideWeight=
"0.4989339"
weight=
"0.3596882"
/>
<window_info
anchor=
"bottom"
id=
"Run"
order=
"4"
sideWeight=
"0.49840087"
weight=
"0.5935412
"
/>
<window_info
anchor=
"bottom"
id=
"Run"
order=
"4"
sideWeight=
"0.49840087"
visible=
"true"
weight=
"0.28396437
"
/>
<window_info
anchor=
"bottom"
id=
"Debug"
order=
"5"
weight=
"0.2962138"
/>
<window_info
anchor=
"bottom"
id=
"Cvs"
order=
"6"
weight=
"0.25"
/>
<window_info
anchor=
"bottom"
id=
"Inspection"
order=
"7"
weight=
"0.4"
/>
...
...
@@ -1197,7 +1139,7 @@
<window_info
anchor=
"right"
content_ui=
"combo"
id=
"Hierarchy"
order=
"2"
weight=
"0.25"
/>
<window_info
anchor=
"right"
id=
"Maven"
order=
"3"
/>
<window_info
anchor=
"right"
id=
"Palette"
order=
"4"
/>
<window_info
anchor=
"right"
id=
"Gradle"
order=
"5"
visible=
"true"
weight=
"0.
0858209
"
/>
<window_info
anchor=
"right"
id=
"Gradle"
order=
"5"
visible=
"true"
weight=
"0.
20042644
"
/>
<window_info
anchor=
"right"
id=
"Database"
order=
"6"
weight=
"0.17430703"
/>
<window_info
anchor=
"right"
id=
"Palette	"
order=
"7"
/>
<window_info
anchor=
"right"
id=
"Bean Validation"
order=
"8"
weight=
"0.32932165"
/>
...
...
@@ -1225,7 +1167,8 @@
<MESSAGE
value=
"document controller"
/>
<MESSAGE
value=
"gateway:DeviceService:addfilter & gateway:PrivacyService:addfilter"
/>
<MESSAGE
value=
"getPrivacyPolicyReportResponse"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"getPrivacyPolicyReportResponse"
/>
<MESSAGE
value=
"defaultData"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"defaultData"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
...
...
@@ -1430,20 +1373,6 @@
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java"
/>
<entry
file=
"file://$PROJECT_DIR$/cloud/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"197"
>
<caret
line=
"50"
column=
"1"
selection-start-line=
"50"
selection-start-column=
"1"
selection-end-line=
"50"
selection-end-column=
"1"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/gateway/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"362"
>
<caret
line=
"48"
column=
"18"
selection-start-line=
"48"
selection-start-column=
"18"
selection-end-line=
"48"
selection-end-column=
"18"
/>
</state>
</provider>
</entry>
<entry
file=
"jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework/spring-core/5.1.6.RELEASE/aa74700198d24e1ed8b3c8ad663ad50733658ac6/spring-core-5.1.6.RELEASE-sources.jar!/org/springframework/core/io/Resource.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"293"
>
...
...
@@ -1598,16 +1527,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1033"
>
<caret
line=
"69"
column=
"25"
lean-forward=
"true"
selection-start-line=
"69"
selection-start-column=
"25"
selection-end-line=
"69"
selection-end-column=
"25"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"326"
>
...
...
@@ -1641,7 +1560,7 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
165
"
>
<state
relative-caret-position=
"
-51
"
>
<caret
line=
"33"
column=
"29"
selection-start-line=
"33"
selection-start-column=
"29"
selection-end-line=
"33"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
...
...
@@ -1649,6 +1568,30 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/gateway/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"717"
>
<caret
line=
"50"
column=
"14"
selection-start-line=
"50"
selection-start-column=
"14"
selection-end-line=
"50"
selection-end-column=
"14"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cloud/build.gradle"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"39"
selection-start-line=
"39"
selection-end-line=
"39"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"145"
>
<caret
line=
"44"
lean-forward=
"true"
selection-start-line=
"44"
selection-end-line=
"44"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</component>
<component
name=
"gradleExecuteTaskHistory"
>
<option
value=
""
/>
...
...
cloud/build.gradle
View file @
de08a87e
...
...
@@ -35,6 +35,7 @@ repositories {
dependencies
{
implementation
'org.springframework.boot:spring-boot-starter-data-jpa'
implementation
'org.springframework.boot:spring-boot-starter-web'
implementation
'org.springframework:spring-test'
implementation
"org.mapstruct:mapstruct:${mapstructVersion}"
compileOnly
'org.projectlombok:lombok'
...
...
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java
View file @
de08a87e
...
...
@@ -40,6 +40,11 @@ public class DefaultData implements ApplicationRunner {
this
.
privacyPolicyReportService
=
privacyPolicyReportService
;
this
.
documentService
=
documentService
;
}
@Value
(
"classpath:document/心跳血氧機檢測報告.pdf"
)
Resource
oxygenResource
;
@Value
(
"classpath:document/紫外線傳感器檢測報告.pdf"
)
Resource
sensorResource
;
@Value
(
"classpath:document/粉塵濃度感測器檢測報告.pdf"
)
Resource
dustResource
;
...
...
@@ -47,6 +52,9 @@ public class DefaultData implements ApplicationRunner {
@Value
(
"classpath:document/溫溼度感測器檢測報告.pdf"
)
Resource
tempResource
;
@Value
(
"classpath:document/氣體感測器檢測報告.pdf"
)
Resource
gasResource
;
@Override
public
void
run
(
ApplicationArguments
args
)
{
//心跳血氧機
...
...
@@ -169,7 +177,7 @@ public class DefaultData implements ApplicationRunner {
))
.
build
();
Document
document
=
resourceToMultipartFile
(
temp
Resource
)
Document
document
=
resourceToMultipartFile
(
oxygen
Resource
)
.
flatMap
(
documentService:
:
add
)
.
orElse
(
Document
.
builder
().
build
());
...
...
@@ -238,6 +246,10 @@ public class DefaultData implements ApplicationRunner {
.
build
()))
.
build
();
document
=
resourceToMultipartFile
(
sensorResource
)
.
flatMap
(
documentService:
:
add
)
.
orElse
(
Document
.
builder
().
build
());
PrivacyPolicyReport
sensorPrivacyPolicyReport
=
PrivacyPolicyReport
.
builder
()
.
id
(
"0cfb6be3-6f0f-4e63-85b8-e9c936707c0a"
)
.
version
(
"1.0"
)
...
...
@@ -461,6 +473,10 @@ public class DefaultData implements ApplicationRunner {
.
build
()))
.
build
();
document
=
resourceToMultipartFile
(
gasResource
)
.
flatMap
(
documentService:
:
add
)
.
orElse
(
Document
.
builder
().
build
());
PrivacyPolicyReport
gasPrivacyPolicyReport
=
PrivacyPolicyReport
.
builder
()
.
id
(
"0cfb6be3-6f0f-4e63-85b8-e9c936707c0a"
)
.
version
(
"1.0"
)
...
...
gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file @
de08a87e
No preview for this file type
gateway/build/test-results/test/binary/output.bin
View file @
de08a87e
No preview for this file type
gateway/build/test-results/test/binary/output.bin.idx
deleted
100644 → 0
View file @
cd8a5094
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment