瀏覽代碼

Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/ZipCoin-RED into wallet2

wihdlwk# especially if it merges an updated upstream into a topic branch.
Aleena Rose-Mathew 6 年之前
父節點
當前提交
4526155930

+ 181
- 0
ZipCoinRedJavaServer/.idea/workspace.xml 查看文件

@@ -1,5 +1,62 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="56c18b2c-8142-4688-b878-d487ac8e7cdb" name="Default" comment="" />
5
+    <ignored path="$PROJECT_DIR$/target/" />
6
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7
+    <option name="TRACKING_ENABLED" value="true" />
8
+    <option name="SHOW_DIALOG" value="false" />
9
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11
+    <option name="LAST_RESOLUTION" value="IGNORE" />
12
+  </component>
13
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
14
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
15
+  <component name="JsGulpfileManager">
16
+    <detection-done>true</detection-done>
17
+    <sorting>DEFINITION_ORDER</sorting>
18
+  </component>
19
+  <component name="NodePackageJsonFileManager">
20
+    <packageJsonPaths />
21
+  </component>
22
+  <component name="ProjectFrameBounds">
23
+    <option name="y" value="23" />
24
+    <option name="width" value="1280" />
25
+    <option name="height" value="713" />
26
+  </component>
27
+  <component name="ProjectView">
28
+    <navigator proportions="" version="1">
29
+      <foldersAlwaysOnTop value="true" />
30
+    </navigator>
31
+    <panes>
32
+      <pane id="Scope" />
33
+      <pane id="AndroidView" />
34
+      <pane id="PackagesPane" />
35
+      <pane id="ProjectPane" />
36
+    </panes>
37
+  </component>
38
+  <component name="PropertiesComponent">
39
+    <property name="WebServerToolWindowFactoryState" value="false" />
40
+    <property name="aspect.path.notification.shown" value="true" />
41
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
42
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
43
+    <property name="project.structure.last.edited" value="Project" />
44
+    <property name="project.structure.proportion" value="0.0" />
45
+    <property name="project.structure.side.proportion" value="0.0" />
46
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
47
+  </component>
48
+  <component name="RunDashboard">
49
+    <option name="ruleStates">
50
+      <list>
51
+        <RuleState>
52
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
53
+        </RuleState>
54
+        <RuleState>
55
+          <option name="name" value="StatusDashboardGroupingRule" />
56
+        </RuleState>
57
+      </list>
58
+    </option>
59
+  </component>
3 60
   <component name="RunManager">
4 61
     <configuration default="true" type="Application" factoryName="Application">
5 62
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -20,6 +77,16 @@
20 77
       </option>
21 78
       <patterns />
22 79
     </configuration>
80
+    <configuration name="ZipCoinApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
81
+      <module name="ZipCoin-RED" />
82
+      <extension name="coverage">
83
+        <pattern>
84
+          <option name="PATTERN" value="com.zipcoin.*" />
85
+          <option name="ENABLED" value="true" />
86
+        </pattern>
87
+      </extension>
88
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.zipcoin.ZipCoinApp" />
89
+    </configuration>
23 90
     <configuration default="true" type="TestNG" factoryName="TestNG">
24 91
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
25 92
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -42,5 +109,119 @@
42 109
       <properties />
43 110
       <listeners />
44 111
     </configuration>
112
+    <recent_temporary>
113
+      <list>
114
+        <item itemvalue="Spring Boot.ZipCoinApp" />
115
+      </list>
116
+    </recent_temporary>
117
+  </component>
118
+  <component name="SvnConfiguration">
119
+    <configuration />
120
+  </component>
121
+  <component name="TaskManager">
122
+    <task active="true" id="Default" summary="Default task">
123
+      <changelist id="56c18b2c-8142-4688-b878-d487ac8e7cdb" name="Default" comment="" />
124
+      <created>1533221514750</created>
125
+      <option name="number" value="Default" />
126
+      <option name="presentableId" value="Default" />
127
+      <updated>1533221514750</updated>
128
+      <workItem from="1533221516219" duration="17000" />
129
+    </task>
130
+    <servers />
131
+  </component>
132
+  <component name="TimeTrackingManager">
133
+    <option name="totallyTimeSpent" value="17000" />
134
+  </component>
135
+  <component name="ToolWindowManager">
136
+    <frame x="0" y="23" width="1280" height="713" extended-state="0" />
137
+    <layout>
138
+      <window_info anchor="right" id="Palette" />
139
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
140
+      <window_info anchor="right" id="Maven Projects" />
141
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
142
+      <window_info id="Capture Tool" />
143
+      <window_info id="Designer" />
144
+      <window_info anchor="right" id="Database" />
145
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
146
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
147
+      <window_info id="UI Designer" />
148
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
149
+      <window_info anchor="bottom" id="TODO" order="6" />
150
+      <window_info anchor="right" id="Palette&#9;" />
151
+      <window_info id="Image Layers" />
152
+      <window_info anchor="bottom" id="Java Enterprise" />
153
+      <window_info anchor="right" id="Capture Analysis" />
154
+      <window_info anchor="bottom" id="Run" order="2" />
155
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
156
+      <window_info anchor="bottom" id="Spring" />
157
+      <window_info anchor="bottom" id="Terminal" />
158
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
159
+      <window_info anchor="right" id="Bean Validation" />
160
+      <window_info id="Web" side_tool="true" />
161
+      <window_info anchor="right" id="Theme Preview" />
162
+      <window_info id="Favorites" side_tool="true" />
163
+      <window_info anchor="bottom" id="Find" order="1" />
164
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
165
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
166
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
167
+      <window_info anchor="bottom" id="Message" order="0" />
168
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
169
+    </layout>
170
+  </component>
171
+  <component name="TypeScriptGeneratedFilesManager">
172
+    <option name="version" value="1" />
173
+  </component>
174
+  <component name="VcsContentAnnotationSettings">
175
+    <option name="myLimit" value="2678400000" />
176
+  </component>
177
+  <component name="masterDetails">
178
+    <states>
179
+      <state key="GlobalLibrariesConfigurable.UI">
180
+        <settings>
181
+          <splitter-proportions>
182
+            <option name="proportions">
183
+              <list>
184
+                <option value="0.2" />
185
+              </list>
186
+            </option>
187
+          </splitter-proportions>
188
+        </settings>
189
+      </state>
190
+      <state key="JdkListConfigurable.UI">
191
+        <settings>
192
+          <last-edited>1.8</last-edited>
193
+          <splitter-proportions>
194
+            <option name="proportions">
195
+              <list>
196
+                <option value="0.2" />
197
+              </list>
198
+            </option>
199
+          </splitter-proportions>
200
+        </settings>
201
+      </state>
202
+      <state key="ProjectJDKs.UI">
203
+        <settings>
204
+          <last-edited>1.8</last-edited>
205
+          <splitter-proportions>
206
+            <option name="proportions">
207
+              <list>
208
+                <option value="0.2" />
209
+              </list>
210
+            </option>
211
+          </splitter-proportions>
212
+        </settings>
213
+      </state>
214
+      <state key="ProjectLibrariesConfigurable.UI">
215
+        <settings>
216
+          <splitter-proportions>
217
+            <option name="proportions">
218
+              <list>
219
+                <option value="0.2" />
220
+              </list>
221
+            </option>
222
+          </splitter-proportions>
223
+        </settings>
224
+      </state>
225
+    </states>
45 226
   </component>
46 227
 </project>

+ 0
- 96
ZipCoinRedJavaServer/ZipCoin-RED.iml 查看文件

@@ -1,96 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
-  <component name="ExternalSystem" externalSystem="Maven" />
4
-  <component name="FacetManager">
5
-    <facet type="Spring" name="Spring">
6
-      <configuration />
7
-    </facet>
8
-    <facet type="web" name="Web">
9
-      <configuration>
10
-        <webroots />
11
-        <sourceRoots>
12
-          <root url="file://$MODULE_DIR$/src/main/java" />
13
-          <root url="file://$MODULE_DIR$/src/main/resources" />
14
-        </sourceRoots>
15
-      </configuration>
16
-    </facet>
17
-  </component>
18
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
19
-    <output url="file://$MODULE_DIR$/target/classes" />
20
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
21
-    <content url="file://$MODULE_DIR$">
22
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
23
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
24
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
25
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/redCoin" isTestSource="true" generated="true" />
26
-      <excludeFolder url="file://$MODULE_DIR$/target" />
27
-    </content>
28
-    <orderEntry type="inheritedJdk" />
29
-    <orderEntry type="sourceFolder" forTests="false" />
30
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.1.RELEASE" level="project" />
31
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.1.RELEASE" level="project" />
32
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.1.RELEASE" level="project" />
33
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.1.RELEASE" level="project" />
34
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.1.RELEASE" level="project" />
35
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
36
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
37
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.13" level="project" />
38
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" />
39
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
40
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.1.RELEASE" level="project" />
41
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.30" level="project" />
42
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.30" level="project" />
43
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.30" level="project" />
44
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.0.30" level="project" />
45
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.1.RELEASE" level="project" />
46
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.2.Final" level="project" />
47
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
48
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
49
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.4" level="project" />
50
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.4" level="project" />
51
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.4" level="project" />
52
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" level="project" />
53
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.4.RELEASE" level="project" />
54
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
55
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" level="project" />
56
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" level="project" />
57
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" level="project" />
58
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.4.RELEASE" level="project" />
59
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.1.RELEASE" level="project" />
60
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.1.RELEASE" level="project" />
61
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
62
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.3.1.RELEASE" level="project" />
63
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.30" level="project" />
64
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.30" level="project" />
65
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.4.RELEASE" level="project" />
66
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
67
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
68
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
69
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
70
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
71
-    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
72
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
73
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
74
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
75
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
76
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
77
-    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
78
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" level="project" />
79
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" level="project" />
80
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.4.RELEASE" level="project" />
81
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" level="project" />
82
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
83
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" />
84
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.4.RELEASE" level="project" />
85
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.1.RELEASE" level="project" />
86
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
87
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
88
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
89
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
90
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" level="project" />
91
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.4.RELEASE" level="project" />
92
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
93
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
94
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.38" level="project" />
95
-  </component>
96
-</module>

二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/config/BlockLoader.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/BlockController.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/HomeController.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/WalletController.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Block.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Chain.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Wallet.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/BlockRepository.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/WalletRepository.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/Miner.class 查看文件


二進制
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/StringUtil.class 查看文件


+ 0
- 16
ZipCoinRedJavaServer/target/classes/db/migration/V2__create_block.sql 查看文件

@@ -1,30 +0,0 @@
1
-<<<<<<< HEAD
2
-CREATE TABLE BLOCK(
3
-	ID INT AUTO_INCREMENT,
4
-	BLOCK_NUMBER INT,
5
-	PREVIOUS_HASH VARCHAR(255),
6
-	NONCE INT,
7
-	CURRENT_HASH VARCHAR(255),
8
-	TRANSACTION_LIST VARCHAR(2000)
9
-);
10
-
11
-CREATE TABLE WALLET(
12
-  ID INT AUTO_INCREMENT,
13
-);
14
-=======
15
---
16
->>>>>>> dev