diff --git a/.beagle.yml b/.beagle.yml index dd94f1669eba025e9c2f25ff9676cc86b0d78a85..f2f1eff3aa2d17640120ced7b36e91002a8a8b9c 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -27,31 +27,9 @@ steps: secret_key: from_secret: SECRET_KEY_MINIO - - name: deploy-tongweb-jars - image: hub.wodcloud.com/zjk/tongweb-jars:7.0.E.6_P7 - volumes: - - name: tongweb-jars - path: /tongweb/jars - - - name: install-tongweb-jars-to-local-repo - image: hub.wodcloud.com/base/devops-maven:3.8-openjdk-17 - volumes: - - name: tongweb-jars - path: /tongweb/jars - - name: maven-repo - path: /root/.m2/repository - commands: - - mvn install:install-file -DgroupId=com.tongweb -DartifactId=tongweb-embed-core -Dversion=7.0.E.6_P7 -Dpackaging=jar -Dfile=/tongweb/jars/tongweb-embed-core-7.0.E.6_P7.jar - - mvn install:install-file -DgroupId=com.tongweb -DartifactId=tongweb-embed-websocket -Dversion=7.0.E.6_P7 -Dpackaging=jar -Dfile=/tongweb/jars/tongweb-embed-websocket-7.0.E.6_P7.jar - - mvn install:install-file -DgroupId=com.tongweb -DartifactId=tongweb-spring-boot-starter-3.x -Dversion=7.0.E.6_P7 -Dpackaging=jar -Dfile=/tongweb/jars/tongweb-spring-boot-starter-3.x-7.0.E.6_P7.jar - - mvn install:install-file -DgroupId=com.tongweb -DartifactId=tongweb-spring-boot-websocket-3.x -Dversion=7.0.E.6_P7 -Dpackaging=jar -Dfile=/tongweb/jars/tongweb-spring-boot-websocket-3.x-7.0.E.6_P7.jar - - mvn install:install-file -DgroupId=com.tongweb -DartifactId=tongweb-lic-sdk -Dversion=4.5.0.0 -Dpackaging=jar -Dfile=/tongweb/jars/tongweb-lic-sdk-4.5.0.0.jar - name: build image: hub.wodcloud.com/base/devops-maven:3.8-openjdk-17 - volumes: - - name: maven-repo - path: /root/.m2/repository commands: - mvn clean install -Dmaven.test.skip=true diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml index 8764e6db2391178fcdc477909fc33b92ea2e7ffa..028db8e1b5b1a51e233081fa379f5f024c8d6d71 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/ruoyi-common/ruoyi-common-web/pom.xml @@ -58,26 +58,36 @@ com.tongweb.springboot tongweb-spring-boot-starter-3.x ${tw.starter.version} + system + ${basedir}/libs/tongweb-spring-boot-starter-3.x-7.0.E.6_P7.jar com.tongweb.springboot tongweb-spring-boot-websocket-3.x ${tw.starter.version} + system + ${basedir}/libs/tongweb-spring-boot-websocket-3.x-7.0.E.6_P7.jar com.tongweb tongweb-lic-sdk 4.5.0.0 + system + ${basedir}/libs/tongweb-lic-sdk-4.5.0.0.jar com.tongweb tongweb-embed-core ${tw.starter.version} + system + ${basedir}/libs/tongweb-embed-core-3.x-7.0.E.6_P7.jar com.tongweb tongweb-embed-websocket ${tw.starter.version} + system + ${basedir}/libs/tongweb-embed-websocket-3.x-7.0.E.6_P7.jar