Procházet zdrojové kódy

wallet server commit

Navya Sanal před 6 roky
rodič
revize
fac06a3d0a

+ 111
- 103
.idea/workspace.xml Zobrazit soubor

@@ -27,34 +27,11 @@
27 27
   </component>
28 28
   <component name="FileEditorManager">
29 29
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30
-      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
30
+      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="true">
31 31
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
32 32
           <provider selected="true" editor-type-id="text-editor">
33
-            <state relative-caret-position="285">
34
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
35
-              <folding>
36
-                <element signature="imports" expanded="true" />
37
-                <element signature="e#432#433#0" expanded="true" />
38
-                <element signature="e#472#473#0" expanded="true" />
39
-                <element signature="e#504#505#0" expanded="true" />
40
-                <element signature="e#540#541#0" expanded="true" />
41
-                <element signature="e#572#573#0" expanded="true" />
42
-                <element signature="e#622#623#0" expanded="true" />
43
-                <element signature="e#664#665#0" expanded="true" />
44
-              </folding>
45
-            </state>
46
-          </provider>
47
-        </entry>
48
-      </file>
49
-      <file leaf-file-name="StringUtil.java" pinned="false" current-in-tab="false">
50
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/StringUtil.java">
51
-          <provider selected="true" editor-type-id="text-editor">
52
-            <state relative-caret-position="525">
53
-              <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
54
-              <folding>
55
-                <element signature="e#1170#1171#0" expanded="true" />
56
-                <element signature="e#1209#1210#0" expanded="true" />
57
-              </folding>
33
+            <state relative-caret-position="105">
34
+              <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
58 35
             </state>
59 36
           </provider>
60 37
         </entry>
@@ -63,25 +40,25 @@
63 40
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
64 41
           <provider selected="true" editor-type-id="text-editor">
65 42
             <state relative-caret-position="45">
66
-              <caret line="3" selection-start-line="3" selection-end-line="3" />
43
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
67 44
             </state>
68 45
           </provider>
69 46
         </entry>
70 47
       </file>
71
-      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
72
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
48
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
49
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/BlockLoader.java">
73 50
           <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="232">
75
-              <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
51
+            <state relative-caret-position="30">
52
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
76 53
             </state>
77 54
           </provider>
78 55
         </entry>
79 56
       </file>
80
-      <file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
81
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/Miner.java">
57
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
58
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
82 59
           <provider selected="true" editor-type-id="text-editor">
83
-            <state relative-caret-position="60">
84
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
60
+            <state relative-caret-position="135">
61
+              <caret line="15" column="21" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
85 62
             </state>
86 63
           </provider>
87 64
         </entry>
@@ -89,17 +66,31 @@
89 66
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
90 67
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
91 68
           <provider selected="true" editor-type-id="text-editor">
92
-            <state relative-caret-position="-80">
69
+            <state relative-caret-position="465">
93 70
               <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
94 71
             </state>
95 72
           </provider>
96 73
         </entry>
97 74
       </file>
98
-      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
75
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
99 76
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
100 77
           <provider selected="true" editor-type-id="text-editor">
101
-            <state relative-caret-position="60">
102
-              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
78
+            <state relative-caret-position="305">
79
+              <caret line="23" column="41" lean-forward="true" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
80
+              <folding>
81
+                <element signature="imports" expanded="true" />
82
+                <element signature="e#523#524#0" expanded="true" />
83
+                <element signature="e#579#580#0" expanded="true" />
84
+              </folding>
85
+            </state>
86
+          </provider>
87
+        </entry>
88
+      </file>
89
+      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
90
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/TransactionController.java">
91
+          <provider selected="true" editor-type-id="text-editor">
92
+            <state relative-caret-position="105">
93
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
103 94
             </state>
104 95
           </provider>
105 96
         </entry>
@@ -122,11 +113,11 @@
122 113
           </provider>
123 114
         </entry>
124 115
       </file>
125
-      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
126
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/WalletRepository.java">
116
+      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
117
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
127 118
           <provider selected="true" editor-type-id="text-editor">
128
-            <state relative-caret-position="150">
129
-              <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
119
+            <state relative-caret-position="405">
120
+              <caret line="36" column="35" selection-start-line="36" selection-start-column="35" selection-end-line="36" selection-end-column="35" />
130 121
             </state>
131 122
           </provider>
132 123
         </entry>
@@ -173,7 +164,6 @@
173 164
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java" />
174 165
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/StringUtil.java" />
175 166
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java" />
176
-        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java" />
177 167
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_wallet.sql" />
178 168
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V3__create_wallet.sql" />
179 169
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java" />
@@ -181,6 +171,8 @@
181 171
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql" />
182 172
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties" />
183 173
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml" />
174
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java" />
175
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java" />
184 176
       </list>
185 177
     </option>
186 178
   </component>
@@ -222,7 +214,7 @@
222 214
       <foldersAlwaysOnTop value="true" />
223 215
     </navigator>
224 216
     <panes>
225
-      <pane id="AndroidView" />
217
+      <pane id="PackagesPane" />
226 218
       <pane id="ProjectPane">
227 219
         <subPane>
228 220
           <expand>
@@ -233,6 +225,11 @@
233 225
             <path>
234 226
               <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
235 227
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
228
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
229
+            </path>
230
+            <path>
231
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
232
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
236 233
               <item name="src" type="462c0819:PsiDirectoryNode" />
237 234
             </path>
238 235
             <path>
@@ -265,11 +262,45 @@
265 262
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
266 263
               <item name="config" type="462c0819:PsiDirectoryNode" />
267 264
             </path>
265
+            <path>
266
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
267
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
268
+              <item name="src" type="462c0819:PsiDirectoryNode" />
269
+              <item name="main" type="462c0819:PsiDirectoryNode" />
270
+              <item name="java" type="462c0819:PsiDirectoryNode" />
271
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
272
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
273
+            </path>
274
+            <path>
275
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
276
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
277
+              <item name="src" type="462c0819:PsiDirectoryNode" />
278
+              <item name="main" type="462c0819:PsiDirectoryNode" />
279
+              <item name="java" type="462c0819:PsiDirectoryNode" />
280
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
281
+              <item name="model" type="462c0819:PsiDirectoryNode" />
282
+            </path>
283
+            <path>
284
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
285
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
286
+              <item name="src" type="462c0819:PsiDirectoryNode" />
287
+              <item name="main" type="462c0819:PsiDirectoryNode" />
288
+              <item name="java" type="462c0819:PsiDirectoryNode" />
289
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
290
+              <item name="repository" type="462c0819:PsiDirectoryNode" />
291
+            </path>
292
+            <path>
293
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
294
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
295
+              <item name="src" type="462c0819:PsiDirectoryNode" />
296
+              <item name="main" type="462c0819:PsiDirectoryNode" />
297
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
298
+            </path>
268 299
           </expand>
269 300
           <select />
270 301
         </subPane>
271 302
       </pane>
272
-      <pane id="PackagesPane" />
303
+      <pane id="AndroidView" />
273 304
       <pane id="Scope" />
274 305
       <pane id="Course" />
275 306
     </panes>
@@ -477,6 +508,8 @@
477 508
       <workItem from="1532523890378" duration="1028000" />
478 509
       <workItem from="1532528099328" duration="14938000" />
479 510
       <workItem from="1532701223355" duration="2106000" />
511
+      <workItem from="1532961841730" duration="279000" />
512
+      <workItem from="1533210922154" duration="431000" />
480 513
     </task>
481 514
     <servers />
482 515
   </component>
@@ -510,7 +543,7 @@
510 543
     </history-entry>
511 544
   </component>
512 545
   <component name="TimeTrackingManager">
513
-    <option name="totallyTimeSpent" value="40895000" />
546
+    <option name="totallyTimeSpent" value="43618000" />
514 547
   </component>
515 548
   <component name="ToolWindowManager">
516 549
     <frame x="0" y="23" width="1426" height="804" extended-state="0" />
@@ -523,21 +556,20 @@
523 556
       <window_info id="Capture Tool" order="2" />
524 557
       <window_info id="Designer" order="2" />
525 558
       <window_info anchor="right" id="Database" order="3" />
526
-      <window_info id="Structure" order="1" sideWeight="0.17450981" side_tool="true" visible="true" weight="0.2550578" />
559
+      <window_info id="Structure" order="1" sideWeight="0.17892976" side_tool="true" visible="true" weight="0.26228324" />
527 560
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
528 561
       <window_info id="UI Designer" order="2" />
529 562
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39886847" />
530 563
       <window_info anchor="bottom" id="TODO" order="6" />
531
-      <window_info anchor="bottom" id="Messages" order="9" weight="0.3289256" />
532 564
       <window_info anchor="right" id="Palette&#9;" order="3" />
533 565
       <window_info id="Image Layers" order="2" />
534 566
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
535 567
       <window_info anchor="right" id="Capture Analysis" order="3" />
536
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
537 568
       <window_info anchor="bottom" id="Run" order="2" weight="0.3493635" />
569
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
538 570
       <window_info anchor="bottom" id="Spring" order="9" weight="0.32956153" />
539
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.27864215" />
540
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8254902" visible="true" weight="0.2550578" />
571
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.15417255" />
572
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.82107025" visible="true" weight="0.26228324" />
541 573
       <window_info anchor="right" id="Bean Validation" order="4" />
542 574
       <window_info id="Web" order="4" side_tool="true" />
543 575
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -546,15 +578,16 @@
546 578
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
547 579
       <window_info anchor="bottom" id="Message" order="0" />
548 580
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
581
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.3289256" />
549 582
       <window_info id="Learn" order="5" />
550 583
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
551 584
       <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
552 585
     </layout>
553 586
     <layout-to-restore>
554 587
       <window_info anchor="right" id="Palette" order="3" />
588
+      <window_info anchor="bottom" id="Find" order="1" />
555 589
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
556 590
       <window_info anchor="right" id="Capture Analysis" order="4" />
557
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
558 591
       <window_info anchor="bottom" id="Run" order="2" />
559 592
       <window_info anchor="right" id="Theme Preview" order="5" />
560 593
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2358643" />
@@ -562,11 +595,10 @@
562 595
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
563 596
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
564 597
       <window_info anchor="bottom" id="TODO" order="6" />
565
-      <window_info anchor="bottom" id="Version Control" order="10" />
566 598
       <window_info id="Image Layers" order="2" />
567 599
       <window_info id="Designer" order="3" />
568 600
       <window_info id="UI Designer" order="4" />
569
-      <window_info anchor="bottom" id="Find" order="1" />
601
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
570 602
       <window_info anchor="right" id="Database" order="6" />
571 603
       <window_info anchor="right" id="Palette&#9;" order="7" />
572 604
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49919224" weight="0.65384614" />
@@ -694,19 +726,10 @@
694 726
       <provider selected="true" editor-type-id="text-editor">
695 727
         <state relative-caret-position="120">
696 728
           <caret line="9" selection-start-line="9" selection-end-line="9" />
697
-          <folding>
698
-            <element signature="e#296#297#0" expanded="true" />
699
-          </folding>
700
-        </state>
701
-      </provider>
702
-    </entry>
703
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql">
704
-      <provider selected="true" editor-type-id="text-editor">
705
-        <state relative-caret-position="210">
706
-          <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
707 729
         </state>
708 730
       </provider>
709 731
     </entry>
732
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql" />
710 733
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java">
711 734
       <provider selected="true" editor-type-id="text-editor">
712 735
         <state relative-caret-position="105">
@@ -714,21 +737,10 @@
714 737
         </state>
715 738
       </provider>
716 739
     </entry>
717
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
718
-      <provider selected="true" editor-type-id="text-editor">
719
-        <state relative-caret-position="270">
720
-          <caret line="27" column="95" selection-start-line="27" selection-start-column="95" selection-end-line="27" selection-end-column="95" />
721
-        </state>
722
-      </provider>
723
-    </entry>
724 740
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/StringUtil.java">
725 741
       <provider selected="true" editor-type-id="text-editor">
726 742
         <state relative-caret-position="525">
727 743
           <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
728
-          <folding>
729
-            <element signature="e#1170#1171#0" expanded="true" />
730
-            <element signature="e#1209#1210#0" expanded="true" />
731
-          </folding>
732 744
         </state>
733 745
       </provider>
734 746
     </entry>
@@ -762,53 +774,49 @@
762 774
     </entry>
763 775
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
764 776
       <provider selected="true" editor-type-id="text-editor">
765
-        <state relative-caret-position="232">
766
-          <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
777
+        <state relative-caret-position="135">
778
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
767 779
         </state>
768 780
       </provider>
769 781
     </entry>
770
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
782
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java" />
783
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
771 784
       <provider selected="true" editor-type-id="text-editor">
772
-        <state relative-caret-position="285">
773
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
774
-          <folding>
775
-            <element signature="imports" expanded="true" />
776
-            <element signature="e#432#433#0" expanded="true" />
777
-            <element signature="e#472#473#0" expanded="true" />
778
-            <element signature="e#504#505#0" expanded="true" />
779
-            <element signature="e#540#541#0" expanded="true" />
780
-            <element signature="e#572#573#0" expanded="true" />
781
-            <element signature="e#622#623#0" expanded="true" />
782
-            <element signature="e#664#665#0" expanded="true" />
783
-          </folding>
785
+        <state relative-caret-position="465">
786
+          <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
784 787
         </state>
785 788
       </provider>
786 789
     </entry>
787
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
790
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
788 791
       <provider selected="true" editor-type-id="text-editor">
789
-        <state relative-caret-position="270">
790
-          <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
792
+        <state relative-caret-position="45">
793
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
791 794
         </state>
792 795
       </provider>
793 796
     </entry>
794
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
797
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
795 798
       <provider selected="true" editor-type-id="text-editor">
796
-        <state relative-caret-position="45">
797
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
799
+        <state relative-caret-position="405">
800
+          <caret line="36" column="35" selection-start-line="36" selection-start-column="35" selection-end-line="36" selection-end-column="35" />
798 801
         </state>
799 802
       </provider>
800 803
     </entry>
801
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
804
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
802 805
       <provider selected="true" editor-type-id="text-editor">
803
-        <state relative-caret-position="-80">
804
-          <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
806
+        <state relative-caret-position="305">
807
+          <caret line="23" column="41" lean-forward="true" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
808
+          <folding>
809
+            <element signature="imports" expanded="true" />
810
+            <element signature="e#523#524#0" expanded="true" />
811
+            <element signature="e#579#580#0" expanded="true" />
812
+          </folding>
805 813
         </state>
806 814
       </provider>
807 815
     </entry>
808
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
816
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
809 817
       <provider selected="true" editor-type-id="text-editor">
810
-        <state relative-caret-position="60">
811
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
818
+        <state relative-caret-position="105">
819
+          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
812 820
         </state>
813 821
       </provider>
814 822
     </entry>

+ 1
- 1
ZipCoinRedIonicClient/.sourcemaps/main.js.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 0
- 25
ZipCoinRedIonicClient/www/build/.ion-diagnostic-typescript.html Zobrazit soubor

@@ -1,25 +0,0 @@
1
-<div class="ion-diagnostic">
2
-<div class="ion-diagnostic-masthead" title="typescript error: 2307">
3
-<div class="ion-diagnostic-title">Typescript Error</div>
4
-<div class="ion-diagnostic-message" data-error-code="typescript-2307">Cannot find module &#039;../block/home&#039;.</div>
5
-</div>
6
-<div class="ion-diagnostic-file">
7
-<div class="ion-diagnostic-file-header" title="/Users/navyas/Labs6/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.ts">src/pages/tabs/tabs.ts</div>
8
-<div class="ion-diagnostic-blob">
9
-<table class="ion-diagnostic-table">
10
-<tr>
11
-<td class="ion-diagnostic-blob-num" data-line-number="2"></td>
12
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { NavController, NavParams } from <span class="hljs-string">'ionic-angular'</span>;</td>
13
-</tr>
14
-<tr class="ion-diagnostic-error-line">
15
-<td class="ion-diagnostic-blob-num" data-line-number="3"></td>
16
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { HomePage } from <span class="hljs-string"><span class="ion-diagnostics-error-chr">'</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">.</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">b</span><span class="ion-diagnostics-error-chr">l</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">c</span><span class="ion-diagnostics-error-chr">k</span><span class="ion-diagnostics-error-chr">/</span><span class="ion-diagnostics-error-chr">h</span><span class="ion-diagnostics-error-chr">o</span><span class="ion-diagnostics-error-chr">m</span><span class="ion-diagnostics-error-chr">e</span><span class="ion-diagnostics-error-chr">'</span></span>;</td>
17
-</tr>
18
-<tr>
19
-<td class="ion-diagnostic-blob-num" data-line-number="4"></td>
20
-<td class="ion-diagnostic-blob-code"><span class="hljs-keyword">import</span> { WalletPage } from <span class="hljs-string">'../wallet/wallet'</span>;</td>
21
-</tr>
22
-</table>
23
-</div>
24
-</div>
25
-</div>

+ 1
- 1
ZipCoinRedIonicClient/www/build/0.js Zobrazit soubor

@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(102);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(101);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/1.js Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 280:
3
+/***/ 281:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(100);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(102);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/2.js Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([2],{
2 2
 
3
-/***/ 281:
3
+/***/ 280:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TabsPageModule", function() { return TabsPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(101);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(100);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor


+ 23
- 0
ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java Zobrazit soubor

@@ -1,5 +1,8 @@
1 1
 package com.zipcoin.config;
2 2
 
3
+import com.zipcoin.model.Wallet;
4
+import com.zipcoin.repository.WalletRepository;
5
+import org.springframework.beans.factory.annotation.Autowired;
3 6
 import org.springframework.boot.ApplicationArguments;
4 7
 import org.springframework.boot.ApplicationRunner;
5 8
 import org.springframework.stereotype.Component;
@@ -7,8 +10,28 @@ import org.springframework.stereotype.Component;
7 10
 @Component
8 11
 public class WalletLoader implements ApplicationRunner {
9 12
 
13
+    private WalletRepository walletRepository;
14
+
15
+    @Autowired
16
+    public WalletLoader(WalletRepository walletRepository)
17
+    {
18
+        this.walletRepository = walletRepository;
19
+    }
10 20
     @Override
11 21
     public void run(ApplicationArguments applicationArguments) throws Exception {
22
+        Wallet[] wallets = new Wallet[]
23
+                {
24
+                        new Wallet("ANN","34",80),
25
+                        new Wallet("sen","3564",8)
26
+
27
+
28
+                };
29
+        for(Wallet wallet :wallets)
30
+        {
31
+            this.walletRepository.save(wallet);
32
+        }
33
+
12 34
 
13 35
     }
14 36
 }
37
+

+ 6
- 1
ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java Zobrazit soubor

@@ -12,7 +12,6 @@ import java.util.Random;
12 12
 @Entity
13 13
 public class Wallet {
14 14
 
15
-
16 15
     @Id
17 16
     @GeneratedValue(strategy = GenerationType.AUTO)
18 17
     private int id;
@@ -42,6 +41,12 @@ public class Wallet {
42 41
         generateKeyPair();
43 42
 
44 43
     }
44
+    public Wallet(String name,String publickey,double amount)
45
+    {
46
+        this.name=name;
47
+        this.publickey=publickey;
48
+        this.amount=amount;
49
+    }
45 50
 
46 51
     public Double getAmount()
47 52
     {

+ 1
- 1
ZipCoinRedJavaServer/target/classes/application.properties Zobrazit soubor

@@ -1,3 +1,3 @@
1 1
 spring.jpa.hibernate.ddl-auto=create-drop
2 2
 spring.datasource.url=jdbc:mysql://localhost:3306/zipcoin?useSSL=false
3
-spring.datasource.username=root
3
+spring.datasource.username=root

binární
ZipCoinRedJavaServer/target/classes/com/zipcoin/config/WalletLoader.class Zobrazit soubor