Skip to content

C
coupons
Commit 7b805e0c authored by 袁邓@五瓣科技's avatar 袁邓@五瓣科技
Browse files
Options

修改userID和订单签名延签

parent e89c3116
Show whitespace changes
Inline Side-by-side
Showing with 959 additions and 56 deletions
.idea/misc.xml 0 → 100644
View file @ 7b805e0c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
View file @ 7b805e0c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/test.iml 0 → 100644
View file @ 7b805e0c
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
View file @ 7b805e0c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
View file @ 7b805e0c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="fb487ffd-a3ea-4ac6-b4e7-83999b2f2f92" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/coupon/cert.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/cert.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/coupon/certificate.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/certificate.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/coupon/coupons_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/coupons_test.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/coupon/dataobject.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/dataobject.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/coupon/leadger.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/leadger.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/coupon/tools.go" beforeDir="false" afterPath="$PROJECT_DIR$/coupon/tools.go" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="leadger.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1096">
<caret line="202" column="9" selection-start-line="202" selection-start-column="9" selection-end-line="202" selection-end-column="34" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tools.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="71" column="21" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="21" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="certificate.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="93" column="29" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cert.go" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="520" column="24" selection-start-line="520" selection-start-column="12" selection-end-line="520" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="coupons_test.go" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="245" column="35" lean-forward="true" selection-start-line="245" selection-start-column="35" selection-end-line="245" selection-end-column="35" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>algorithm unimplemented</find>
<find>ErrUnsupportedAlgorithm</find>
<find>ParsePublicKey</find>
<find>PrivateKeySerialize</find>
</findStrings>
</component>
<component name="GOROOT" path="D:\Go" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/sm_crypto/sm2/sm2.go" />
<option value="$PROJECT_DIR$/coupon/coupons.go" />
<option value="$PROJECT_DIR$/coupon/dataobject.go" />
<option value="$PROJECT_DIR$/coupon/certificate.go" />
<option value="$PROJECT_DIR$/coupon/coupons_test.go" />
<option value="$PROJECT_DIR$/coupon/tools.go" />
<option value="$PROJECT_DIR$/coupon/leadger.go" />
<option value="$PROJECT_DIR$/coupon/cert.go" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="65" />
<option name="y" value="20" />
<option name="width" value="1750" />
<option name="height" value="975" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="test" type="b2602c69:ProjectViewProjectNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="test" type="b2602c69:ProjectViewProjectNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="coupon" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="go.gopath.indexing.explicitly.defined" value="true" />
<property name="go.sdk.automatically.set" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Go Test.TestCouponsFlow in coupons/test/coupon (1)">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
<module name="test" />
<working_directory value="$PROJECT_DIR$/coupon" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="PACKAGE" />
<package value="coupons/test/coupon" />
<directory value="$PROJECT_DIR$/" />
<filePath value="$PROJECT_DIR$/" />
<pattern value="^TestCouponsFlow$" />
</configuration>
<configuration name="TestCouponsFlow in coupons/test/coupon" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
<module name="coupon" />
<working_directory value="$PROJECT_DIR$/coupon" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="PACKAGE" />
<package value="coupons/test/coupon" />
<directory value="$PROJECT_DIR$/" />
<filePath value="$PROJECT_DIR$/" />
<pattern value="^TestCouponsFlow$" />
</configuration>
<configuration name="TestCreateUser in coupons/test/coupon (1)" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
<module name="test" />
<working_directory value="$PROJECT_DIR$/coupon" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="PACKAGE" />
<package value="coupons/test/coupon" />
<directory value="$PROJECT_DIR$/" />
<filePath value="$PROJECT_DIR$/" />
<pattern value="^TestCreateUser$" />
</configuration>
<configuration name="TestCreateUser in coupons/test/coupon" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
<module name="coupon" />
<working_directory value="$PROJECT_DIR$/coupon" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="PACKAGE" />
<package value="coupons/test/coupon" />
<directory value="$PROJECT_DIR$/" />
<filePath value="$PROJECT_DIR$/" />
<pattern value="^TestCreateUser$" />
</configuration>
<configuration name="TestSignInfo in coupons/test/coupon" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
<module name="test" />
<working_directory value="$PROJECT_DIR$/coupon" />
<go_parameters value="-i" />
<framework value="gotest" />
<kind value="PACKAGE" />
<package value="coupons/test/coupon" />
<directory value="$PROJECT_DIR$/" />
<filePath value="$PROJECT_DIR$/" />
<pattern value="^TestSignInfo$" />
</configuration>
<list>
<item itemvalue="Go Test.TestCreateUser in coupons/test/coupon" />
<item itemvalue="Go Test.TestCouponsFlow in coupons/test/coupon" />
<item itemvalue="Go Test.TestCouponsFlow in coupons/test/coupon (1)" />
<item itemvalue="Go Test.TestCreateUser in coupons/test/coupon (1)" />
<item itemvalue="Go Test.TestSignInfo in coupons/test/coupon" />
</list>
<recent_temporary>
<list>
<item itemvalue="Go Test.TestCouponsFlow in coupons/test/coupon (1)" />
<item itemvalue="Go Test.TestSignInfo in coupons/test/coupon" />
<item itemvalue="Go Test.TestCreateUser in coupons/test/coupon (1)" />
<item itemvalue="Go Test.TestCouponsFlow in coupons/test/coupon" />
<item itemvalue="Go Test.TestCreateUser in coupons/test/coupon" />
</list>
</recent_temporary>
</component>
<component name="TestHistory">
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 19h 38m 07s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 19h 41m 10s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 19h 41m 52s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 19h 42m 43s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 19h 50m 51s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.28 at 20h 13m 59s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.29 at 10h 17m 47s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.29 at 10h 19m 40s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.29 at 10h 21m 52s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
<history-entry file="TestCouponsFlow_in_coupons_test_coupon_(1) - 2020.04.29 at 10h 24m 49s.xml">
<configuration name="TestCouponsFlow in coupons/test/coupon (1)" configurationId="GoTestRunConfiguration" />
</history-entry>
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="840" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14583333" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Run" order="2" weight="0.38661203" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.44808742" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="DlvLineBreakpoint">
<url>file://$PROJECT_DIR$/coupon/leadger.go</url>
<line>260</line>
<properties />
<option name="timeStamp" value="3" />
</line-breakpoint>
</breakpoints>
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="4" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6950">
<caret line="392" column="31" selection-start-line="392" selection-start-column="28" selection-end-line="392" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1375">
<caret line="261" column="44" lean-forward="true" selection-start-line="261" selection-start-column="44" selection-end-line="261" selection-end-column="44" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="86" column="79" selection-start-line="86" selection-start-column="79" selection-end-line="86" selection-end-column="79" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6950">
<caret line="392" column="31" selection-start-line="392" selection-start-column="28" selection-end-line="392" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1325">
<caret line="258" column="15" selection-start-line="258" selection-start-column="15" selection-end-line="258" selection-end-column="15" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/sm2.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="53" column="61" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="86" column="79" selection-start-line="86" selection-start-column="79" selection-end-line="86" selection-end-column="79" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6950">
<caret line="392" column="31" selection-start-line="392" selection-start-column="28" selection-end-line="392" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1325">
<caret line="259" column="27" selection-start-line="259" selection-start-column="27" selection-end-line="259" selection-end-column="27" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="86" column="79" selection-start-line="86" selection-start-column="79" selection-end-line="86" selection-end-column="79" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1600">
<caret line="324" column="1" lean-forward="true" selection-start-line="324" selection-start-column="1" selection-end-line="324" selection-end-column="1" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4800">
<caret line="242" column="21" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1775">
<caret line="262" column="4" selection-start-line="262" selection-start-column="4" selection-end-line="262" selection-end-column="4" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="44" column="25" selection-start-line="44" selection-start-column="5" selection-end-line="44" selection-end-column="25" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8050">
<caret line="330" column="34" selection-start-line="330" selection-start-column="30" selection-end-line="330" selection-end-column="34" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5500">
<caret line="234" column="49" selection-start-line="234" selection-start-column="40" selection-end-line="234" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1475">
<caret line="257" column="18" selection-start-line="257" selection-start-column="4" selection-end-line="257" selection-end-column="18" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8300">
<caret line="346" column="111" selection-start-line="346" selection-start-column="111" selection-end-line="346" selection-end-column="111" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/dataobject.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="43" column="78" lean-forward="true" selection-start-line="43" selection-start-column="78" selection-end-line="43" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8050">
<caret line="330" column="20" lean-forward="true" selection-start-line="330" selection-start-column="20" selection-end-line="330" selection-end-column="20" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1850">
<caret line="265" column="4" lean-forward="true" selection-start-line="265" selection-start-column="4" selection-end-line="265" selection-end-column="4" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/cert_pool.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/sm2.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="35" column="7" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/cert_pool.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/pkcs1.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-76" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/pkcs8.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-452" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/verify.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/x509.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="38" column="14" lean-forward="true" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm4/sm4.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/crypto.go" />
<entry file="file://$PROJECT_DIR$/coupon/dataobject.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="95" column="55" lean-forward="true" selection-start-line="95" selection-start-column="55" selection-end-line="95" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="63" column="89" selection-start-line="63" selection-start-column="89" selection-end-line="63" selection-end-column="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sm_crypto/sm2/sm2.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="53" column="61" selection-start-line="53" selection-start-column="57" selection-end-line="53" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://D:/go/src/testing/testing.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="873" selection-start-line="873" selection-end-line="873" />
</state>
</provider>
</entry>
<entry file="file://D:/go/src/crypto/crypto.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="107" column="5" selection-start-line="107" selection-start-column="5" selection-end-line="107" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/tools.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="71" column="21" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="21" />
<folding>
<element signature="n#!!block;n#splitPath#0" />
<element signature="n#!!block;n#parseArgsToOrderInfo#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/certificate.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="93" column="29" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
<folding>
<element signature="n#!!block;n#certManagement#0" />
<element signature="n#!!block;n#createOrgApi#0" />
<element signature="n#!!block;n#createMerchantsApi#0" />
<element signature="n#!!block;n#certUpdateDitchApi#0" />
<element signature="n#!!block;n#certUpdateMerchantApi#0" />
<element signature="n#!!block;n#certUnLockApi#0" />
<element signature="n#!!block;n#getCert#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/cert.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="520" column="24" selection-start-line="520" selection-start-column="12" selection-end-line="520" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/leadger.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1096">
<caret line="202" column="9" selection-start-line="202" selection-start-column="9" selection-end-line="202" selection-end-column="34" />
<folding>
<element signature="n#!!block;n#transactionProcess#0" />
<element signature="n#!!block;n#createCouponsApi#0" />
<element signature="n#!!block;n#disCouponApi#0" />
<element signature="n#!!block;n#isSupportMerchants#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/coupon/coupons_test.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="245" column="35" lean-forward="true" selection-start-line="245" selection-start-column="35" selection-end-line="245" selection-end-column="35" />
<folding>
<element signature="n#!!block;n#TestCreateCoupons#0" />
<element signature="n#!!block;n#TestCreateUser#0" />
<element signature="n#!!block;n#TestRouterest#0" />
<element signature="n#!!block;n#TestParse#0" />
<element signature="n#!!block;n#TestCreateTx#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
coupon/cert.go
View file @ 7b805e0c
...@@ -167,7 +167,10 @@ type dsaSignature struct { ...@@ -167,7 +167,10 @@ type dsaSignature struct {
R, S *big.Int R, S *big.Int
} }
type PubSerialize struct {
PubSerialize []byte `json:"pub_serialize"`
PubType crypto.Hash `json:"pub_type"`
}
type PrivateKeySerialize struct { type PrivateKeySerialize struct {
PrivSerialize []byte `json:"priv_serialize"` //私钥序列化的数据 PrivSerialize []byte `json:"priv_serialize"` //私钥序列化的数据
PrivType crypto.Hash`json:"priv_type"` PrivType crypto.Hash`json:"priv_type"`
...@@ -509,3 +512,19 @@ func ReadBits(bigint *big.Int, buf []byte) { ...@@ -509,3 +512,19 @@ func ReadBits(bigint *big.Int, buf []byte) {
//func MarshalPublicKey(curve elliptic.Curve,x,y *big.Int ){ //func MarshalPublicKey(curve elliptic.Curve,x,y *big.Int ){
// //
//} //}
func ParsePublicKey(pubHex string)(pub interface{},hashType crypto.Hash,err error){
pubByte,err := hex.DecodeString(pubHex)
if err!=nil{
return nil,crypto.Hash(0),err
}
pubS :=&PubSerialize{}
err = json.Unmarshal(pubByte,pubS)
if err!=nil{
return nil,crypto.Hash(0),fmt.Errorf("pubByte Unmarshal error "+err.Error())
}
hashType = pubS.PubType
fmt.Println("namedCurveFromHash(hashType)",namedCurveFromHash(hashType))
pub,err = unmarshalPubkey(pubS.PubSerialize,namedCurveFromHash(hashType))
return
}
\ No newline at end of file
coupon/certificate.go
View file @ 7b805e0c
...@@ -268,7 +268,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI ...@@ -268,7 +268,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI
cert := &Certificate{} cert := &Certificate{}
switch txType { switch txType {
case CreateCoupon: case CreateCoupon:
cert ,err = getCert(message.UserId,0,stub) cert ,err = getCert(message.OwnId,0,stub)
if err != nil{ if err != nil{
return return
} }
...@@ -277,7 +277,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI ...@@ -277,7 +277,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI
return "",errors.New("only organization account can create coupon") return "",errors.New("only organization account can create coupon")
} }
case DisCoupon: case DisCoupon:
cert ,err = getCert(message.UserId,0,stub) cert ,err = getCert(message.OwnId,0,stub)
if err != nil{ if err != nil{
return return
} }
...@@ -286,7 +286,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI ...@@ -286,7 +286,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI
return "",errors.New("only organization account can distribute coupon") return "",errors.New("only organization account can distribute coupon")
} }
case ApplyCoupon: case ApplyCoupon:
cert ,err = getCert(message.UserId,1,stub) cert ,err = getCert(message.OwnId,1,stub)
if err != nil{ if err != nil{
return return
} }
...@@ -295,7 +295,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI ...@@ -295,7 +295,7 @@ func CheckCertSignature( message *Message,txType TxType,stub shim.ChaincodeStubI
return "",errors.New("only channel account can create apply coupon transaction") return "",errors.New("only channel account can create apply coupon transaction")
} }
case UseCoupon: case UseCoupon:
cert ,err = getCert(message.UserId,2,stub) cert ,err = getCert(message.OwnId,2,stub)
if err != nil{ if err != nil{
return return
} }
......
coupon/coupons_test.go
View file @ 7b805e0c
...@@ -20,27 +20,6 @@ var merchantPublicKey = "041922e1019b52daa86246b1a330efc2e7308f9019000bda3103bd8 ...@@ -20,27 +20,6 @@ var merchantPublicKey = "041922e1019b52daa86246b1a330efc2e7308f9019000bda3103bd8
var merchantPrivateKey = "7b22707269765f73657269616c697a65223a226e68724c34536c454d6b7431356c2b385651576b466d6d724c516333674b364a62527565757a39594451413d222c22707269765f74797065223a32317d" var merchantPrivateKey = "7b22707269765f73657269616c697a65223a226e68724c34536c454d6b7431356c2b385651576b466d6d724c516333674b364a62527565757a39594451413d222c22707269765f74797065223a32317d"
var merchantCert = `{"public_key_hash_algorithm":21,"public_key_byte":"BBki4QGbUtqoYkaxozDvwucwj5AZAAvaMQO9hjoFd2/z1tJ0s2h3i7v8z8sHF52uOa5Vy3mro9oU7NuyC7kjm/c=","publickey":null,"cert_type":3,"extensions":100,"not_before":1590482496,"not_after":1587890496,"cert_hash":"C/L+z0ZZPnbPX8mkab88feMYNlSPRx9s5Xsitls7zoU=","signature":"5o/BpTdBedJea7w/yYpIjuj1OJa/g5hh5c2oAYDN0pmOQlHw/nftJTERMpl8GqwU3sEXh5My3tFmuI6WbLyuXA==","signature_algorithm":16}` var merchantCert = `{"public_key_hash_algorithm":21,"public_key_byte":"BBki4QGbUtqoYkaxozDvwucwj5AZAAvaMQO9hjoFd2/z1tJ0s2h3i7v8z8sHF52uOa5Vy3mro9oU7NuyC7kjm/c=","publickey":null,"cert_type":3,"extensions":100,"not_before":1590482496,"not_after":1587890496,"cert_hash":"C/L+z0ZZPnbPX8mkab88feMYNlSPRx9s5Xsitls7zoU=","signature":"5o/BpTdBedJea7w/yYpIjuj1OJa/g5hh5c2oAYDN0pmOQlHw/nftJTERMpl8GqwU3sEXh5My3tFmuI6WbLyuXA==","signature_algorithm":16}`
//var createCouponsData = `{"expand": {"coup_id": "0001","coup_type": "XJQ","coup_valid": "2017-01-13 23:59:59","coup_available_time": "券可用时间段","coup_description": "券使用说明","coup_quantity": 1000000,"coup_amount": 10.00,"coup_total_amount": 10000000,"floor_amount": 10.00},"to":"org123"}`
//var createCouponsData = `{"value":"{\"coup_id\":\"0001\",\"coup_type\":\"XJQ\",\"coup_valid\":\"2017-01-13 23:59:59\",\"coup_available_time\":\"券可用时间段\",\"coup_description\":\"券描述\",\"coup_quantity\":1000000,\"coup_amount\":10,\"coup_discount\":0.5,\"coup_total_amount\":10000000,\"floor_amount\":10,\"extensions\":null}","fromAddress":"","toAddress":"org123","toPublicKey":""}`
var createCouponsData = `{"value": "{\"uAddress\":\"wwe=rrrrr\",\"mid\":\"0001\"}"}`
var createCouponsDataSign =[]byte{207 ,240, 50, 5, 177, 135, 76 ,137, 236 ,206, 203, 228, 77, 16 ,230, 64 ,57 ,97, 237, 151, 184, 122, 214, 119 ,20, 51, 130 ,35 ,49 ,218, 32, 17, 121 ,70 ,57 ,241 ,163, 172, 191, 6 ,126, 40 ,98, 228, 197, 88 ,44 ,79 ,253 ,13, 245, 85, 129 ,204 ,254, 196 ,26 ,60, 114 ,120, 65, 172, 95 ,200}
var disCouponsData =`{"from":"org123","to":"channel123","to_pub":"04aa7cf4f0950be19033848ab8956160f2ecb461e7034d4d2e95990f233c2166de4969eec6e69988d5cfbcf3461a2a5a53dd131bfab343dcefdc24a466d0faf09e","value":10000}`
var disCouponsDataSign =[]byte{115, 165, 9 ,100, 154 ,56 ,79 ,35 ,146, 86 ,229 ,88 ,160, 82 ,228, 62 ,242 ,32 ,244 ,183, 221 ,174, 172, 186 ,53 ,200, 168, 250, 230, 21, 90, 92 ,128 ,103 ,117 ,234, 168, 145 ,224, 178, 202, 9 ,206, 121, 0 ,139 ,38 ,78, 247, 161, 147 ,60 ,20, 115 ,131, 14, 161, 110, 232, 102, 37, 109, 167, 179}
var applyCouponsData =` {"from":"channel123","to":"user123","to_pub":"123456789"}`
var applyCouponsDataSign =[]byte{154,81,233,239,237,59,16,126,169,142,112,144,255,5,43,22,101,250,208,159,199,203,100,221,24,156,14,194,149,173,47,97,113,75,80,106,37,154,220,231,181,60,150,182,109,53,175,158,175,138,93,165,161,127,39,110,85,119,8,236,143,96,16,160}
var useCouponsData =` {"expand":"订单信息","from":"user123","to":"mert123","to_pub":"123456789"}`
var useCouponsDataSign =[]byte{146,15,96,112,62,182,206,85,28,253,120,129,194,242,121,150,74,147,144,171,164,196,54,187,76,79,69,228,236,208,5,194,112,184,191,20,74,120,48,39,161,14,44,160,238,52,13,1,172,8,155,132,43,145,157,245,253,52,74,48,14,164,10,50}
var getCouponsData = `{"expand": {"coup_id": "0001"}}`
var getCouponsByAddress = `{"from":"mert123"}`
var subsidiesData = `{"to_pub":"048014f3e260f1e202259c0e0dcf9a70478c8d8e808ec91f27af1320c31c4e9183b7a12813a4a524b07b0fa83850babff2194f18e7eed38cd639f3eb6c86b61d50"}`
func TestCreateCoupons(t *testing.T) { func TestCreateCoupons(t *testing.T) {
cc := new(CPSChainCode) cc := new(CPSChainCode)
...@@ -67,11 +46,11 @@ func TestCreateCoupons(t *testing.T) { ...@@ -67,11 +46,11 @@ func TestCreateCoupons(t *testing.T) {
//fmt.Printf("Invoke status %d,message %s and payload %s\n",responseByPutschema.Status,responseByPutschema.Message,string(responseByPutschema.Payload)) //fmt.Printf("Invoke status %d,message %s and payload %s\n",responseByPutschema.Status,responseByPutschema.Message,string(responseByPutschema.Payload))
fmt.Println("========================================invoke createTx createCoupons============================================") //fmt.Println("========================================invoke createTx createCoupons============================================")
fmt.Println() //fmt.Println()
fmt.Println() //fmt.Println()
responseByPutschema := stub.MockInvoke("invoke1",[][]byte{[]byte("createTx/updateMertUtxo"), []byte(orgPublicKey),[]byte(createCouponsData),[]byte(createCouponsDataSign)}) //responseByPutschema := stub.MockInvoke("invoke1",[][]byte{[]byte("createTx/updateMertUtxo"), []byte(orgPublicKey),[]byte(createCouponsData),[]byte(createCouponsDataSign)})
fmt.Printf("Invoke status %d,message %s and payload %s\n",responseByPutschema.Status,responseByPutschema.Message,string(responseByPutschema.Payload)) //fmt.Printf("Invoke status %d,message %s and payload %s\n",responseByPutschema.Status,responseByPutschema.Message,string(responseByPutschema.Payload))
//fmt.Println("========================================invoke createTx disCoupon============================================") //fmt.Println("========================================invoke createTx disCoupon============================================")
...@@ -241,7 +220,7 @@ func TestCreateTx(t *testing.T){ ...@@ -241,7 +220,7 @@ func TestCreateTx(t *testing.T){
fmt.Println(hex.EncodeToString(txByte)) fmt.Println(hex.EncodeToString(txByte))
fmt.Println(string(txByte)) fmt.Println(string(txByte))
message := &Message{ message := &Message{
UserId:"1", OwnId:"1",
Data:string(txByte), Data:string(txByte),
Sign:"c384f2bc27a9abc87b07ce798fd4a65323aab9ddbd4aee8b379c1a987e6cf272b9becc5fb4bcd2f3d8495fe715ed4c263c6b4c5ce68067d39922df12fd075fc9", Sign:"c384f2bc27a9abc87b07ce798fd4a65323aab9ddbd4aee8b379c1a987e6cf272b9becc5fb4bcd2f3d8495fe715ed4c263c6b4c5ce68067d39922df12fd075fc9",
} }
...@@ -261,9 +240,8 @@ var disCouponsDate = `{"value":"{\"amount\":99,\"did\":\"11\"}","fromAddress":"u ...@@ -261,9 +240,8 @@ var disCouponsDate = `{"value":"{\"amount\":99,\"did\":\"11\"}","fromAddress":"u
var ApplyCouponsSign = `7092dde322c376f5d43541f219ffe3234b8cea365a7e5aa49983865a36516e2c0e7b875cc5750e61b6a1bf3d22e0f004ae42d73aaad655fe972047b70ff91246` var ApplyCouponsSign = `7092dde322c376f5d43541f219ffe3234b8cea365a7e5aa49983865a36516e2c0e7b875cc5750e61b6a1bf3d22e0f004ae42d73aaad655fe972047b70ff91246`
var ApplyCouponsDate = `{"value":"{\"uid\":\"\",\"name\":\"\",\"number\":\"\",\"phone\":\"\",\"create_time\":\"0001-01-01T00:00:00Z\"}","fromAddress":"utxo2","toAddress":"utxo3","toPublicKey":"04e6496ec8db3af69f1efbe12dc6e6c28402d2ff928e69160040cd4e293402d224785cf12912635306a65dc08f2dc840daa71cc30049fb77d3a95480f09d011c7d"}` var ApplyCouponsDate = `{"value":"{\"uid\":\"\",\"name\":\"\",\"number\":\"\",\"phone\":\"\",\"create_time\":\"0001-01-01T00:00:00Z\"}","fromAddress":"utxo2","toAddress":"utxo3","toPublicKey":"04e6496ec8db3af69f1efbe12dc6e6c28402d2ff928e69160040cd4e293402d224785cf12912635306a65dc08f2dc840daa71cc30049fb77d3a95480f09d011c7d"}`
var useCouponsSign = `a0a253661923245cdc2eef15ab665d96fd7383608587a652baa68303687f1b6e5fb86fe2bda2b94b68e9bf5478793154c7420c3688d61996c95d87d43a49649b` var useCouponsSign = `2eb8f81b19a2e4c14d15c1736f8c9ea764e707ddb14a16c8a373e38e3000de3b7e62c56eac42241bdc739ad4ca52fc7d13c97a597e5c7e5993a845cc75a9f22d`
var useCouponsDate = `{"value":"{\"privHex\":\"7b22707269765f73657269616c697a65223a223453384363544476374a4862767867747076516969653961506a784e756c316b46324431496850765574553d222c22707269765f74797065223a32317d\"}","fromAddress":"utxo3","toAddress":"utxo4","toPublicKey":"04e6496ec8db3af69f1efbe12dc6e6c28402d2ff928e69160040cd4e293402d224785cf12912635306a65dc08f2dc840daa71cc30049fb77d3a95480f09d011c7d"}` var useCouponsDate = `{"value":"{\"orderSign\":\"eb12fd1922cdb15b8be9c43a685f342c455c8a44f9972d0c83761a760554f3cdee6e127378d1d3953aeed678e04d55d059be5f6ca65cb864310891626daf1336\",\"order\":\"订单信息\",\"algorithm\":1}","fromAddress":"utxo3","toAddress":"utxo4"}`
func TestCouponsFlow(t *testing.T){ func TestCouponsFlow(t *testing.T){
cc := new(CPSChainCode) cc := new(CPSChainCode)
......
coupon/dataobject.go
View file @ 7b805e0c
...@@ -93,7 +93,7 @@ type Orgnazation struct { ...@@ -93,7 +93,7 @@ type Orgnazation struct {
} }
// 前端传递的数据 // 前端传递的数据
type Message struct { type Message struct {
UserId string `json:"user_id"` // 交易发起人的用户Id OwnId string `json:"own_id"` // 交易发起人的用户Id
Data string `json:"data"` // 交易参数 Data string `json:"data"` // 交易参数
Sign string `json:"sign"` // 交易签名信息，if是商户交易，这里是券公钥 Sign string `json:"sign"` // 交易签名信息，if是商户交易，这里是券公钥
} }
......
coupon/leadger.go
View file @ 7b805e0c
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
pb "github.com/hyperledger/fabric/protos/peer" pb "github.com/hyperledger/fabric/protos/peer"
"encoding/json" "encoding/json"
"strings" "strings"
"encoding/hex"
) )
func transactionProcess(paths, args []string, stub shim.ChaincodeStubInterface) pb.Response { func transactionProcess(paths, args []string, stub shim.ChaincodeStubInterface) pb.Response {
...@@ -60,7 +61,7 @@ func createCouponsApi(args []string, stub shim.ChaincodeStubInterface) pb.Respon ...@@ -60,7 +61,7 @@ func createCouponsApi(args []string, stub shim.ChaincodeStubInterface) pb.Respon
//创建UTXO资产 //创建UTXO资产
utxo := &Utxo{ utxo := &Utxo{
Address: trans.To, Address: trans.To,
UserId: message.UserId, UserId: message.OwnId,
Status: "0", Status: "0",
CoupType: coupon.CoupType, CoupType: coupon.CoupType,
CoupQuantity: coupon.CoupQuantity, CoupQuantity: coupon.CoupQuantity,
...@@ -116,8 +117,8 @@ func disCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response { ...@@ -116,8 +117,8 @@ func disCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response {
if boo { if boo {
return shim.Error("Coupon distribution failed, utxo address already exists") return shim.Error("Coupon distribution failed, utxo address already exists")
} }
if orgUtxo.UserId != message.UserId { if orgUtxo.UserId != message.OwnId {
return shim.Error("UserId alignment error") return shim.Error("OwnId alignment error")
} }
if orgUtxo.Status != "0" { if orgUtxo.Status != "0" {
return shim.Error("Card coupon status is abnormal and cannot be dis") return shim.Error("Card coupon status is abnormal and cannot be dis")
...@@ -190,8 +191,8 @@ func userApplyCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Resp ...@@ -190,8 +191,8 @@ func userApplyCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Resp
if dictUtxo.Status != "1" { if dictUtxo.Status != "1" {
return shim.Error("Card coupon status is abnormal and cannot be apply") return shim.Error("Card coupon status is abnormal and cannot be apply")
} }
if dictUtxo.UserId != message.UserId { if dictUtxo.UserId != message.OwnId {
return shim.Error("UserId alignment error") return shim.Error("OwnId alignment error")
} }
if dictUtxo.CoupQuantity < 1 { if dictUtxo.CoupQuantity < 1 {
return shim.Error("Drawing failure, insufficient margin") return shim.Error("Drawing failure, insufficient margin")
...@@ -229,7 +230,6 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response { ...@@ -229,7 +230,6 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response {
if err != nil { if err != nil {
return shim.Error(err.Error()) return shim.Error(err.Error())
} }
utxo, err := getStateUtxo(KEY+trans.From, stub) utxo, err := getStateUtxo(KEY+trans.From, stub)
if err != nil { if err != nil {
return shim.Error(err.Error()) return shim.Error(err.Error())
...@@ -238,12 +238,12 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response { ...@@ -238,12 +238,12 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response {
return shim.Error("Card coupon status is abnormal and cannot be used") return shim.Error("Card coupon status is abnormal and cannot be used")
} }
//TODO 解析订单信息，校验券使用条件是否满足.待定。 //TODO 解析订单信息，校验券使用条件是否满足.待定。
isSupport,err := isSupportMerchants(utxo.CoupId,message.UserId,stub) isSupport,err := isSupportMerchants(utxo.CoupId,message.OwnId,stub)
if err != nil{ if err != nil{
return shim.Error(err.Error()) return shim.Error(err.Error())
} }
if !isSupport { if !isSupport {
shim.Error(fmt.Sprintf("coupon %s unsupport merchant %s use",utxo.CoupId,message.UserId)) shim.Error(fmt.Sprintf("coupon %s unsupport merchant %s use",utxo.CoupId,message.OwnId))
} }
expand, ok := trans.Value.(string) //判断类型 expand, ok := trans.Value.(string) //判断类型
if !ok { if !ok {
...@@ -254,16 +254,23 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response { ...@@ -254,16 +254,23 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response {
if err != nil{ if err != nil{
fmt.Println(err) fmt.Println(err)
} }
//拿到订单信息 order,orderSign,also,err :=parseArgsToOrderInfo(dat)
order, ok := dat["order"].(string) if err != nil {
//订单签名信息 return shim.Error(err.Error())
orderSign, ok := dat["orderSign"].(string) }
if !ok { pub,_,err :=ParsePublicKey(utxo.PublicKey)
return shim.Error("Error orderSign parameter type，must be string") if err != nil {
return shim.Error("PublicKey ParsePublicKey error,"+err.Error())
}
signature,err := hex.DecodeString(orderSign)
if err != nil{
return shim.Error("orderSign DecodeString error,"+err.Error())
} }
//TODO 验证订单签名信息 //TODO 验证订单签名信息
fmt.Println(order) err = checkSignature(also,[]byte(order),[]byte(signature),pub)
fmt.Println(orderSign) if err != nil {
return shim.Error(err.Error())
}
//_,pubKey,err := ParsePrivateKey(privHex) //_,pubKey,err := ParsePrivateKey(privHex)
//pubHex := hex.EncodeToString(pubKey) //pubHex := hex.EncodeToString(pubKey)
//if utxo.PublicKey != pubHex { //if utxo.PublicKey != pubHex {
...@@ -276,7 +283,7 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response { ...@@ -276,7 +283,7 @@ func useCouponApi(args []string, stub shim.ChaincodeStubInterface) pb.Response {
if mertByteUtxo == nil { if mertByteUtxo == nil {
mertNewUtxo = Utxo{ mertNewUtxo = Utxo{
Address: trans.To, Address: trans.To,
UserId: message.UserId , UserId: message.OwnId ,
Status: "4", Status: "4",
CoupType: utxo.CoupType, CoupType: utxo.CoupType,
CoupQuantity: utxo.CoupQuantity, CoupQuantity: utxo.CoupQuantity,
......
coupon/tools.go
View file @ 7b805e0c
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"encoding/json" "encoding/json"
"github.com/hyperledger/fabric/core/chaincode/shim" "github.com/hyperledger/fabric/core/chaincode/shim"
"strconv"
) )
func splitPath(key string) []string { func splitPath(key string) []string {
...@@ -21,11 +22,11 @@ func messageToTrans(operation TxType,args []string,stub shim.ChaincodeStubInterf ...@@ -21,11 +22,11 @@ func messageToTrans(operation TxType,args []string,stub shim.ChaincodeStubInterf
return nil,nil, "",fmt.Errorf("put data operation expected more than 3 parameters! ") return nil,nil, "",fmt.Errorf("put data operation expected more than 3 parameters! ")
} }
message := &Message{ message := &Message{
UserId: args[0], OwnId: args[0],
Data: args[1], Data: args[1],
Sign: args[2], Sign: args[2],
} }
if message.UserId == "" || message.Sign == "" || message.Data == "" { if message.OwnId == "" || message.Sign == "" || message.Data == "" {
return nil,nil,"" ,fmt.Errorf("Parameter exception, cannot be null!") return nil,nil,"" ,fmt.Errorf("Parameter exception, cannot be null!")
} }
//验证证书和签名 //验证证书和签名
...@@ -42,3 +43,37 @@ func messageToTrans(operation TxType,args []string,stub shim.ChaincodeStubInterf ...@@ -42,3 +43,37 @@ func messageToTrans(operation TxType,args []string,stub shim.ChaincodeStubInterf
return &trans,message,pubKey , nil return &trans,message,pubKey , nil
} }
func parseArgsToOrderInfo(dat map[string]interface{}) (string,string,SignatureAlgorithm,error) {
//拿到订单信息
order, ok := dat["order"].(string)
if !ok {
return "","",-1,fmt.Errorf("Error order parameter type，must be string")
}
//订单签名信息
orderSign, ok := dat["orderSign"].(string)
if !ok {
return "","",-1,fmt.Errorf("Error orderSign parameter type，must be string")
}
//拿到订单信息
algorithm, ok := dat["algorithm"].(float64)
if !ok {
return "","",-1,fmt.Errorf("Error algorithm parameter type，must be int")
}
var algo SignatureAlgorithm
switch algorithm {
case 1:
algo = SM2WithSM3
case 2:
algo = ECDSAWithSHA256
}
return order,orderSign,algo,nil
}
func hexStringToBytes(s string) []byte {
bs := make([]byte, 0)
for i := 0; i < len(s); i = i + 2 {
b, _ := strconv.ParseInt(s[i:i+2], 16, 16)
bs = append(bs, byte(b))
}
return bs
}
\ No newline at end of file
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