From 9c77281b5b5cfe56cc69a24d904eb4b68a63116e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 14 Aug 2024 09:39:18 +0800 Subject: [PATCH] 'commit' --- .../src/main/resources/bootstrap-dev.yml | 2 +- .../target/{gw-charge.zip => gw-charge.jar} | Bin 39554160 -> 39554160 bytes Ylt/gw-charge/target/gw-charge.jar.original | Bin 618138 -> 618138 bytes ZhuQue/pom.xml | 15 ++++----- .../ZhuQue/Ylt/Controller/YltController.java | 2 +- 操作文档/12、JAR包操作.md | 31 +++++++++++++++--- 6 files changed, 35 insertions(+), 15 deletions(-) rename Ylt/gw-charge/target/{gw-charge.zip => gw-charge.jar} (99%) diff --git a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml index 759d8d4..1e4be4a 100644 --- a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml +++ b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml @@ -112,7 +112,7 @@ zuul: ZhuQue: ribbon: - listOfServers: http://10.10.21.21:8888 + listOfServers: http://10.10.21.20:8888 # 用户模块 # D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\rpc\web\UserRpcApiController.java diff --git a/Ylt/gw-charge/target/gw-charge.zip b/Ylt/gw-charge/target/gw-charge.jar similarity index 99% rename from Ylt/gw-charge/target/gw-charge.zip rename to Ylt/gw-charge/target/gw-charge.jar index 19f83f0d48063b106fd6e540b7ffe55f583f1514..80d5911b7aed59d75471401168b07261f41b0219 100644 GIT binary patch delta 4762 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 diff --git a/Ylt/gw-charge/target/gw-charge.jar.original b/Ylt/gw-charge/target/gw-charge.jar.original index 3315d348280555b30469f87bbb87c1cdf5235fbc..6b08e47a1254953da9f0657b2813f38807a200cc 100644 GIT binary patch delta 704 zcmXYuO-vI(7>0Lewq-xD5N?JZ2tsYt8WLHHMGPqNqkFJQL#a}`+lA6{p@|1gIQVzq zf{Cz)Nx12OGszkoO$;W+JJE{=NsPuAO}uy(;>^2y`0_mS^L{fsyS1O%+D|3&HaCuF znyG2qcE?7dpDS1o_|*Nx#;YFSb4p=T&nWl<`T*$a*@!8BSMP#<($9hI>^wNhhQNo+ z;)62VV#mQRECaUlLGThE0#|t!e92F$d-z}ZDKKG-DF%6?oKy{iot_yEiTBMLkj3=3 zqmXOXF&55bGrU7?F6~~v_l7e~`)l~kba(JNmku|4zt9$D|BNyTvnSbvsEY( zGu4NPQiUwYvkHx>xcFEhysI!A!Xt_iheoip>O_0qIy8wHDM``m(rJvYyEFk2E=@zu zcyj%~CHygwsnQkotm1B!&O&7CqSS;&hTl^};TDnsrp(M?FO6fJeuX$~{Xb@Cv4b#ftABkJ?C R5pDj}pc`tbb#a->#($Kq$!`Dv delta 704 zcmXYu%}*0S7>9Rfw(Y(^CA|@PAc(b5Ye;k{7BS!li1uKWhFYa|w+p4k5Swt|z(LW2 z7fpmcOu|k70+Tg1nix!sccK>$k{Agwka+Q|#F^jj;mz~R$M2ol+0C8Q=1wYJ$aAAZ z(@afE-0xbCAL9zvL!MZQt-tL9zNHj4^o)Wxs1JgUo(-Auw)6!2t3CvFvUA`h8wMXS zi|aDmW=FyAECY7(v*1NO46gDl_=cZQ_wau3lVIE!SM&=;C8-+vuluGsBswr_K<3jw zyCB!C9u~}GGyI6$T;960@}4tI`(t>mbg%y|mku`Uo{t6D-(#%^BKE{fhRDqEy*r08 z@;Txq270|#-V_g-)a{Q?nZddF{No_9U092%?2}^YX|bfsVzRg_LsmpqR8~xu*)Eod znd(DCxk?t~MU}=>Tzsh#-c=Yj;St5CO`}*^wZlChY?{Q3l%(i)=oCgb9GZX#ho&H> zUAg|xA^b6ssnHentYW!FXCSh5QhcgWKSsZ5bQvOJS0U)X;mZCh_R*yrF8kM|5lC*1 z3QF3~=IE}DBM;_j7ILjlGmuwxDnkzIRDs-Epj!}sAzbQi&~3~tHpqo+H^_ll&9Kk& RX1IC3NjKF}`@$ksjQ^bQwBrB( diff --git a/ZhuQue/pom.xml b/ZhuQue/pom.xml index c881aa4..464c0fb 100644 --- a/ZhuQue/pom.xml +++ b/ZhuQue/pom.xml @@ -188,17 +188,16 @@ slf4j-simple 1.7.36 - + + + com.fasterxml.jackson.core + jackson-core + 2.17.2 + com.fasterxml.jackson.core jackson-databind - 2.15.3 - - - com.fasterxml.jackson.core - jackson-core - - + 2.17.2 diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java index 8ba7b7f..72eb039 100644 --- a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java @@ -28,7 +28,7 @@ public class YltController extends Controller { * * @param order_no */ - @Before({GET.class}) + @Before({POST.class}) @IsLoginInterface({}) public void isThirdPartyStation(String order_no) { Record record = ym.getThirdPartyStation(order_no); diff --git a/操作文档/12、JAR包操作.md b/操作文档/12、JAR包操作.md index ce3baa7..02ded98 100644 --- a/操作文档/12、JAR包操作.md +++ b/操作文档/12、JAR包操作.md @@ -4,11 +4,10 @@ yum install java-1.8.0-openjdk-devel ``` -#### 2、列出$jar$包里面的所有文件及文件夹 +#### 2、将文件复制到容器外 -```shell -cd /usr/local/mini/gw-charge/target -jar tf gw-charge.jar +``` +docker cp 83bbd9bd5d80:/root/gw-charge.jar ./ ``` #### 3、解压$JAR$包 @@ -16,6 +15,8 @@ jar tf gw-charge.jar ```shell # 解压 jar 到gw-charge目录下 unzip gw-charge.jar -d gw-charge +# 删除旧的jar包 +rm -rf gw-charge.jar ``` #### 4、修改配置文件或添加$class$ @@ -27,6 +28,26 @@ unzip gw-charge.jar -d gw-charge #### 5、打包$JAR$ ```shell -jar cvfM0 gw-charge.jar ./gw-charge/* +cd gw-charge +jar -cvfM0 ../gw-charge.jar ./ +# 删除用完的目录 +rm -rf gw-charge +``` + +#### 6、将文件复制回容器 + +``` +docker cp ./gw-charge.jar 83bbd9bd5d80:/root/gw-charge.jar +``` + + + +#### 7、重新启动 $Docker$容器 + +```shell +docker restart 83bbd9bd5d80 ``` + + +####