From 72cdaf88b358d8dc83a191191d72d17b16e29d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 23 Dec 2022 13:50:13 +0800 Subject: [PATCH] update seata 1.6.0 => 1.6.1 --- ... => apm-seata-skywalking-plugin-1.6.1.jar} | Bin 19388 -> 19392 bytes pom.xml | 2 +- ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 2 +- .../DataBaseTransactionStoreManager.java | 4 ++-- .../storage/redis/JedisPooledFactory.java | 17 +++++++---------- .../store/RedisTransactionStoreManager.java | 3 ++- 6 files changed, 13 insertions(+), 15 deletions(-) rename docker/skywalking/agent/plugins/{apm-seata-skywalking-plugin-1.6.0.jar => apm-seata-skywalking-plugin-1.6.1.jar} (73%) diff --git a/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.0.jar b/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.1.jar similarity index 73% rename from docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.0.jar rename to docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.1.jar index 9b64f6c3317166d20a5a07a81be9fb0338434813..d5e6a4b4fb898486e6f41645c2e77cd607dd204a 100644 GIT binary patch delta 1894 zcmaJ=2~ZPP7=F8nn-IB_V9=#RK}drraX<_ZBq0e9Qfbg4EvOhNEmS;Epon;&R>5kO zK59f-tVL}Hhj^qyJ5cLjg{p|u1FVQ6^_o@?ov9)orElLNlch6#Gdu5}Z@=%q=6ekm z;*^DOG8uV%F%Sxcpef5z>J-Lft~lBH^P)`(v95pP;4bM88lSkc*52xkrs|yE7PKAa zr#VhYdHJIH;NNCRSL+Jrppv%ZzuasbU%#++uiL%?>#B_HjnoPEJkcaLZ<4GrxUK3a z`MjXPA<4I!^xsVS^S|wNZDLR%lKFj=2D9TSVStIQ>*~` zi#_oVgLn%2!yuk-yX>)>htVw0@oZ2mHL*db_j9&~YrgR;BA3_l{!`kB2jCe3Y_p~w zqL^H;SgL@92DwcgJU9v`j|!u3Dri)xFk_oakMBz=GbV&YsEPH{Q(POQ6>|T9pZAyo z9xG2-ZXBH#+}ggFUnN|3Y3g;Q_xHWJr3ryO&NW}H;lDkl=({Bk7Av~?TQ~b%OYio* z7W>6Bt&j5D4gSn;%I0nph2?f`&n&6REEVm`E=^Wg9cNa0Qx8K!26~cq&g(uCE|zSv zc2#d_|MsV@hcZb}@Tv8Ox7NQnQt{%7g$gyjCrV2>*4t3Id#2)v;oRBAD(h{V!_&Ui zHFVpZ>}G}O)0K~6%V241VZ|7wF+pPTtX-Fqx!~%J)bi|cV?AAu_(h~%X{pIAQ~GZ#let|JVA#s?~>=DJzU8PDel9>`<&YbbCp4 z#u?wF_RD)DX+H*#qbF+f|D1OFh%7j5Uy_sXv(%G+1TyaXDA6mACIRptW$!*_`*o4K zeeT>PktYShzJaA#G01BM^qGtVDF(w&5Ux-w9T+!aAH!qnQ0%~7H9c+ya&+c$RE8_? z($LBb_SdR(bB=i=0Xq`4gpbqE&0hOqwuW{1E)7lIB%p?z5HKP?M=s^a{YWI3^uGc> zjv$wW-J&;PMwH`3=BdOdmgnt9od@v%h~p5?GekLb;rYN@QI6P?eNi-dhd%^MVB{#u z#lBN!#bzx{eoPHfTw$GdELOH4xJQ8CK1e_5h8}c9Xht^ zmpYo9=E95#uj@jvmZ861CwIL2ZkWit>UZ_*i2WA#tyVOi-)I2la0*3;hshhn0r0ID zRW1;!%C=fpZ_ij(0E3gT$8Nd>!AA@D*RyMOx!9L~w^ aAAyO1MmOB5{Tq(r5UtQ`Or+A)4EQe#BunrB delta 1701 zcmX>wopH}}M&1B#W)=|!4h{~6UjdUR@>(&2C@=N;vs_IMBCX$>-W%u_xT;T@6}!z# zKxwJ#ZpVBhi@xT**8KY!F7~@P-o29B*Iz8O?ue*0b9#>TMGZHm^W}4$*Q#Dy!DIf7 zbEbiiWJwz$Y0a+Gkx|*>r?ouu4SnzvU82iUbX5- zEVNrHaN~BGU0~|JS*#DAhJUHw@5xmdcrZhvIyWZ$eiR3H2b-HvowMtsyPY!gADmh& zH`l!WeU!vs)6=DL0p9E!E)iZ_TNxM_QW+T-Q2aL8iO~S$xyhxBW?*_9BiOT(Uo*Ob z`Nm8>VET)&!DK!c_Q^Y$WI+7QH<-kjz>JS96Bxma7PcY?<0t!dh}31SR2Hz5HUBm+ zWAYc_V6cFfh&DvPOC)CV6^UugV9{I|NeH7;J^;eFqx1`6)J;`Ch=`WvHVEUf4ih^_ z*W^xlgUJn^nwuR>{0&`mj#`=q;clytYO#Kt@ zqcN>Q=7D!!gtkwB(3J>pllB*6{w_1S=G$ub)gKm7ZyKPwfnBWURp*&IDdKl_jvQ~EA@Gc7HkqZwk_#)rLAs$!mG(sCbzoB9#0p3 zbN_Rc`GS*=`w|z3J$*1yLtT09Pc!9$X^Zq0SmgZOc4^nDo%@X*>!?^L#Q9e3TQM{G zwML>)<<>S&{-h|)AHu(9CmOZK-tGH+$~JRJo5?}pA15c2|9Af!cDKN6dRF^mPGM(( zM4#i=LoRlCuUoU+Q2$s_B#W3s+lNcB$Kw4nj@hl35|G(nb2J{5c-+5*=u0p$Fle!& zC!XE*)07`PWdbHCc8(j9*XOzelb9zE2Y53wi7>!3(Bu*a3r=8Eg@Tje~C)+tnfVD?DO4}@eXfIApEJ@T)EXc)ckOYcB zcPDRfR0kV$%Tbz1m1*)sCdJ7TPCN=Ahk{hX>{mn4RsvF}F*(PH2duZ+Nt)>tMCgE% z0a))%&nNtfKzHc^4RArx`&=VC^{H_wE@3g^nO zPmXbg7@O@X&154271o|?pvEydz#Ss>8Yq<|0hbDK69LF9Q`eoP5g-qWUFJ zxLO_}?5>DnP`tY|(>W!mlrh+iSNc;rt^z~s5jz8eA4))+Rs}2U^-xDK!{0-iNk$VY z1xZjRfkIbxz(VYv7GPr?Ke2c{1*Y2`VFm^d6k~50gB3P-nt~(3cay{4W57soW@caz zMNw!v`HH6s*rUHar5Wuei+jmogeq#%sb!sv1rjm?r7y5;$XUu7 l#Wu~!f4sanKuH6Xp(guzi!rUT2kNz&yue$EEztp_7y$9hKN 1.8.6 - 1.6.0 + 1.6.1 2.2.0 3.1.3 diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 53e9feaf..33c30379 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -16,7 +16,7 @@ 2021.0.4.0 1.8.6 - 1.6.0 + 1.6.1 2.2.0 3.1.3 1.0.11 diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java index 421a21f6..e6eb83e6 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java +++ b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java @@ -38,7 +38,7 @@ import javax.sql.DataSource; import java.util.*; import java.util.stream.Collectors; -import static io.seata.core.constants.RedisKeyConstants.DEFAULT_LOG_QUERY_LIMIT; +import static io.seata.common.DefaultValues.DEFAULT_QUERY_LIMIT; /** * The type Database transaction store manager. @@ -83,7 +83,7 @@ public class DataBaseTransactionStoreManager extends AbstractTransactionStoreMan * Instantiates a new Database transaction store manager. */ private DataBaseTransactionStoreManager() { - logQueryLimit = CONFIG.getInt(ConfigurationKeys.STORE_DB_LOG_QUERY_LIMIT, DEFAULT_LOG_QUERY_LIMIT); + logQueryLimit = CONFIG.getInt(ConfigurationKeys.STORE_DB_LOG_QUERY_LIMIT, DEFAULT_QUERY_LIMIT); String datasourceType = CONFIG.getConfig(ConfigurationKeys.STORE_DB_DATASOURCE_TYPE); //init dataSource DataSource logStoreDataSource = EnhancedServiceLoader.load(DataSourceProvider.class, datasourceType).provide(); diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java index b0f6c61c..6c32b7e9 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java +++ b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java @@ -29,6 +29,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import static io.seata.common.DefaultValues.*; + /** * @author funkye */ @@ -43,13 +45,6 @@ public class JedisPooledFactory { private static final String HOST = "127.0.0.1"; private static final int PORT = 6379; - - private static final int MINCONN = 1; - - private static final int MAXCONN = 10; - - private static final int MAXTOTAL = 100; - private static final int DATABASE = 0; private static final int SENTINEL_HOST_NUMBER = 3; @@ -83,9 +78,11 @@ public class JedisPooledFactory { } } JedisPoolConfig poolConfig = new JedisPoolConfig(); - poolConfig.setMinIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MIN_CONN, MINCONN)); - poolConfig.setMaxIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_CONN, MAXCONN)); - poolConfig.setMaxTotal(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_TOTAL, MAXTOTAL)); + poolConfig.setMinIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MIN_CONN, + DEFAULT_REDIS_MIN_IDLE)); + poolConfig.setMaxIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_CONN, + DEFAULT_REDIS_MAX_IDLE)); + poolConfig.setMaxTotal(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_TOTAL, DEFAULT_REDIS_MAX_TOTAL)); String mode = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_MODE,ConfigurationKeys.REDIS_SINGLE_MODE); if (mode.equals(ConfigurationKeys.REDIS_SENTINEL_MODE)) { String masterName = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_MASTERNAME); diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java index d680c462..573d120e 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java +++ b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java @@ -47,6 +47,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import static io.seata.common.ConfigurationKeys.STORE_REDIS_QUERY_LIMIT; +import static io.seata.common.DefaultValues.DEFAULT_QUERY_LIMIT; import static io.seata.core.constants.RedisKeyConstants.*; /** @@ -110,7 +111,7 @@ public class RedisTransactionStoreManager extends AbstractTransactionStoreManage super(); initGlobalMap(); initBranchMap(); - logQueryLimit = CONFIG.getInt(STORE_REDIS_QUERY_LIMIT, DEFAULT_LOG_QUERY_LIMIT); + logQueryLimit = CONFIG.getInt(STORE_REDIS_QUERY_LIMIT, DEFAULT_QUERY_LIMIT); } /**