diff --git a/bin/build.sh b/bin/build.sh index 2b44a42..8d35bd7 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -8,7 +8,6 @@ BERootDir=${GitRootDir}/be.wfc FERootDir=${GitRootDir}/fe.wfc FEUserRootDir=${GitRootDir}/fe.wfc.user BuildRootDir=${GitRootDir}/build.wfc -LicenseRootDir=${GitRootDir}/license.wfc WFCWorkDir=/opt/wfc BuildDockerDir=${BuildRootDir}/build/docker @@ -83,8 +82,6 @@ pre-git-pull(){ git pull cd ${BuildRootDir} git pull - cd ${LicenseRootDir} - git pull } pre-build-deb(){ @@ -114,9 +111,6 @@ build-jar(){ cd ${BERootDir} # git pull mvn clean package -Dmaven.test.skip=true -P prod - cd ${LicenseRootDir} - # git pull - mvn clean package -Dmaven.test.skip=true } pre-build-src-tar(){ diff --git a/bin/copy.sh b/bin/copy.sh index ea1c140..a886234 100755 --- a/bin/copy.sh +++ b/bin/copy.sh @@ -5,7 +5,6 @@ BERootDir=${GitRootDir}/be.wfc FERootDir=${GitRootDir}/fe.wfc FEUserRootDir=${GitRootDir}/fe.wfc.user BuildRootDir=${GitRootDir}/build.wfc -LicenseRootDir=${GitRootDir}/license.wfc I18nResourcesDir=${BERootDir}/wfc-common/wfc-common-core/src/main/resources WFCWorkDir=/opt/wfc @@ -89,6 +88,3 @@ echo -n "Begin copy wfc-modules-payment ... " cp -rf ${BERootDir}/wfc-modules/wfc-payment/target/wfc-modules-payment.jar ${BuildDockerDir}/wfc/modules/payment/jar echo "done" -echo -n "Begin copy wfc-license-server ... " -cp -rf ${LicenseRootDir}/target/wfc-license-server-1.0.0.jar ${BuildDockerDir}/license-server/jar -echo "done" diff --git a/build/docker/license-server/docker-compose.yml b/build/docker/license-server/docker-compose.yml deleted file mode 100644 index bba95fa..0000000 --- a/build/docker/license-server/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3.8' -services: - wfc-license-serve: - # 使用前面创建的Dockerfile构建的镜像 - build: . - # 指定容器名（可选） - container_name: wfc-license-server - # 指定端口映射（例如，将容器的8080端口映射到主机的8080端口） - ports: - - "8070:8070" - volumes: - - ./license:/opt/license diff --git a/build/docker/license-server/dockerfile b/build/docker/license-server/dockerfile deleted file mode 100644 index 95cebca..0000000 --- a/build/docker/license-server/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -LABEL org.wfc.image.authors="wfc@wfc.org" - -# 挂载目录 -VOLUME /opt/wfc -# 创建目录 -RUN mkdir -p /opt/wfc -# 指定路径 -WORKDIR /opt/wfc -# 复制jar文件到路径 -COPY jar/wfc-license-server-1.0.0.jar /opt/wfc/wfc-license-server.jar -# 启动licese-serve服务 -ENTRYPOINT ["java","-jar","wfc-license-server.jar"] diff --git a/build/docker/license-server/generatelic.sh b/build/docker/license-server/generatelic.sh deleted file mode 100755 index 07667ca..0000000 --- a/build/docker/license-server/generatelic.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# 默认值（可选） -TIME="" -declare -a IPS=() # 声明为数组 -declare -a MACS=() # 声明为数组 -CPU="" -MB="" -IP="" -MAC="" -CODE="" - -# 解析命令行参数 -while [[ $# -gt 0 ]]; do - case "$1" in - -t|--t) - TIME="$2" - shift 2 # 移除选项和参数值 - ;; - -ip|--ip) - shift # 先移除 "-ip" 自身 - # 收集所有后续非选项参数（直到遇到下一个以 "-" 开头的参数） - while [[ $# -gt 0 ]] && [[ ! "$1" =~ ^- ]]; do - IPS+=("$1") - shift - done - # 检查是否至少有一个名字 - if [[ ${#IPS[@]} -eq 0 ]]; then - echo "错误：-ip 参数需要至少一个名字" - exit 1 - fi - ;; - -mac|--mac) - shift # 先移除 "-mac" 自身 - # 收集所有后续非选项参数（直到遇到下一个以 "-" 开头的参数） - while [[ $# -gt 0 ]] && [[ ! "$1" =~ ^- ]]; do - MACS+=("$1") - shift - done - # 检查是否至少有一个名字 - if [[ ${#MACS[@]} -eq 0 ]]; then - echo "错误：-mac 参数需要至少一个名字" - exit 1 - fi - ;; - -cpu|--cpu) - CPU="$2" - shift 2 - ;; - -code|--code) - CODE="$2" - shift 2 - ;; - -mb|--mb) - MB="$2" - shift 2 - ;; - *) # 未知选项 - echo "错误：未知选项 $1" - exit 1 - ;; - esac -done - -# 检查必需参数 -if [[ -z "$TIME" ]]; then - echo "错误：缺少 -t 参数" - exit 1 -fi - -# 输出结果（或执行其他操作） -echo "失效时间: $TIME" -echo "ip地址: ${IPS[*]}" -echo "mac地址: ${MACS[*]}" -echo "cpu序列号: $CPU" -echo "ip序列号: $MB" - -IP=$(printf "%s\",\"" "${IPS[@]}") -IP=${IP%\",\"} -if [ ! -z "$IP" ]; then - IP=\"$IP\" -fi -MAC=$(printf "%s\",\"" "${MACS[@]}") -MAC=${MAC%\",\"} -if [ ! -z "$MAC" ]; then - MAC=\"$MAC\" -fi - -RAW='{ - "expiryTime": "'$TIME'", - "ipAddress": ['$IP'], - "macAddress": ['$MAC'], - "cpuSerial": "'$CPU'", - "activationCode": "'$CODE'", - "mainBoardSerial": "'$MB'" -}' - -res=$(curl --location --request GET 'http://localhost:8070/license/generateLicense' \ ---header 'Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoyLCJ1c2VyX2tleSI6IjE3NTE3MTBkLWI5YzItNGRjYy1iZGUwLTNlMTEyYjY2OGYzZCIsInBsYXRmb3JtIjoic3lzdGVtIiwidXNlcm5hbWUiOiJhZG1pbiJ9.NG7WLME_mH6nPhfAwwqHD3kzdlZi6Zn1B4t5BG_IMWRh9ClsoM0dqRH9agq7FKL4fn68cahbJS7EpFwCXNgOWA' \ ---header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \ ---header 'Content-Type: application/json' \ ---header 'Accept: */*' \ ---header 'Host: 192.168.2.249:8070' \ ---header 'Connection: keep-alive' \ ---data-raw "$RAW") - -echo $res -isok=$(echo $res | grep "result\":\"ok") -#echo "$RAW" -echo "------------------------" -if [ -z "$isok" ]; then - echo "生成license证书失败" -else - echo "生成license证书成功，license.lic文件在/opt/wfc/docker/license-server/license目录下" -fi diff --git a/build/docker/license-server/jar/readme.txt b/build/docker/license-server/jar/readme.txt deleted file mode 100644 index c35ba27..0000000 --- a/build/docker/license-server/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -֤ĴõjarļdockerӦá \ No newline at end of file diff --git a/build/docker/license-server/licensecontrol.sh b/build/docker/license-server/licensecontrol.sh deleted file mode 100755 index 9c435d6..0000000 --- a/build/docker/license-server/licensecontrol.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -WFCWorkDir=/opt/wfc -DockerDir=${WFCWorkDir}/docker/license-server -DockerCompose=docker-compose -PIDFile=/run/licensecontrol.pid - -case "$1" in - start) - cd ${DockerDir} - if [ -z "$2" ]; then - ${DockerCompose} up -d - echo $! > ${PIDFile} - else - ${DockerCompose} up -d $2 - fi - ;; - stop) - cd ${DockerDir} - if [ -z "$2" ]; then - ${DockerCompose} stop - if [ -f ${PIDFile} ]; then - rm ${PIDFile} - fi - else - ${DockerCompose} stop $2 - fi - ;; - restart) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - down) - cd ${DockerDir} - if [ -z "$2" ]; then - ${DockerCompose} down --rmi all - if [ -f ${PIDFile} ]; then - rm ${PIDFile} - fi - else - ${DockerCompose} down --rmi $2 - fi - ;; - status) - cd ${DockerDir} - if [ -z "$2" ]; then - ${DockerCompose} ps - else - ${DockerCompose} ps $2 - fi - ;; - *) - echo "License Server Service ... " - echo "Usage: $0 start|stop|restart|down|status" - exit 1 - ;; -esac