浏览代码

merge dev

Vincent Sima 6 年前
父节点
当前提交
ecd32bcf14

+ 108
- 127
.idea/workspace.xml 查看文件

@@ -3,12 +3,8 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/application.log" afterDir="false" />
7 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/WalletController$UserController.class" beforeDir="false" />
12 8
     </list>
13 9
     <ignored path="$PROJECT_DIR$/target/" />
14 10
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,7 +25,7 @@
29 25
           </provider>
30 26
         </entry>
31 27
       </file>
32
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
28
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="true">
33 29
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
34 30
           <provider selected="true" editor-type-id="text-editor">
35 31
             <state relative-caret-position="60">
@@ -38,11 +34,32 @@
38 34
           </provider>
39 35
         </entry>
40 36
       </file>
41
-      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="true">
37
+      <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
38
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
39
+          <provider selected="true" editor-type-id="text-editor">
40
+            <state relative-caret-position="390">
41
+              <caret line="26" selection-start-line="26" selection-end-line="26" />
42
+              <folding>
43
+                <element signature="imports" expanded="true" />
44
+              </folding>
45
+            </state>
46
+          </provider>
47
+        </entry>
48
+      </file>
49
+      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
50
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
51
+          <provider selected="true" editor-type-id="text-editor">
52
+            <state relative-caret-position="75">
53
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
54
+            </state>
55
+          </provider>
56
+        </entry>
57
+      </file>
58
+      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
42 59
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
43 60
           <provider selected="true" editor-type-id="text-editor">
44
-            <state relative-caret-position="493">
45
-              <caret line="133" column="7" lean-forward="true" selection-start-line="112" selection-start-column="5" selection-end-line="133" selection-end-column="7" />
61
+            <state relative-caret-position="966">
62
+              <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
46 63
               <folding>
47 64
                 <element signature="imports" expanded="true" />
48 65
                 <element signature="e#925#926#0" expanded="true" />
@@ -68,23 +85,11 @@
68 85
           </provider>
69 86
         </entry>
70 87
       </file>
71
-      <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="false">
72
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
73
-          <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="586">
75
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
76
-              <folding>
77
-                <element signature="imports" expanded="true" />
78
-              </folding>
79
-            </state>
80
-          </provider>
81
-        </entry>
82
-      </file>
83 88
       <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
84 89
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
85 90
           <provider selected="true" editor-type-id="text-editor">
86
-            <state relative-caret-position="33">
87
-              <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
91
+            <state relative-caret-position="210">
92
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
88 93
               <folding>
89 94
                 <element signature="imports" expanded="true" />
90 95
               </folding>
@@ -104,11 +109,11 @@
104 109
           </provider>
105 110
         </entry>
106 111
       </file>
107
-      <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
108
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
112
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
113
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
109 114
           <provider selected="true" editor-type-id="text-editor">
110
-            <state relative-caret-position="180">
111
-              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
115
+            <state relative-caret-position="639">
116
+              <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
112 117
               <folding>
113 118
                 <element signature="imports" expanded="true" />
114 119
               </folding>
@@ -116,47 +121,23 @@
116 121
           </provider>
117 122
         </entry>
118 123
       </file>
119
-      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
120
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
121
-          <provider selected="true" editor-type-id="text-editor">
122
-            <state relative-caret-position="190">
123
-              <caret line="18" column="20" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="18" selection-end-column="20" />
124
-            </state>
125
-          </provider>
126
-        </entry>
127
-      </file>
128
-      <file leaf-file-name="BlockchainVerification.java" pinned="false" current-in-tab="false">
129
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
124
+      <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
125
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
130 126
           <provider selected="true" editor-type-id="text-editor">
131
-            <state relative-caret-position="285">
132
-              <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
127
+            <state relative-caret-position="180">
128
+              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
133 129
               <folding>
134 130
                 <element signature="imports" expanded="true" />
135
-                <element signature="e#1872#1873#0" expanded="true" />
136
-                <element signature="e#1900#1901#0" expanded="true" />
137
-                <element signature="e#1973#1974#0" expanded="true" />
138
-                <element signature="e#2025#2026#0" expanded="true" />
139
-                <element signature="e#2074#2075#0" expanded="true" />
140
-                <element signature="e#2107#2108#0" expanded="true" />
141
-                <element signature="e#2162#2163#0" expanded="true" />
142
-                <element signature="e#2199#2200#0" expanded="true" />
143
-                <element signature="e#2251#2252#0" expanded="true" />
144
-                <element signature="e#2291#2292#0" expanded="true" />
145
-                <element signature="e#2331#2332#0" expanded="true" />
146
-                <element signature="e#2371#2372#0" expanded="true" />
147 131
               </folding>
148 132
             </state>
149 133
           </provider>
150 134
         </entry>
151 135
       </file>
152
-      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
153
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
136
+      <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
137
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
154 138
           <provider selected="true" editor-type-id="text-editor">
155
-            <state relative-caret-position="495">
156
-              <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
157
-              <folding>
158
-                <element signature="imports" expanded="true" />
159
-              </folding>
139
+            <state relative-caret-position="75">
140
+              <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
160 141
             </state>
161 142
           </provider>
162 143
         </entry>
@@ -194,13 +175,13 @@
194 175
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" />
195 176
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
196 177
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java" />
197
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
198 178
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java" />
199 179
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java" />
200 180
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java" />
201 181
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
202
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
203 182
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
183
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
184
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
204 185
       </list>
205 186
     </option>
206 187
   </component>
@@ -220,7 +201,7 @@
220 201
   <component name="NodePackageJsonFileManager">
221 202
     <packageJsonPaths />
222 203
   </component>
223
-  <component name="ProjectFrameBounds" fullScreen="true">
204
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
224 205
     <option name="width" value="1920" />
225 206
     <option name="height" value="1080" />
226 207
   </component>
@@ -427,10 +408,10 @@
427 408
     <servers />
428 409
   </component>
429 410
   <component name="TimeTrackingManager">
430
-    <option name="totallyTimeSpent" value="8055000" />
411
+    <option name="totallyTimeSpent" value="8831000" />
431 412
   </component>
432 413
   <component name="ToolWindowManager">
433
-    <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
414
+    <frame x="0" y="0" width="1280" height="800" extended-state="6" />
434 415
     <editor active="true" />
435 416
     <layout>
436 417
       <window_info anchor="right" id="Palette" order="3" />
@@ -445,16 +426,16 @@
445 426
       <window_info id="UI Designer" order="2" />
446 427
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
447 428
       <window_info anchor="bottom" id="TODO" order="6" />
448
-      <window_info anchor="bottom" id="Messages" order="9" weight="0.27494907" />
429
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.27492878" />
449 430
       <window_info anchor="right" id="Palette&#9;" order="3" />
450 431
       <window_info id="Image Layers" order="2" />
451 432
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
452 433
       <window_info anchor="right" id="Capture Analysis" order="3" />
453 434
       <window_info anchor="bottom" id="Version Control" order="7" />
454
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32790223" />
435
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32763532" />
455 436
       <window_info anchor="bottom" id="Spring" order="7" weight="0.3299389" />
456
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.23523422" />
457
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16719915" />
437
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32905984" />
438
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
458 439
       <window_info anchor="right" id="Bean Validation" order="3" />
459 440
       <window_info id="Web" order="2" side_tool="true" />
460 441
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -783,30 +764,6 @@
783 764
       <provider selected="true" editor-type-id="text-editor" />
784 765
     </entry>
785 766
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
786
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
787
-      <provider selected="true" editor-type-id="text-editor">
788
-        <state relative-caret-position="390">
789
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
790
-          <folding>
791
-            <element signature="imports" expanded="true" />
792
-          </folding>
793
-        </state>
794
-      </provider>
795
-    </entry>
796
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
797
-      <provider selected="true" editor-type-id="text-editor">
798
-        <state relative-caret-position="75">
799
-          <caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
800
-        </state>
801
-      </provider>
802
-    </entry>
803
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
804
-      <provider selected="true" editor-type-id="text-editor">
805
-        <state relative-caret-position="75">
806
-          <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
807
-        </state>
808
-      </provider>
809
-    </entry>
810 767
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
811 768
       <provider selected="true" editor-type-id="text-editor">
812 769
         <state relative-caret-position="285">
@@ -829,88 +786,85 @@
829 786
         </state>
830 787
       </provider>
831 788
     </entry>
832
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
789
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
833 790
       <provider selected="true" editor-type-id="text-editor">
834
-        <state relative-caret-position="495">
835
-          <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
836
-          <folding>
837
-            <element signature="imports" expanded="true" />
838
-          </folding>
791
+        <state relative-caret-position="190">
792
+          <caret line="18" column="20" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="18" selection-end-column="20" />
839 793
         </state>
840 794
       </provider>
841 795
     </entry>
842
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
796
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java">
843 797
       <provider selected="true" editor-type-id="text-editor">
844
-        <state relative-caret-position="190">
845
-          <caret line="18" column="20" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="18" selection-end-column="20" />
798
+        <state relative-caret-position="30">
799
+          <caret line="2" column="18" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
846 800
         </state>
847 801
       </provider>
848 802
     </entry>
849
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
803
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
850 804
       <provider selected="true" editor-type-id="text-editor">
851
-        <state relative-caret-position="180">
852
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
805
+        <state relative-caret-position="586">
806
+          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
853 807
           <folding>
854 808
             <element signature="imports" expanded="true" />
855 809
           </folding>
856 810
         </state>
857 811
       </provider>
858 812
     </entry>
859
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java">
813
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
860 814
       <provider selected="true" editor-type-id="text-editor">
861
-        <state relative-caret-position="30">
862
-          <caret line="2" column="18" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
815
+        <state relative-caret-position="60">
816
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
863 817
         </state>
864 818
       </provider>
865 819
     </entry>
866
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
820
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
867 821
       <provider selected="true" editor-type-id="text-editor">
868
-        <state relative-caret-position="210">
869
-          <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
870
-          <folding>
871
-            <element signature="imports" expanded="true" />
872
-          </folding>
822
+        <state relative-caret-position="75">
823
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
873 824
         </state>
874 825
       </provider>
875 826
     </entry>
876
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
827
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
877 828
       <provider selected="true" editor-type-id="text-editor">
878
-        <state relative-caret-position="586">
879
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
829
+        <state relative-caret-position="180">
830
+          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
880 831
           <folding>
881 832
             <element signature="imports" expanded="true" />
882 833
           </folding>
883 834
         </state>
884 835
       </provider>
885 836
     </entry>
886
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
837
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
887 838
       <provider selected="true" editor-type-id="text-editor">
888
-        <state relative-caret-position="60">
889
-          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
839
+        <state relative-caret-position="75">
840
+          <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
890 841
         </state>
891 842
       </provider>
892 843
     </entry>
893
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
844
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
894 845
       <provider selected="true" editor-type-id="text-editor">
895
-        <state relative-caret-position="33">
896
-          <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
846
+        <state relative-caret-position="210">
847
+          <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
897 848
           <folding>
898 849
             <element signature="imports" expanded="true" />
899 850
           </folding>
900 851
         </state>
901 852
       </provider>
902 853
     </entry>
903
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
854
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
904 855
       <provider selected="true" editor-type-id="text-editor">
905
-        <state relative-caret-position="60">
906
-          <caret line="4" selection-start-line="4" selection-start-column="1" selection-end-line="10" selection-end-column="32" />
856
+        <state relative-caret-position="639">
857
+          <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
858
+          <folding>
859
+            <element signature="imports" expanded="true" />
860
+          </folding>
907 861
         </state>
908 862
       </provider>
909 863
     </entry>
910 864
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
911 865
       <provider selected="true" editor-type-id="text-editor">
912
-        <state relative-caret-position="493">
913
-          <caret line="133" column="7" lean-forward="true" selection-start-line="112" selection-start-column="5" selection-end-line="133" selection-end-column="7" />
866
+        <state relative-caret-position="966">
867
+          <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
914 868
           <folding>
915 869
             <element signature="imports" expanded="true" />
916 870
             <element signature="e#925#926#0" expanded="true" />
@@ -935,5 +889,32 @@
935 889
         </state>
936 890
       </provider>
937 891
     </entry>
892
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
893
+      <provider selected="true" editor-type-id="text-editor">
894
+        <state relative-caret-position="210">
895
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
896
+          <folding>
897
+            <element signature="imports" expanded="true" />
898
+          </folding>
899
+        </state>
900
+      </provider>
901
+    </entry>
902
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
903
+      <provider selected="true" editor-type-id="text-editor">
904
+        <state relative-caret-position="390">
905
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
906
+          <folding>
907
+            <element signature="imports" expanded="true" />
908
+          </folding>
909
+        </state>
910
+      </provider>
911
+    </entry>
912
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
913
+      <provider selected="true" editor-type-id="text-editor">
914
+        <state relative-caret-position="60">
915
+          <caret line="4" selection-start-line="4" selection-start-column="1" selection-end-line="10" selection-end-column="32" />
916
+        </state>
917
+      </provider>
918
+    </entry>
938 919
   </component>
939 920
 </project>

+ 5
- 6
src/main/java/com/buecoin01/controller/WalletController.java 查看文件

@@ -8,16 +8,15 @@ import org.springframework.http.ResponseEntity;
8 8
 import org.springframework.web.bind.annotation.*;
9 9
 import java.util.Optional;
10 10
 
11
+
12
+@RestController
13
+@CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
11 14
 public class WalletController {
12
-    @CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
13
-    @RestController
14
-    //@RequestMapping(path = "/wallet")
15
-    public class UserController {
15
+
16 16
 
17 17
         @Autowired
18 18
         private WalletRepository walletRepository;
19 19
 
20
-
21 20
         @RequestMapping(value = "/wallet/{id}", method = RequestMethod.GET)
22 21
         public ResponseEntity get(@PathVariable Long id) {
23 22
             Optional<Wallet> wallet = walletRepository.findById(id);
@@ -54,4 +53,4 @@ public class WalletController {
54 53
     }
55 54
 
56 55
 
57
-}
56
+

+ 2
- 2
src/main/resources/application.properties 查看文件

@@ -1,7 +1,7 @@
1 1
 spring.jpa.hibernate.ddl-auto=update
2
-spring.datasource.url=jdbc:mysql://localhost:3306/bluecoin?useSSL=false
2
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
3 3
 spring.datasource.username=root
4
-spring.datasource.password=
4
+spring.datasource.password=098poilkj
5 5
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
6 6
 #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
7 7
 #spring.datasource.testWhileIdle = true

+ 2
- 2
target/classes/application.properties 查看文件

@@ -1,7 +1,7 @@
1 1
 spring.jpa.hibernate.ddl-auto=update
2
-spring.datasource.url=jdbc:mysql://localhost:3306/bluecoin?useSSL=false
2
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
3 3
 spring.datasource.username=root
4
-spring.datasource.password=
4
+spring.datasource.password=098poilkj
5 5
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
6 6
 #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
7 7
 #spring.datasource.testWhileIdle = true

二进制
target/classes/com/buecoin01/controller/WalletController$UserController.class 查看文件


二进制
target/classes/com/buecoin01/controller/WalletController.class 查看文件