Commit Graph

26 Commits

Author SHA1 Message Date
jiangbuyun
ec78aa82b9 解决打包过程中类冲突问题 2021-06-15 09:12:00 +08:00
jiangbuyun
cca799ed8d 添加接收来自操作系统正常关闭的指令处理,保证系统正常关闭。 2021-05-20 16:46:50 +08:00
jiangbuyun
ceebdca9b5 在直接读区块文件的测试类中增加json的转换测试。 2021-03-23 18:09:43 +08:00
brightestboy
254ffdfffa update: 升级Swagger-UI,且升级接口描述至oas3.0
1. 目前使用的注解动态生成的方式(动态生成的swagger.json在/api-docs/swagger.json)
2. 如果不使用动态的方式,那么在resources/swagger/index.html中可以配置静态swagger.json(url: "/swagger/api-docs/swagger.json)
2021-01-26 09:28:58 +08:00
brightestboy
b8d8f99e2c assembly时,标识mainClass 2020-11-17 17:22:25 +08:00
brightestboy
9606b3bb5a fix #I24SG1 2020-11-12 14:22:06 +08:00
brightestboy
5fc203b180 修改build.sbt中的版本号为1.1.0 2020-11-01 17:46:08 +08:00
brightestboy
cd6415da3b 补充打包合并策略,避免assembly时出现文件冲突 2020-09-02 10:08:59 +08:00
wuwei1972
98b7bb4f33 jdk13,tls1.3,akka2.6.1,传输方式可在artery/classic之间进行切换 2020-01-03 09:39:47 +08:00
brightestboy
8d38872af9 提升JDK及项目所依赖的包,Jdk13,scala2.13+,及相关依赖 2019-12-20 09:48:33 +08:00
brightestboy
eeb63daae2 打包时冲突->更改合并策略 2019-05-09 09:04:54 +08:00
c4w
84702fbd42 remove SandboxJS
rename api reqs directory
2019-04-23 13:47:24 +08:00
c4w
75c61f4358 linter checking 2019-04-23 10:34:42 +08:00
c4w
39ea2abe18 增加CODE_SCALA_PARALLEL
引入linter和scapegoat
2019-04-22 13:24:07 +08:00
c4w
ac95ee3435 clear sbt warnings 2019-04-19 21:12:57 +08:00
c4w
b4c1925f7c compile pass 2019-04-19 09:27:13 +08:00
c4w
acccb55b24 step1 replace with new version 2019-04-18 21:31:41 +08:00
c4w
b9f1f46aff scala & akka 2019-04-18 16:38:28 +08:00
c4w
1c498a3bf0 add wartremover 2019-04-17 22:41:45 +08:00
c4w
0bc2fdb5d0 add linter 2019-04-17 21:51:06 +08:00
c4w
647594661c upgrade sbt for scapegoat 2019-04-17 21:38:22 +08:00
c4w
76f3627fe6 采用kryo序列化,与原来的json相比,体积持平,性能提升了将近3倍 2019-03-22 01:28:58 +08:00
brightestboy
286a8b593a 整理接口,去掉无用的接口,并调整返回值,升级与http相关的部分包(swagger-akka-http,swagger-jaxrs,akka-http) 2019-03-19 20:29:12 +08:00
brightestboy
3235d348fc Merge branch 'dev_wuwei1972' into dev_supply
# Conflicts:
#	build.sbt
#	conf/system.conf
#	scripts/example_deploy.js
#	src/main/scala/ContractAssetsTPL.scala
#	src/main/scala/Contractback.txt
#	src/main/scala/NewContract.scala
#	src/main/scala/rep/api/SwaggerDocService.scala
#	src/main/scala/rep/api/rest/RestActor.scala
#	src/main/scala/rep/api/rest/RestService.scala
#	src/main/scala/rep/app/conf/SystemProfile.scala
#	src/main/scala/rep/crypto/ECDSASign.scala
#	src/main/scala/rep/crypto/Sha256.scala
#	src/main/scala/rep/crypto/SignFunc.scala
#	src/main/scala/rep/log/EventActor.scala
#	src/main/scala/rep/network/PeerHelper.scala
#	src/main/scala/rep/network/cache/TransactionPool.scala
#	src/main/scala/rep/network/consensus/block/BlockHelper.scala
#	src/main/scala/rep/network/consensus/block/BlockModule.scala
#	src/main/scala/rep/network/consensus/endorse/EndorsementModule.scala
#	src/main/scala/rep/network/consensus/vote/CRFDVoter.scala
#	src/main/scala/rep/network/consensus/vote/CRFDVoterModule.scala
#	src/main/scala/rep/network/consensus/vote/VoterBase.scala
#	src/main/scala/rep/network/tools/PeerExtension.scala
#	src/main/scala/rep/sc/Sandbox.scala
#	src/main/scala/rep/sc/Shim.scala
#	src/main/scala/rep/sc/contract/Compiler.scala
#	src/main/scala/rep/sc/scalax/SandboxScala.scala
#	src/main/scala/rep/storage/cfg/StoreConfig.java
#	src/main/scala/rep/storage/test/testmap.scala
#	src/main/scala/rep/storage/util/pathUtil.java
#	src/main/scala/rep/utils/SerializeUtils.scala
#	src/test/scala/rep/sc/SandboxSpec.scala
2018-07-27 14:58:41 +08:00
brightestboy
7e99ff7b83 commit dev_supply 2018-07-11 22:21:39 +08:00
wuwei1972
76c4199fc4 commit message 2018-07-11 17:36:52 +08:00