Skip to content

S
service-campaign
Commit 51f892f5 authored by Tu Bach's avatar Tu Bach
Browse files
Options

no message

parent 16d2959c
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 45 deletions
.idea/workspace.xml
View file @ 51f892f5
...@@ -3,10 +3,6 @@ ...@@ -3,10 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5c5a6e49-5215-4271-a1d3-f663530e06ec" name="Default" comment=""> <list default="true" id="5c5a6e49-5215-4271-a1d3-f663530e06ec" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -21,11 +17,11 @@ ...@@ -21,11 +17,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="221">
<caret line="16" column="87" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="87" /> <caret line="20" selection-start-line="20" selection-end-line="20" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -45,8 +41,20 @@ ...@@ -45,8 +41,20 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="119">
<caret line="16" column="39" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="39" /> <caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -55,9 +63,21 @@ ...@@ -55,9 +63,21 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="323">
<caret line="19" selection-start-line="19" selection-end-line="19" /> <caret line="19" selection-start-line="19" selection-end-line="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
...@@ -216,10 +236,10 @@ ...@@ -216,10 +236,10 @@
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="166" /> <option name="x" value="-8" />
<option name="y" value="27" /> <option name="y" value="-8" />
<option name="width" value="1655" /> <option name="width" value="1936" />
<option name="height" value="1027" /> <option name="height" value="1066" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -229,7 +249,7 @@ ...@@ -229,7 +249,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" /> <pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -352,7 +372,7 @@ ...@@ -352,7 +372,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -364,7 +384,7 @@ ...@@ -364,7 +384,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../pentacoSrc" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../CAMPAIGN" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
...@@ -470,7 +490,7 @@ ...@@ -470,7 +490,7 @@
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17857143" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18176973" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" /> <window_info id="Image Layers" order="3" />
...@@ -1041,16 +1061,6 @@ ...@@ -1041,16 +1061,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="32" column="36" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/ApParam.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="85">
...@@ -1092,16 +1102,6 @@ ...@@ -1092,16 +1102,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="47" column="30" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml"> <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391"> <state relative-caret-position="391">
...@@ -1138,8 +1138,8 @@ ...@@ -1138,8 +1138,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="221">
<caret line="16" column="87" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="87" /> <caret line="20" selection-start-line="20" selection-end-line="20" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -1155,18 +1155,28 @@ ...@@ -1155,18 +1155,28 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="119">
<caret line="16" column="39" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="39" /> <caret line="10" selection-start-line="10" selection-end-line="10" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CustomerController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="663">
<caret line="19" selection-start-line="19" selection-end-line="19" /> <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -1203,6 +1213,16 @@ ...@@ -1203,6 +1213,16 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/viettel/campaign/service/CampaignCompleteCodeService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment