cleanup
This commit is contained in:
parent
fab87fe804
commit
ac6488b343
|
|
@ -0,0 +1,45 @@
|
||||||
|
### Register User
|
||||||
|
POST http://localhost:8080/api/v1/auth/register
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"firstname": "Ali",
|
||||||
|
"lastname": "Bouali",
|
||||||
|
"email": "alibou@mail.com",
|
||||||
|
"password": "password",
|
||||||
|
"role": "ADMIN"
|
||||||
|
}
|
||||||
|
|
||||||
|
> {% client.global.set("auth-token", response.body.access_token); %}
|
||||||
|
|
||||||
|
### Query the Demo endpoint
|
||||||
|
GET http://localhost:8080/api/v1/demo-controller
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
|
||||||
|
|
||||||
|
### Change the password
|
||||||
|
PATCH http://localhost:8080/api/v1/users
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"currentPassword": "password",
|
||||||
|
"newPassword": "newPassword",
|
||||||
|
"confirmationPassword": "newPassword"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Login again and update the token
|
||||||
|
POST http://localhost:8080/api/v1/auth/authenticate
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"email": "alibou@mail.com",
|
||||||
|
"password": "newPassword"
|
||||||
|
}
|
||||||
|
|
||||||
|
> {% client.global.set("new-auth-token", response.body.access_token); %}
|
||||||
|
|
||||||
|
|
||||||
|
### Query the Demo endpoint after password change
|
||||||
|
GET http://localhost:8080/api/v1/demo-controller
|
||||||
|
Authorization: Bearer {{new-auth-token}}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
### Register User
|
||||||
|
POST http://localhost:8080/api/v1/auth/register
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"firstname": "Ali",
|
||||||
|
"lastname": "Bouali",
|
||||||
|
"email": "alibou21@mail.com",
|
||||||
|
"password": "password",
|
||||||
|
"role": "ADMIN"
|
||||||
|
}
|
||||||
|
|
||||||
|
> {% client.global.set("auth-token", response.body.access_token); %}
|
||||||
|
|
||||||
|
### Query the Demo endpoint
|
||||||
|
GET http://localhost:8080/api/v1/demo-controller
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
### Register User
|
||||||
|
POST http://localhost:8080/api/v1/auth/register
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"firstname": "Ali",
|
||||||
|
"lastname": "Bouali",
|
||||||
|
"email": "alibou@mail.com",
|
||||||
|
"password": "password",
|
||||||
|
"role": "ADMIN"
|
||||||
|
}
|
||||||
|
|
||||||
|
> {% client.global.set("auth-token", response.body.access_token); %}
|
||||||
|
|
||||||
|
|
||||||
|
###Create a new book
|
||||||
|
POST http://localhost:8080/api/v1/books
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"author": "Alibou",
|
||||||
|
"isbn": "12345"
|
||||||
|
}
|
||||||
|
|
||||||
|
### Query Books
|
||||||
|
GET http://localhost:8080/api/v1/books
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
|
||||||
|
### Update one book
|
||||||
|
POST http://localhost:8080/api/v1/books
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
Content-Type: application/json
|
||||||
|
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"author": "Alibou 2",
|
||||||
|
"isbn": "12345"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Query the Books one more time
|
||||||
|
GET http://localhost:8080/api/v1/books
|
||||||
|
Authorization: Bearer {{auth-token}}
|
||||||
|
|
@ -0,0 +1,517 @@
|
||||||
|
<mxfile host="Electron" modified="2023-04-27T08:53:10.057Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.1 Chrome/112.0.5615.87 Electron/24.1.2 Safari/537.36" etag="DDOU9Ve5raWsCyPsviHS" version="21.2.1" type="device" pages="4">
|
||||||
|
<diagram id="pjGB-ErrghB2Nym8I_LS" name="security-workflow">
|
||||||
|
<mxGraphModel dx="3194" dy="1214" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="0" />
|
||||||
|
<mxCell id="1" parent="0" />
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-13" value="" style="group" parent="1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="160" y="30" width="787" height="787" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-14" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-13" vertex="1" connectable="0">
|
||||||
|
<mxGeometry width="787" height="787" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-2" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry width="787" height="787" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-5" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="38" y="116" width="727" height="520" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-16" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="317" y="120" width="124" height="93" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-12" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=none;shadow=0;align=center;verticalAlign=top;fillColor=#3B8DF1;shape=mxgraph.gcp2.systems_check;rounded=0;fontColor=#3399FF;" parent="qfr3ut9dFdVh4iJpzXPu-16" vertex="1">
|
||||||
|
<mxGeometry x="26.840000000000003" y="26" width="66.33" height="67" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-15" value="UserDetailsService" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#3399FF;fontStyle=1" parent="qfr3ut9dFdVh4iJpzXPu-16" vertex="1">
|
||||||
|
<mxGeometry x="-3" width="127" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-28" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="182" y="245" width="120" height="112.04615384615384" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-29" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-28" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="20" width="80" height="82.04615384615384" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-30" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-29" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="23.200000000000003" y="18.870615384615384" width="32" height="45.12538461538462" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-31" value="" style="verticalLabelPosition=bottom;html=1;verticalAlign=top;align=center;strokeColor=#2D7600;fillColor=#60a917;shape=mxgraph.azure.startup_task;pointerEvents=1;fontSize=14;fontColor=#ffffff;" parent="qfr3ut9dFdVh4iJpzXPu-30" vertex="1">
|
||||||
|
<mxGeometry width="31.99999999999999" height="45.12538461538462" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-32" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=#2D7600;shadow=0;align=center;verticalAlign=top;fillColor=#60a917;shape=mxgraph.gcp2.check;fontSize=14;fontColor=#ffffff;" parent="qfr3ut9dFdVh4iJpzXPu-30" vertex="1">
|
||||||
|
<mxGeometry x="3.1971197119711996" y="5.206775147928994" width="9.89152296481915" height="7.9132183718553195" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-33" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=#2D7600;shadow=0;align=center;verticalAlign=top;fillColor=#60a917;shape=mxgraph.gcp2.check;fontSize=14;fontColor=#ffffff;" parent="qfr3ut9dFdVh4iJpzXPu-30" vertex="1">
|
||||||
|
<mxGeometry x="3.1971197119711996" y="12.149142011834318" width="9.89152296481915" height="7.9132183718553195" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-34" value="" style="rhombus;whiteSpace=wrap;html=1;fontSize=14;fontColor=default;fillColor=none;" parent="qfr3ut9dFdVh4iJpzXPu-29" vertex="1">
|
||||||
|
<mxGeometry width="80" height="82.04615384615384" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-35" value="Validate JWT" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=14;fontColor=#006600;fontStyle=1" parent="qfr3ut9dFdVh4iJpzXPu-28" vertex="1">
|
||||||
|
<mxGeometry x="8" y="83.04615384615384" width="104" height="29" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=default;strokeWidth=2;fontColor=#0079d6;" parent="qfr3ut9dFdVh4iJpzXPu-14" source="qfr3ut9dFdVh4iJpzXPu-41" target="qfr3ut9dFdVh4iJpzXPu-44" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-41" value="Security" style="html=1;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.security;rounded=0;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="332" y="374" width="83" height="63" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-42" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;strokeColor=#6c8ebf;strokeWidth=2;fontColor=default;fillColor=#dae8fc;" parent="qfr3ut9dFdVh4iJpzXPu-14" source="qfr3ut9dFdVh4iJpzXPu-34" target="qfr3ut9dFdVh4iJpzXPu-41" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-20" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="30.5" y="388" width="115" height="63.4736842105263" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-6" value="<font color="#3399ff">Check JWT token</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontStyle=1" parent="qfr3ut9dFdVh4iJpzXPu-20" vertex="1">
|
||||||
|
<mxGeometry x="-3" y="37.4736842105263" width="118" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-4" value="" style="verticalLabelPosition=bottom;html=1;verticalAlign=top;align=center;strokeColor=none;fillColor=#00BEF2;shape=mxgraph.azure.startup_task;pointerEvents=1;" parent="qfr3ut9dFdVh4iJpzXPu-20" vertex="1">
|
||||||
|
<mxGeometry x="32.580357142857146" width="39.441964285714285" height="39.473684210526315" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-43" value="Update the<br>SecurityContextHolder" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#0079d6;fontStyle=1" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="303" y="440" width="148" height="41" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;strokeWidth=2;fontColor=#0079d6;" parent="qfr3ut9dFdVh4iJpzXPu-14" source="qfr3ut9dFdVh4iJpzXPu-44" target="qfr3ut9dFdVh4iJpzXPu-47" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-44" value="" style="aspect=fixed;perimeter=ellipsePerimeter;html=1;align=center;shadow=0;dashed=0;fontColor=#4277BB;labelBackgroundColor=#ffffff;fontSize=12;spacingTop=3;image;image=img/lib/ibm/vpc/Router.svg;rounded=0;sketch=0;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="575" y="375.5" width="60" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-46" value="" style="group" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="552" y="504" width="90" height="130" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-47" value="" style="sketch=0;aspect=fixed;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;align=center;fillColor=#808080;shape=mxgraph.mscae.enterprise.server_directory;rounded=0;labelBackgroundColor=none;labelBorderColor=none;strokeWidth=2;fontSize=32;fontColor=#3399FF;" parent="qfr3ut9dFdVh4iJpzXPu-46" vertex="1">
|
||||||
|
<mxGeometry x="18" width="72" height="100" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-48" value="Controller" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=14;fontColor=default;fontStyle=1" parent="qfr3ut9dFdVh4iJpzXPu-46" vertex="1">
|
||||||
|
<mxGeometry y="100" width="90" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-60" value="" style="sketch=0;html=1;aspect=fixed;strokeColor=#82b366;shadow=0;align=center;verticalAlign=top;fillColor=#d5e8d4;shape=mxgraph.gcp2.systems_check;rounded=0;fontColor=#2c8b18;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="328.0032258064516" y="219.9320430107527" width="41.72370967741935" height="42.145161290322584" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-61" value="JwtService" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#82b366;fillColor=#d5e8d4;fontStyle=1;fontColor=#2c8b18;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="366.00290322580645" y="228" width="81" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-62" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;strokeColor=#2D7600;strokeWidth=2;fontColor=#2c8b18;fillColor=#60a917;" parent="qfr3ut9dFdVh4iJpzXPu-14" source="qfr3ut9dFdVh4iJpzXPu-34" target="qfr3ut9dFdVh4iJpzXPu-60" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-66" value="DispatcherServlet" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#8ec53f;" parent="qfr3ut9dFdVh4iJpzXPu-14" vertex="1">
|
||||||
|
<mxGeometry x="548.5" y="353" width="113" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-64" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=default;strokeWidth=2;fontColor=#2c8b18;" parent="1" source="OGfNcUSvT1gZZqw-ERg4-1" target="OGfNcUSvT1gZZqw-ERg4-2" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-1" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://seeklogo.com/images/P/postman-logo-F43375A2EB-seeklogo.com.png;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="8" y="398.5" width="48.67" height="50" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-1" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://4.bp.blogspot.com/-ou-a_Aa1t7A/W6IhNc3Q0gI/AAAAAAAAD6Y/pwh44arKiuM_NBqB1H7Pz4-7QhUxAgZkACLcBGAs/s1600/spring-boot-logo.png;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="688.26" y="672" width="150.48" height="79" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-2" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://www.turbonomic.com/wp-content/uploads/2022/04/logo_apache-tomcat.png;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="268.26" y="676.25" width="130" height="70.5" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-11" value="" style="group;" parent="1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="214" y="366" width="98" height="64" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-8" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="OGfNcUSvT1gZZqw-ERg4-11" vertex="1">
|
||||||
|
<mxGeometry width="84" height="48" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-9" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="OGfNcUSvT1gZZqw-ERg4-11" vertex="1">
|
||||||
|
<mxGeometry x="7" y="8" width="84" height="48" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-10" value="JwtAuthFilter" style="rounded=0;whiteSpace=wrap;html=1;" parent="OGfNcUSvT1gZZqw-ERg4-11" vertex="1">
|
||||||
|
<mxGeometry x="14" y="16" width="84" height="48" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-3" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;strokeColor=#000033;strokeWidth=2;fontSize=14;fontColor=default;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-2" edge="1">
|
||||||
|
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||||
|
<mxPoint x="398.26" y="702" as="sourcePoint" />
|
||||||
|
<mxPoint x="673.5" y="712" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;fontColor=#3399FF;strokeWidth=2;" parent="1" source="OGfNcUSvT1gZZqw-ERg4-8" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="502" y="212" as="targetPoint" />
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="284" y="366" />
|
||||||
|
<mxPoint x="284" y="212" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontColor=#3399FF;strokeWidth=2;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-12" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="1080" y="280" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-22" value="" style="group" parent="1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="1006.98" y="281" width="133.01999999999998" height="209" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-21" value="" style="aspect=fixed;html=1;points=[];align=center;image;fontSize=12;image=img/lib/azure2/databases/Azure_Database_PostgreSQL_Server.svg;rounded=0;sketch=0;fontColor=#3399FF;" parent="qfr3ut9dFdVh4iJpzXPu-22" vertex="1">
|
||||||
|
<mxGeometry x="12.019999999999982" width="90.75" height="121" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OGfNcUSvT1gZZqw-ERg4-4" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://developers.redhat.com/sites/default/files/styles/article_feature/public/blog/2014/05/homepage-docker-logo.png?itok=zx0e-vcP;" parent="qfr3ut9dFdVh4iJpzXPu-22" vertex="1">
|
||||||
|
<mxGeometry y="99" width="133.02" height="110" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-24" value="Invalid JWT token" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#e26259;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="56.8" y="230" width="120" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-25" value="Missing JWT" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#e26259;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="76.6" y="288" width="91" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-26" value="User does not exist" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#e26259;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="76.6" y="311" width="129" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-27" value="HTTP 403" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#e26259;rounded=0;sketch=0;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="1" y="356" width="72" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.959;entryY=0.695;entryDx=0;entryDy=0;entryPerimeter=0;strokeColor=#0ed60a;strokeWidth=2;fontColor=default;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-21" target="qfr3ut9dFdVh4iJpzXPu-12" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="1064" y="223" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0;entryDx=0;entryDy=0;strokeColor=#0ed60a;strokeWidth=2;fontColor=default;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-12" target="OGfNcUSvT1gZZqw-ERg4-8" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="298" y="225" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=default;strokeWidth=2;fontColor=default;" parent="1" source="OGfNcUSvT1gZZqw-ERg4-10" target="qfr3ut9dFdVh4iJpzXPu-34" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-40" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#d50c0b;strokeWidth=2;fontColor=default;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-34" target="OGfNcUSvT1gZZqw-ERg4-1" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="402" y="259" />
|
||||||
|
<mxPoint x="32" y="259" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-53" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#3c8df1;strokeWidth=2;fontColor=#0079d6;startArrow=none;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-55" target="OGfNcUSvT1gZZqw-ERg4-1" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-55" value="" style="dashed=0;outlineConnect=0;html=1;align=center;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.weblogos.json_2;rounded=0;sketch=0;fontColor=#0079d6;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="76.60000000000002" y="571.4" width="80.4" height="25.200000000000003" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-56" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#3c8df1;strokeWidth=2;fontColor=#0079d6;endArrow=none;" parent="1" source="qfr3ut9dFdVh4iJpzXPu-47" target="qfr3ut9dFdVh4iJpzXPu-55" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="730" y="584.0322580645161" as="sourcePoint" />
|
||||||
|
<mxPoint x="32.322580645161224" y="448.5" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-57" value="HTTP 200" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#0079d6;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry y="464" width="72" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-58" style="edgeStyle=orthogonalEdgeStyle;rounded=0;sketch=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;strokeColor=#d40d0b;strokeWidth=2;fontColor=#d40d0b;" parent="1" source="OGfNcUSvT1gZZqw-ERg4-8" target="OGfNcUSvT1gZZqw-ERg4-1" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="214" y="287" />
|
||||||
|
<mxPoint x="32" y="287" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="qfr3ut9dFdVh4iJpzXPu-65" value="HTTP Requests" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=default;fontStyle=1" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="45" y="425" width="106" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
<diagram id="sBTO1LKfppjqILYJjrTV" name="new-flow">
|
||||||
|
<mxGraphModel dx="2229" dy="1045" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="0" />
|
||||||
|
<mxCell id="1" parent="0" />
|
||||||
|
<mxCell id="HA8-pInTj3ZK-7nUhY4h-1" value="" style="group;fillColor=default;strokeColor=none;" parent="1" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="60" y="360" width="180" height="90" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="QRnQFyGs-lFjeeRuztLu-1" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="HA8-pInTj3ZK-7nUhY4h-1" vertex="1">
|
||||||
|
<mxGeometry width="160" height="70" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="QRnQFyGs-lFjeeRuztLu-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="HA8-pInTj3ZK-7nUhY4h-1" vertex="1">
|
||||||
|
<mxGeometry x="10" y="10" width="160" height="70" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="QRnQFyGs-lFjeeRuztLu-3" value="JwtAuthFilter" style="rounded=0;whiteSpace=wrap;html=1;" parent="HA8-pInTj3ZK-7nUhY4h-1" vertex="1">
|
||||||
|
<mxGeometry x="20" y="20" width="160" height="70" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="OrCYgKApnLObKEuBMM75-1" target="OrCYgKApnLObKEuBMM75-5" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-1" value="JwtService" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="400" y="330" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="OrCYgKApnLObKEuBMM75-2" target="OrCYgKApnLObKEuBMM75-5" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-2" value="TokenRepository" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="400" y="430" width="120" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" parent="1" source="QRnQFyGs-lFjeeRuztLu-3" target="OrCYgKApnLObKEuBMM75-1" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" parent="1" source="QRnQFyGs-lFjeeRuztLu-3" target="OrCYgKApnLObKEuBMM75-2" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EAdGHvd8W2WM0f3SbvN2-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeWidth=2;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" source="OrCYgKApnLObKEuBMM75-5" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="920" y="405" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EAdGHvd8W2WM0f3SbvN2-6" value="Valid token" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="EAdGHvd8W2WM0f3SbvN2-2" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="-0.319" y="1" relative="1" as="geometry">
|
||||||
|
<mxPoint x="13" as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EAdGHvd8W2WM0f3SbvN2-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeWidth=2;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" source="OrCYgKApnLObKEuBMM75-5" edge="1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="740" y="200" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EAdGHvd8W2WM0f3SbvN2-5" value="Invalid token" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="EAdGHvd8W2WM0f3SbvN2-4" vertex="1" connectable="0">
|
||||||
|
<mxGeometry x="-0.1919" y="-1" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="OrCYgKApnLObKEuBMM75-5" value="Calculate" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="700" y="365" width="80" height="80" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
<diagram id="JHzdb8y7AclNLFwD1zrP" name="class-diagram">
|
||||||
|
<mxGraphModel dx="2229" dy="1045" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="0" />
|
||||||
|
<mxCell id="1" parent="0" />
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-1" value="User" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;fillColor=default;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="344" y="259" width="180" height="210" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="30" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-3" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-2" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-4" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-2" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="60" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-6" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-5" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-7" value="firstName" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-5" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="90" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-9" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-8" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-10" value="lastName" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-8" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-11" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="120" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-12" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-11" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-13" value="email" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-11" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-32" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="150" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-33" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-32" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-34" value="password" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-32" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-35" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-1" vertex="1">
|
||||||
|
<mxGeometry y="180" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-36" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-35" vertex="1">
|
||||||
|
<mxGeometry width="60" height="30" as="geometry">
|
||||||
|
<mxRectangle width="60" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-37" value="role" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-35" vertex="1">
|
||||||
|
<mxGeometry x="60" width="120" height="30" as="geometry">
|
||||||
|
<mxRectangle width="120" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-14" value="Token" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;fillColor=default;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="645" y="389" width="180" height="180" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-15" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="XC6CGuYQlSzaP45YXhiZ-14" vertex="1">
|
||||||
|
<mxGeometry y="30" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-16" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-15" vertex="1">
|
||||||
|
<mxGeometry width="49" height="30" as="geometry">
|
||||||
|
<mxRectangle width="49" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-17" value="id" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-15" vertex="1">
|
||||||
|
<mxGeometry x="49" width="131" height="30" as="geometry">
|
||||||
|
<mxRectangle width="131" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-18" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-14" vertex="1">
|
||||||
|
<mxGeometry y="60" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-19" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-18" vertex="1">
|
||||||
|
<mxGeometry width="49" height="30" as="geometry">
|
||||||
|
<mxRectangle width="49" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-20" value="token" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-18" vertex="1">
|
||||||
|
<mxGeometry x="49" width="131" height="30" as="geometry">
|
||||||
|
<mxRectangle width="131" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-21" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-14" vertex="1">
|
||||||
|
<mxGeometry y="90" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-22" value="String" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-21" vertex="1">
|
||||||
|
<mxGeometry width="49" height="30" as="geometry">
|
||||||
|
<mxRectangle width="49" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-23" value="tokenType" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-21" vertex="1">
|
||||||
|
<mxGeometry x="49" width="131" height="30" as="geometry">
|
||||||
|
<mxRectangle width="131" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-28" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-14" vertex="1">
|
||||||
|
<mxGeometry y="120" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-29" value="boolean" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-28" vertex="1">
|
||||||
|
<mxGeometry width="49" height="30" as="geometry">
|
||||||
|
<mxRectangle width="49" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-30" value="expired" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-28" vertex="1">
|
||||||
|
<mxGeometry x="49" width="131" height="30" as="geometry">
|
||||||
|
<mxRectangle width="131" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-24" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="XC6CGuYQlSzaP45YXhiZ-14" vertex="1">
|
||||||
|
<mxGeometry y="150" width="180" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-25" value="boolean" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-24" vertex="1">
|
||||||
|
<mxGeometry width="49" height="30" as="geometry">
|
||||||
|
<mxRectangle width="49" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-26" value="revoked" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;" parent="XC6CGuYQlSzaP45YXhiZ-24" vertex="1">
|
||||||
|
<mxGeometry x="49" width="131" height="30" as="geometry">
|
||||||
|
<mxRectangle width="131" height="30" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="XC6CGuYQlSzaP45YXhiZ-31" value="" style="edgeStyle=entityRelationEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;strokeWidth=1;" parent="1" edge="1">
|
||||||
|
<mxGeometry width="100" height="100" relative="1" as="geometry">
|
||||||
|
<mxPoint x="524" y="343" as="sourcePoint" />
|
||||||
|
<mxPoint x="644" y="479" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
<diagram id="P7HX4lKzGpJc8V-NnKQx" name="roles and permissions">
|
||||||
|
<mxGraphModel dx="903" dy="446" grid="0" gridSize="10" guides="1" tooltips="1" connect="0" arrows="0" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" math="0" shadow="0">
|
||||||
|
<root>
|
||||||
|
<mxCell id="0" />
|
||||||
|
<mxCell id="1" parent="0" />
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-17" value="Roles and Permissions" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;fontSize=23;fontStyle=1" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="233" y="213" width="688" height="417" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-1" target="LGTntW4OqFH9rOVflEHm-2">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;curved=1;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-1" target="Fkp4l_HLPrJYwHj4Cqq2-12">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="LGTntW4OqFH9rOVflEHm-1" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="332" y="396" width="30" height="60" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-2" target="LGTntW4OqFH9rOVflEHm-3">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-2" target="Fkp4l_HLPrJYwHj4Cqq2-1">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-2" target="Fkp4l_HLPrJYwHj4Cqq2-2">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="LGTntW4OqFH9rOVflEHm-2" target="Fkp4l_HLPrJYwHj4Cqq2-3">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="LGTntW4OqFH9rOVflEHm-2" value="ROLE_A" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="467" y="329" width="110" height="36" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="LGTntW4OqFH9rOVflEHm-3" value="RESOURCE:READ" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
|
||||||
|
<mxGeometry x="640" y="272" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-1" value="RESOURCE:WRITE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="312" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-2" value="RESOURCE:DELETE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="352" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-3" value="RESOURCE:UPDATE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="392" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fkp4l_HLPrJYwHj4Cqq2-12" target="Fkp4l_HLPrJYwHj4Cqq2-13">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fkp4l_HLPrJYwHj4Cqq2-12" target="Fkp4l_HLPrJYwHj4Cqq2-14">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fkp4l_HLPrJYwHj4Cqq2-12" target="Fkp4l_HLPrJYwHj4Cqq2-15">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fkp4l_HLPrJYwHj4Cqq2-12" target="Fkp4l_HLPrJYwHj4Cqq2-16">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-12" value="ROLE_B" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="467" y="489" width="110" height="36" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-13" value="RESOURCE:READ" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="432" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-14" value="RESOURCE:WRITE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="472" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-15" value="RESOURCE:DELETE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="512" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="Fkp4l_HLPrJYwHj4Cqq2-16" value="RESOURCE:UPDATE" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="640" y="552" width="128" height="27" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
</root>
|
||||||
|
</mxGraphModel>
|
||||||
|
</diagram>
|
||||||
|
</mxfile>
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
2026-05-20T08:25:45.241-04:00 INFO 5596 --- [main] com.goi.erp.SecurityApplication : Starting SecurityApplication using Java 17.0.16 with PID 5596 (D:\workspace-eclipse\crm-rest-api\target\classes started by Hyojin Ahn in D:\workspace-eclipse\crm-rest-api)
|
||||||
|
2026-05-20T08:25:45.246-04:00 INFO 5596 --- [main] com.goi.erp.SecurityApplication : The following 1 profile is active: "default"
|
||||||
|
2026-05-20T08:25:45.694-04:00 INFO 5596 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data JPA repositories in DEFAULT mode.
|
||||||
|
2026-05-20T08:25:45.786-04:00 INFO 5596 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 87 ms. Found 3 JPA repository interfaces.
|
||||||
|
2026-05-20T08:25:46.383-04:00 INFO 5596 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 8082 (http)
|
||||||
|
2026-05-20T08:25:46.389-04:00 INFO 5596 --- [main] o.apache.catalina.core.StandardService : Starting service [Tomcat]
|
||||||
|
2026-05-20T08:25:46.389-04:00 INFO 5596 --- [main] o.apache.catalina.core.StandardEngine : Starting Servlet engine: [Apache Tomcat/10.1.13]
|
||||||
|
2026-05-20T08:25:46.457-04:00 INFO 5596 --- [main] o.a.c.c.C.[.[localhost].[/crm-rest-api] : Initializing Spring embedded WebApplicationContext
|
||||||
|
2026-05-20T08:25:46.457-04:00 INFO 5596 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 1173 ms
|
||||||
|
2026-05-20T08:25:46.602-04:00 INFO 5596 --- [main] o.hibernate.jpa.internal.util.LogHelper : HHH000204: Processing PersistenceUnitInfo [name: default]
|
||||||
|
2026-05-20T08:25:46.632-04:00 INFO 5596 --- [main] org.hibernate.Version : HHH000412: Hibernate ORM core version 6.2.9.Final
|
||||||
|
2026-05-20T08:25:46.635-04:00 INFO 5596 --- [main] org.hibernate.cfg.Environment : HHH000406: Using bytecode reflection optimizer
|
||||||
|
2026-05-20T08:25:46.716-04:00 INFO 5596 --- [main] o.h.b.i.BytecodeProviderInitiator : HHH000021: Bytecode provider name : bytebuddy
|
||||||
|
2026-05-20T08:25:46.783-04:00 INFO 5596 --- [main] o.s.o.j.p.SpringPersistenceUnitInfo : No LoadTimeWeaver setup: ignoring JPA class transformer
|
||||||
|
2026-05-20T08:25:46.793-04:00 INFO 5596 --- [main] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Starting...
|
||||||
|
2026-05-20T08:25:46.891-04:00 INFO 5596 --- [main] com.zaxxer.hikari.pool.HikariPool : HikariPool-1 - Added connection org.postgresql.jdbc.PgConnection@674e4c82
|
||||||
|
2026-05-20T08:25:46.892-04:00 INFO 5596 --- [main] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Start completed.
|
||||||
|
2026-05-20T08:25:47.044-04:00 INFO 5596 --- [main] o.h.b.i.BytecodeProviderInitiator : HHH000021: Bytecode provider name : bytebuddy
|
||||||
|
2026-05-20T08:25:47.499-04:00 INFO 5596 --- [main] o.h.e.t.j.p.i.JtaPlatformInitiator : HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
|
||||||
|
2026-05-20T08:25:47.549-04:00 INFO 5596 --- [main] j.LocalContainerEntityManagerFactoryBean : Initialized JPA EntityManagerFactory for persistence unit 'default'
|
||||||
|
2026-05-20T08:25:47.931-04:00 WARN 5596 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
|
||||||
|
2026-05-20T08:25:48.177-04:00 INFO 5596 --- [main] o.s.b.a.e.web.EndpointLinksResolver : Exposing 1 endpoint(s) beneath base path '/actuator'
|
||||||
|
2026-05-20T08:25:48.210-04:00 INFO 5596 --- [main] o.s.s.web.DefaultSecurityFilterChain : Will secure any request with [org.springframework.security.web.session.DisableEncodeUrlFilter@466fd19b, org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@348d1a5e, org.springframework.security.web.context.SecurityContextHolderFilter@3fc92211, org.springframework.security.web.header.HeaderWriterFilter@227ae4e4, org.springframework.security.web.authentication.logout.LogoutFilter@3ae5cbb9, org.springframework.web.filter.CorsFilter@7f746160, com.goi.erp.config.JwtAuthenticationFilter@16ea0f22, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@117bfeb8, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@31aec04a, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@17524c36, org.springframework.security.web.session.SessionManagementFilter@440309c5, org.springframework.security.web.access.ExceptionTranslationFilter@1b2213b2, org.springframework.security.web.access.intercept.AuthorizationFilter@24e0bdb]
|
||||||
|
2026-05-20T08:25:48.496-04:00 INFO 5596 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port(s): 8082 (http) with context path '/crm-rest-api'
|
||||||
|
2026-05-20T08:25:48.505-04:00 INFO 5596 --- [main] com.goi.erp.SecurityApplication : Started SecurityApplication in 3.548 seconds (process running for 3.992)
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -16,6 +16,7 @@ public class CustomerDailyOrderRequestDto {
|
||||||
private String cdoOrderType; // 주문 타입 ('N' 등)
|
private String cdoOrderType; // 주문 타입 ('N' 등)
|
||||||
private String cdoRequestNote; // 주문 요청 메모
|
private String cdoRequestNote; // 주문 요청 메모
|
||||||
private String cdoExternalDriverId; // MIS 에서 driverId 로 호출해서 employee_external_map 참조해야함
|
private String cdoExternalDriverId; // MIS 에서 driverId 로 호출해서 employee_external_map 참조해야함
|
||||||
|
private String cdoExternalCreatedBy; // MIS 에서 memberId 로 호출해서 employee_external_map 참조해야함
|
||||||
private Long cdoDriverId; // 배정된 driver id
|
private Long cdoDriverId; // 배정된 driver id
|
||||||
private UUID cdoDriverUuid; // ERP 에서는 uuid 로 호출
|
private UUID cdoDriverUuid; // ERP 에서는 uuid 로 호출
|
||||||
private Long cdoCustomerId; // 고객 ID
|
private Long cdoCustomerId; // 고객 ID
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
package com.goi.erp.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class CustomerRegionRequestDto {
|
||||||
|
|
||||||
|
private String creName;
|
||||||
|
private String creStatus;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
package com.goi.erp.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class CustomerRegionResponseDto {
|
||||||
|
|
||||||
|
private Long creId;
|
||||||
|
private String creName;
|
||||||
|
private String creStatus;
|
||||||
|
}
|
||||||
|
|
@ -13,7 +13,8 @@ public class CustomerRequestDto {
|
||||||
private String cusNo; // c_accountno
|
private String cusNo; // c_accountno
|
||||||
private String cusName; // c_name
|
private String cusName; // c_name
|
||||||
private String cusStatus; // c_status → ('A', 'I', 'D' 등)
|
private String cusStatus; // c_status → ('A', 'I', 'D' 등)
|
||||||
private Long cusAreaId; // region / area mapping
|
private Long cusRegionId; // region / area mapping
|
||||||
|
private Long cusAreaId; // area mapping
|
||||||
private String cusAddress1; // c_address
|
private String cusAddress1; // c_address
|
||||||
private String cusAddress2; // c_mailingaddr or c_location
|
private String cusAddress2; // c_mailingaddr or c_location
|
||||||
private String cusPostalCode; // c_postal
|
private String cusPostalCode; // c_postal
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ public class CustomerResponseDto {
|
||||||
private String cusNo;
|
private String cusNo;
|
||||||
private String cusName;
|
private String cusName;
|
||||||
private String cusStatus;
|
private String cusStatus;
|
||||||
|
private String cusRegionId;
|
||||||
private String cusAddress1;
|
private String cusAddress1;
|
||||||
private String cusAddress2;
|
private String cusAddress2;
|
||||||
private String cusCity;
|
private String cusCity;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ import org.springframework.data.annotation.LastModifiedBy;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "customer")
|
@Table(schema="crm", name = "customer")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
@ -46,6 +46,7 @@ public class Customer {
|
||||||
@Column(length = 1)
|
@Column(length = 1)
|
||||||
private String cusStatus;
|
private String cusStatus;
|
||||||
|
|
||||||
|
private Long cusRegionId;
|
||||||
private Long cusAreaId;
|
private Long cusAreaId;
|
||||||
private String cusAddress1;
|
private String cusAddress1;
|
||||||
private String cusAddress2;
|
private String cusAddress2;
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ import jakarta.persistence.Id;
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "customer_daily_order")
|
@Table(schema="crm", name = "customer_daily_order")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import jakarta.persistence.GeneratedValue;
|
||||||
import jakarta.persistence.GenerationType;
|
import jakarta.persistence.GenerationType;
|
||||||
import jakarta.persistence.Id;
|
import jakarta.persistence.Id;
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
|
|
@ -14,24 +13,21 @@ import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "employee")
|
@Table(schema = "crm", name = "customer_region")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Builder
|
@Builder
|
||||||
public class Employee {
|
public class CustomerRegion {
|
||||||
@Id
|
|
||||||
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
@Column(name = "emp_id")
|
@Column(name = "cre_id")
|
||||||
private Long empId; // 내부 PK, 외부 노출 X
|
private Long creId;
|
||||||
|
|
||||||
@Column(name = "emp_uuid", unique = true, nullable = false)
|
@Column(name = "cre_name", nullable = false, length = 255)
|
||||||
private UUID empUuid; // 외부 키로 사용
|
private String creName;
|
||||||
|
|
||||||
@Column(name = "emp_first_name")
|
@Column(name = "cre_status", length = 1)
|
||||||
private String empFirstName;
|
private String creStatus;
|
||||||
|
|
||||||
@Column(name = "emp_last_name")
|
|
||||||
private String empLastName;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@ import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "entity_change_log")
|
@Table(schema="sys", name = "entity_change_log")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
|
@ -37,6 +38,9 @@ public class CustomerDailyOrderService {
|
||||||
// driver id (employee id)
|
// driver id (employee id)
|
||||||
Long driverId = resolveDriverId(dto);
|
Long driverId = resolveDriverId(dto);
|
||||||
|
|
||||||
|
// created by (employee no)
|
||||||
|
String createdBy = resolveCreatedBy(dto);
|
||||||
|
|
||||||
CustomerDailyOrder order = CustomerDailyOrder.builder()
|
CustomerDailyOrder order = CustomerDailyOrder.builder()
|
||||||
.cdoUuid(UUID.randomUUID())
|
.cdoUuid(UUID.randomUUID())
|
||||||
.cdoOrderDate(dto.getCdoOrderDate())
|
.cdoOrderDate(dto.getCdoOrderDate())
|
||||||
|
|
@ -48,7 +52,7 @@ public class CustomerDailyOrderService {
|
||||||
.cdoPaymentType(dto.getCdoPaymentType())
|
.cdoPaymentType(dto.getCdoPaymentType())
|
||||||
.cdoCycle(dto.getCdoCycle())
|
.cdoCycle(dto.getCdoCycle())
|
||||||
.cdoRate(dto.getCdoRate())
|
.cdoRate(dto.getCdoRate())
|
||||||
.cdoCreatedBy(dto.getCdoLoginUser())
|
.cdoCreatedBy(createdBy)
|
||||||
.cdoStatus(dto.getCdoStatus())
|
.cdoStatus(dto.getCdoStatus())
|
||||||
.cdoVisitFlag(dto.getCdoVisitFlag())
|
.cdoVisitFlag(dto.getCdoVisitFlag())
|
||||||
.cdoEstimatedQty(dto.getCdoEstimatedQty())
|
.cdoEstimatedQty(dto.getCdoEstimatedQty())
|
||||||
|
|
@ -256,12 +260,72 @@ public class CustomerDailyOrderService {
|
||||||
}
|
}
|
||||||
// 2. MIS -> externalId (문자열 email or id)
|
// 2. MIS -> externalId (문자열 email or id)
|
||||||
if (dto.getCdoExternalDriverId() != null) {
|
if (dto.getCdoExternalDriverId() != null) {
|
||||||
return hcmEmployeeClient.getEmpIdFromExternalId( dto.getCdoExternalDriverId() );
|
Map<String, Object> body = hcmEmployeeClient.getEmpFromExternalId( "MIS_DRIVER", dto.getCdoExternalCreatedBy() );
|
||||||
|
if (body != null && body.get("eexEmpId") != null) {
|
||||||
|
|
||||||
|
Object raw = body.get("eexEmpId");
|
||||||
|
|
||||||
|
if (raw instanceof Number) {
|
||||||
|
return ((Number) raw).longValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 예상 밖 타입일 경우
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. ERP 내부 요청 (driverUuid 방식)
|
// 3. ERP 내부 요청 (driverUuid 방식)
|
||||||
if (dto.getCdoDriverUuid() != null) {
|
if (dto.getCdoDriverUuid() != null) {
|
||||||
return hcmEmployeeClient.getEmpIdFromUuid(dto.getCdoDriverUuid());
|
|
||||||
|
Map<String, Object> body = hcmEmployeeClient.getEmpFromUuid(dto.getCdoDriverUuid());
|
||||||
|
if (body != null && body.get("empId") != null) {
|
||||||
|
|
||||||
|
Object raw = body.get("empId");
|
||||||
|
|
||||||
|
if (raw instanceof Number) {
|
||||||
|
return ((Number) raw).longValue(); // 🔥 모든 숫자를 Long 변환
|
||||||
|
}
|
||||||
|
|
||||||
|
// 예상 밖 타입일 경우
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String resolveCreatedBy(CustomerDailyOrderRequestDto dto) {
|
||||||
|
|
||||||
|
// 1. driver id
|
||||||
|
if (dto.getCdoLoginUser() != null) {
|
||||||
|
return dto.getCdoLoginUser();
|
||||||
|
}
|
||||||
|
// 2. MIS -> externalId (id to empNo)
|
||||||
|
if (dto.getCdoExternalCreatedBy() != null) {
|
||||||
|
Map<String, Object> body = hcmEmployeeClient.getEmpFromExternalId( "MIS_MEMBER", dto.getCdoExternalCreatedBy() );
|
||||||
|
if (body != null && body.get("eexEmpNo") != null) {
|
||||||
|
|
||||||
|
Object raw = body.get("eexEmpNo");
|
||||||
|
|
||||||
|
if (raw instanceof String) {
|
||||||
|
return ((String) raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 예상 밖 타입일 경우
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. ERP 내부 요청 (driverUuid 방식)
|
||||||
|
if (dto.getCdoDriverUuid() != null) {
|
||||||
|
Map<String, Object> body = hcmEmployeeClient.getEmpFromUuid(dto.getCdoDriverUuid());
|
||||||
|
if (body != null && body.get("empNo") != null) {
|
||||||
|
|
||||||
|
Object raw = body.get("empNo");
|
||||||
|
|
||||||
|
if (raw instanceof String) {
|
||||||
|
return ((String) raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 예상 밖 타입일 경우
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ public class CustomerService {
|
||||||
.cusNo(dto.getCusNo())
|
.cusNo(dto.getCusNo())
|
||||||
.cusName(dto.getCusName())
|
.cusName(dto.getCusName())
|
||||||
.cusStatus(dto.getCusStatus())
|
.cusStatus(dto.getCusStatus())
|
||||||
|
.cusRegionId(dto.getCusRegionId())
|
||||||
.cusAreaId(dto.getCusAreaId())
|
.cusAreaId(dto.getCusAreaId())
|
||||||
.cusAddress1(dto.getCusAddress1())
|
.cusAddress1(dto.getCusAddress1())
|
||||||
.cusAddress2(dto.getCusAddress2())
|
.cusAddress2(dto.getCusAddress2())
|
||||||
|
|
@ -102,6 +103,7 @@ public class CustomerService {
|
||||||
if (dto.getCusName() != null) customer.setCusName(dto.getCusName());
|
if (dto.getCusName() != null) customer.setCusName(dto.getCusName());
|
||||||
if (dto.getCusStatus() != null) customer.setCusStatus(dto.getCusStatus());
|
if (dto.getCusStatus() != null) customer.setCusStatus(dto.getCusStatus());
|
||||||
if (dto.getCusNo() != null) customer.setCusNo(dto.getCusNo());
|
if (dto.getCusNo() != null) customer.setCusNo(dto.getCusNo());
|
||||||
|
if (dto.getCusRegionId() != null) customer.setCusRegionId(dto.getCusRegionId());
|
||||||
if (dto.getCusAreaId() != null) customer.setCusAreaId(dto.getCusAreaId());
|
if (dto.getCusAreaId() != null) customer.setCusAreaId(dto.getCusAreaId());
|
||||||
if (dto.getCusAddress1() != null) customer.setCusAddress1(dto.getCusAddress1());
|
if (dto.getCusAddress1() != null) customer.setCusAddress1(dto.getCusAddress1());
|
||||||
if (dto.getCusAddress2() != null) customer.setCusAddress2(dto.getCusAddress2());
|
if (dto.getCusAddress2() != null) customer.setCusAddress2(dto.getCusAddress2());
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@ public class HcmEmployeeClient {
|
||||||
@Value("${hcm.api.base-url}")
|
@Value("${hcm.api.base-url}")
|
||||||
private String hcmBaseUrl;
|
private String hcmBaseUrl;
|
||||||
|
|
||||||
public Long getEmpIdFromExternalId(String externalId) {
|
public Map<String, Object> getEmpFromExternalId(String solutionType, String externalId) {
|
||||||
|
|
||||||
String url = hcmBaseUrl + "/employee/external" + "?solutionType=MIS&externalId=" + externalId;
|
String url = hcmBaseUrl + "/employee/external" + "?solutionType=" + solutionType + "&externalId=" + externalId;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// set token in header
|
// set token in header
|
||||||
|
|
@ -45,21 +45,7 @@ public class HcmEmployeeClient {
|
||||||
new ParameterizedTypeReference<Map<String, Object>>() {}
|
new ParameterizedTypeReference<Map<String, Object>>() {}
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, Object> body = response.getBody();
|
return response.getBody();
|
||||||
//System.out.println("RESPONSE ➜ " + body);
|
|
||||||
|
|
||||||
if (body != null && body.get("eexEmpId") != null) {
|
|
||||||
|
|
||||||
Object raw = body.get("eexEmpId");
|
|
||||||
|
|
||||||
if (raw instanceof Number) {
|
|
||||||
return ((Number) raw).longValue(); // 🔥 모든 숫자를 Long 변환
|
|
||||||
}
|
|
||||||
|
|
||||||
// 예상 밖 타입일 경우
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// 필요하면 logging
|
// 필요하면 logging
|
||||||
|
|
@ -68,7 +54,7 @@ public class HcmEmployeeClient {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getEmpIdFromUuid(UUID uuid) {
|
public Map<String, Object> getEmpFromUuid(UUID uuid) {
|
||||||
|
|
||||||
String url = hcmBaseUrl + "/employee/" + uuid;
|
String url = hcmBaseUrl + "/employee/" + uuid;
|
||||||
|
|
||||||
|
|
@ -88,22 +74,9 @@ public class HcmEmployeeClient {
|
||||||
new ParameterizedTypeReference<Map<String, Object>>() {}
|
new ParameterizedTypeReference<Map<String, Object>>() {}
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, Object> body = response.getBody();
|
return response.getBody();
|
||||||
//System.out.println("RESPONSE(UUID) ➜ " + body);
|
//System.out.println("RESPONSE(UUID) ➜ " + body);
|
||||||
|
|
||||||
if (body != null && body.get("empId") != null) {
|
|
||||||
|
|
||||||
Object raw = body.get("empId");
|
|
||||||
|
|
||||||
if (raw instanceof Number) {
|
|
||||||
return ((Number) raw).longValue(); // 🔥 모든 숫자를 Long 변환
|
|
||||||
}
|
|
||||||
|
|
||||||
// 예상 밖 타입일 경우
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// 필요하면 로깅
|
// 필요하면 로깅
|
||||||
System.out.println("UUID lookup error: " + e.getMessage());
|
System.out.println("UUID lookup error: " + e.getMessage());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue