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 19f83f0..80d5911 100644 Binary files a/Ylt/gw-charge/target/gw-charge.zip and b/Ylt/gw-charge/target/gw-charge.jar differ diff --git a/Ylt/gw-charge/target/gw-charge.jar.original b/Ylt/gw-charge/target/gw-charge.jar.original index 3315d34..6b08e47 100644 Binary files a/Ylt/gw-charge/target/gw-charge.jar.original and b/Ylt/gw-charge/target/gw-charge.jar.original differ 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 ``` + + +####