xiongzhu 4 年之前
父节点
当前提交
0f10ede691

+ 6 - 14
install-jar.sh

@@ -1,16 +1,8 @@
 
-mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file \
--DgroupId=org.libjpegturbo \
--DartifactId=mozjpeg4j \
--Dpackaging=jar \
--Dversion=1.1 \
--Dfile=lib/mozjpeg4j-1.1.jar \
--DlocalRepositoryPath=libs
+mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DgroupId=org.libjpegturbo -DartifactId=mozjpeg4j -Dpackaging=jar -Dversion=1.1 -Dfile=lib/mozjpeg4j-1.1.jar -DlocalRepositoryPath=libs
 
-mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file \
--DgroupId=org.pngquant \
--DartifactId=pngquant4j \
--Dpackaging=jar \
--Dversion=1.0 \
--Dfile=lib/pngquant4j-1.0.jar \
--DlocalRepositoryPath=libs
+mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DgroupId=org.pngquant -DartifactId=pngquant4j -Dpackaging=jar -Dversion=1.0 -Dfile=lib/pngquant4j-1.0.jar -DlocalRepositoryPath=libs
+
+mvn install:install-file -DgroupId=com.antfinancial.baas -DartifactId=mychain-rest-lib -Dpackaging=jar -Dversion=0.10.2.11 -Dfile=lib/mychain-rest-client-0.10.2.11-with-dependencies.jar
+
+mvn install:install-file -DgroupId=com.alipay.mychainx -DartifactId=mychainx-sdk -Dpackaging=jar -Dversion=0.10.2.9 -Dfile=lib/mychainx-java-sdk-0.10.2.9-with-dependencies.jar

二进制
lib/mychain-rest-client-0.10.2.11-with-dependencies.jar


二进制
lib/mychainx-java-sdk-0.10.2.9-with-dependencies.jar


+ 1 - 1
libs/org/libjpegturbo/mozjpeg4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.1</version>
     </versions>
-    <lastUpdated>20210319095742</lastUpdated>
+    <lastUpdated>20211009073913</lastUpdated>
   </versioning>
 </metadata>

+ 1 - 1
libs/org/pngquant/pngquant4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0</version>
     </versions>
-    <lastUpdated>20210319095744</lastUpdated>
+    <lastUpdated>20211009073915</lastUpdated>
   </versioning>
 </metadata>

+ 30 - 0
pom.xml

@@ -286,6 +286,36 @@
             <artifactId>pngquant4j</artifactId>
             <version>1.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.antfinancial.baas</groupId>
+            <artifactId>mychain-rest-lib</artifactId>
+            <version>0.10.2.11</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alipay.mychainx</groupId>
+            <artifactId>mychainx-sdk</artifactId>
+            <version>0.10.2.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.29.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <version>2.0.17.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
+        </dependency>
     </dependencies>
 
 </project>

+ 53 - 0
src/main/java/com/izouma/nineth/domain/Asset.java

@@ -0,0 +1,53 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.enums.AssetStatus;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Asset extends BaseEntity {
+
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    @ApiModelProperty("订单ID")
+    private Long orderId;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("铸造者")
+    private String minter;
+
+    private String pic;
+
+    private String tokenId;
+
+    private String transactionId;
+
+    private String ipfsUrl;
+
+    private BigDecimal price;
+
+    private BigDecimal sellPrice;
+
+    private String outTransactionId;
+
+    private Long outOrderId;
+
+    @Enumerated(EnumType.STRING)
+    private AssetStatus status;
+}

+ 66 - 0
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -0,0 +1,66 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.converter.StringArrayConverter;
+import com.izouma.nineth.enums.CollectionType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("藏品")
+public class Collection extends BaseEntity {
+
+    @ApiModelProperty("名称")
+    @Searchable
+    private String name;
+
+    @ApiModelProperty("图片")
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> pics;
+
+    @ApiModelProperty("铸造者")
+    private String minter;
+
+    @ApiModelProperty("铸造者ID")
+    private Long minterId;
+
+    @ApiModelProperty("铸造者ID")
+    private Long minterAvatar;
+
+    @ApiModelProperty("详情")
+    @Column(columnDefinition = "TEXT")
+    private String detail;
+
+    @ApiModelProperty("类型")
+    @Enumerated(EnumType.STRING)
+    private CollectionType type;
+
+    @ApiModelProperty("已售")
+    private int sale;
+
+    @ApiModelProperty("库存")
+    private int stock;
+
+    @ApiModelProperty("点赞")
+    private int like;
+
+    @ApiModelProperty("上架")
+    private boolean onShelf;
+
+    @ApiModelProperty("价格")
+    @Column(precision = 10, scale = 2)
+    private BigDecimal price;
+}

+ 41 - 0
src/main/java/com/izouma/nineth/domain/Order.java

@@ -0,0 +1,41 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.enums.OrderStatus;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Data
+@Entity
+@Table(name = "order_info")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("订单")
+public class Order extends BaseEntity {
+
+    private Long userId;
+
+    private Long collectionId;
+
+    private String name;
+
+    private String pic;
+
+    private String minter;
+
+    private BigDecimal price;
+
+    @Enumerated(EnumType.STRING)
+    private OrderStatus status;
+
+
+}

+ 16 - 0
src/main/java/com/izouma/nineth/enums/AssetStatus.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.enums;
+
+public enum AssetStatus {
+    VALID("正常"),
+    TRANSFERRED("已转让"),;
+
+    private final String description;
+
+    AssetStatus(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 1 - 0
src/main/java/com/izouma/nineth/enums/AuthorityName.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.enums;
 
 public enum AuthorityName {
     ROLE_USER("普通用户"),
+    ROLE_AUTHOR("铸造者"),
     ROLE_DEV("开发者"),
     ROLE_ADMIN("管理员");
     private final String description;

+ 17 - 0
src/main/java/com/izouma/nineth/enums/CollectionType.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.enums;
+
+public enum CollectionType {
+    DEFAULT("默认"),
+    BLIND_BOX("盲盒"),
+    AUCTION("拍卖");
+
+    private final String description;
+
+    CollectionType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 17 - 0
src/main/java/com/izouma/nineth/enums/OrderStatus.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.enums;
+
+public enum OrderStatus {
+    NOT_PAID("未支付"),
+    FINISH("已完成"),
+    CANCELLED("已取消");
+
+    private final String description;
+
+    OrderStatus(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 95 - 81
src/main/resources/application.yaml

@@ -1,96 +1,110 @@
 server:
-    port: 8080
-    servlet:
-        context_path: /
-    compression:
-        enabled: true
-        mime-types: application/json,application/xml,text/html,text/xml,text/plain
-    error:
-        whitelabel:
-            enabled: false
+  port: 8080
+  servlet:
+    context_path: /
+  compression:
+    enabled: true
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+  error:
+    whitelabel:
+      enabled: false
 spring:
-    profiles:
-        active: dev
-    datasource:
-        url: jdbc:mysql://mysql.izouma.com/nineth_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-        username: nineth
-        password: g2k#b4YW47$55Sew
-        hikari:
-            minimum-idle: 5
-            maximum-pool-size: 30
-            auto-commit: true
-            idle-timeout: 30000
-            max-lifetime: 1800000
-            connection-timeout: 30000
-            connection-test-query: SELECT 1
-    jpa:
-        database: MySQL
-        database_platform: org.hibernate.dialect.MySQL5InnoDBDialect
-        hibernate:
-            ddl_auto: update
-        properties:
-            hibernate:
-                enable_lazy_load_no_trans: true
-    redis:
-        host: 127.0.0.1
-        port: 6379
-        lettuce:
-            pool:
-                max_active: 8
-                max_idle: 8
-                min_idle: 0
-    servlet:
-        multipart:
-            max_file_size: 100MB
-            max_request_size: 100MB
-    freemarker:
-        settings:
-            number_format: 0
-    cache:
-        type: caffeine
+  profiles:
+    active: dev
+  datasource:
+    url: jdbc:mysql://mysql.izouma.com/nineth_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    username: nineth
+    password: g2k#b4YW47$55Sew
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 30
+      auto-commit: true
+      idle-timeout: 30000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+  jpa:
+    database: MySQL
+    database_platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    hibernate:
+      ddl_auto: update
+    properties:
+      hibernate:
+        enable_lazy_load_no_trans: true
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    lettuce:
+      pool:
+        max_active: 8
+        max_idle: 8
+        min_idle: 0
+  servlet:
+    multipart:
+      max_file_size: 100MB
+      max_request_size: 100MB
+  freemarker:
+    settings:
+      number_format: 0
+  cache:
+    type: caffeine
 jwt:
-    secret: XvAD0kboD76Dpebm
-    header: Authorization
-    expiration: 2592000 #30days
+  secret: XvAD0kboD76Dpebm
+  header: Authorization
+  expiration: 2592000 #30days
 wx:
-    mp:
-        app_id: wx2375cba2eec2c479
-        app_secret: 28e4829124860d9ef9e2f32aeefd1111
-    ma:
-        app_id: wx6517cbf58115c508
-        app_secret: 8af0e8ba28ffddfb7e574e6c7cb6aaf1
-        msg_token: msgToken
-        msg_aes_key: aesKey
-        msg_format: JSON
-    pay:
-        appId: wx2375cba2eec2c479
-        mchId: 1529090291
-        mchKey: uDusnGcUqYyWqsBdmvuioxDhtgZErwtu
-        subAppId: #服务商模式下的子商户公众账号ID
-        subMchId: #服务商模式下的子商户号
-        keyPath: classpath:/cert/apiclient_cert.p12
-        notifyUrl: http://zmj.izouma.com/wx/payNotify
-        refundNotifyUrl: http://zmj.izouma.com/wx/refundNotify
+  mp:
+    app_id: wx2375cba2eec2c479
+    app_secret: 28e4829124860d9ef9e2f32aeefd1111
+  ma:
+    app_id: wx6517cbf58115c508
+    app_secret: 8af0e8ba28ffddfb7e574e6c7cb6aaf1
+    msg_token: msgToken
+    msg_aes_key: aesKey
+    msg_format: JSON
+  pay:
+    appId: wx2375cba2eec2c479
+    mchId: 1529090291
+    mchKey: uDusnGcUqYyWqsBdmvuioxDhtgZErwtu
+    subAppId: #服务商模式下的子商户公众账号ID
+    subMchId: #服务商模式下的子商户号
+    keyPath: classpath:/cert/apiclient_cert.p12
+    notifyUrl: http://zmj.izouma.com/wx/payNotify
+    refundNotifyUrl: http://zmj.izouma.com/wx/refundNotify
 storage:
-    provider: aliyun
-    local_path: /var/www/upload/
+  provider: aliyun
+  local_path: /var/www/upload/
 aliyun:
-    access-key-id: PXzJyah5rZfWHIIH
-    access-key-secret: e1MS6j0wypXJrw8CM0hObZu8qKbfah
-    oss-end-point: oss-cn-hangzhou.aliyuncs.com
-    oss-bucket-name: ticket-exchange
-    oss-domain: https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com
+  access-key-id: PXzJyah5rZfWHIIH
+  access-key-secret: e1MS6j0wypXJrw8CM0hObZu8qKbfah
+  oss-end-point: oss-cn-hangzhou.aliyuncs.com
+  oss-bucket-name: ticket-exchange
+  oss-domain: https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com
 general:
-    host: http://art.izouma.com
+  host: http://art.izouma.com
+mychain:
+  rest:
+    bizid: a00e36c5
+    cipher-suit: ec
+    rest-url: https://rest.baas.alipay.com
+    access-id: LTAI5tPNjgdVFZfCndmTCVmN
+    access-secret: e6e6vQJYhGmIkcA1pfnsipTovp10wJ
+    default-account:
+    default-account-key:
+    default-account-pwd:
+    tenantid: PJCIVRRI
+    read-file-from-ext: false
+    account: 9th_test
+    kmsId: pf08UBzfPJCIVRRI1632647899655
 ---
 
 spring:
-    profiles: test
+  profiles: test
 
 ---
 
 spring:
-    profiles: prod
-    datasource:
-        url: jdbc:mysql://mysql.izouma.com/nineth?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+  profiles: prod
+  datasource:
+    url: jdbc:mysql://mysql.izouma.com/nineth?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 

文件差异内容过多而无法显示
+ 14 - 509
src/main/vue/yarn.lock


+ 17 - 0
src/test/java/com/izouma/nineth/AntChainTest.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth;
+
+import com.antfinancial.mychain.baas.tool.restclient.RestClient;
+import com.antfinancial.mychain.baas.tool.restclient.model.Method;
+import com.antfinancial.mychain.baas.tool.restclient.response.BaseResp;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class AntChainTest extends ApplicationTests {
+    @Autowired
+    private RestClient restClient;
+
+    @Test
+    public void testQuery() throws Exception {
+        BaseResp baseResp = restClient.chainCall("9df6dffdc211e437986cb42a3b6e600bc37e6fdedfea592812e7b7bb5ccf925b", "", "", Method.QUERYRECEIPT);
+    }
+}

部分文件因为文件数量过多而无法显示