diff --git a/scripts_244/auth_bootstrap.yml b/scripts_244/auth_bootstrap.yml index afab05ea..bf5b0e6a 100644 --- a/scripts_244/auth_bootstrap.yml +++ b/scripts_244/auth_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28681 + port: 38381 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-auth profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts_244/smart_site_bootstrap.yml b/scripts_244/cust_auth_bootstrap.yml similarity index 64% rename from scripts_244/smart_site_bootstrap.yml rename to scripts_244/cust_auth_bootstrap.yml index 05ac9d96..18464b82 100644 --- a/scripts_244/smart_site_bootstrap.yml +++ b/scripts_244/cust_auth_bootstrap.yml @@ -1,20 +1,15 @@ # Tomcat -server: - port: 28688 +server: + port: 38389 + # Spring -spring: - servlet: - multipart: - # 文件最大 - max-file-size: 20MB - # 设置总上传数据总大小 - max-request-size: 20MB +spring: application: # 应用名称 - name: bonus-smart-site + name: bonus-cust-auth profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -22,14 +17,19 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +#加密组件 +jasypt: + encryptor: + password: Encrypt + diff --git a/scripts_244/deploy.sh b/scripts_244/deploy.sh index 868ae903..467b5d96 100644 --- a/scripts_244/deploy.sh +++ b/scripts_244/deploy.sh @@ -1,10 +1,10 @@ #!/bin/bash -suffix="-smart-site" +suffix="-smart-canteen" jar_version="24.10.0-SNAPSHOT" -export deploy_path=/opt/webapps/bonus-smart-site +export deploy_path=/opt/webapps/bonus-smart-canteen export app_workspace=/opt/builds/releases/Bonus-Cloud/${jar_version} -export biz_workspace=/opt/install/jenkins_home/workspace/Bonus-Cloud-Smart-Site +export biz_workspace=/opt/install/jenkins_home/workspace/Bonus-Cloud-Smart-Canteen app_source_jars=( "bonus-auth-${jar_version}.jar" @@ -34,17 +34,18 @@ for source_jar in "${app_source_jars[@]}"; do echo "copied ${app_workspace}/${source_jar} to '$deploy_path/$new_filename'" done -cp -f ${biz_workspace}/"bonus-modules/bonus-smart-site/target/bonus-smart-site.jar" $deploy_path +cp -f ${biz_workspace}/"bonus-modules/bonus-smart-canteen/target/bonus-smart-canteen.jar" $deploy_path echo "copied ${app_workspace}/${source_jar} to $deploy_path" # Define an array of JAR files to run -jars=("bonus-auth-${jar_version}-smart-site.jar --spring.config.location=file:auth_bootstrap.yml" -"bonus-gateway-${jar_version}-smart-site.jar --spring.config.location=file:gateway_bootstrap.yml" -"bonus-system-${jar_version}-smart-site.jar --spring.config.location=file:system_bootstrap.yml" -"bonus-job-${jar_version}-smart-site.jar --spring.config.location=file:job_bootstrap.yml" -"bonus-file-${jar_version}-smart-site.jar --spring.config.location=file:file_bootstrap.yml" -"bonus-visual-monitor-${jar_version}-smart-site.jar --spring.config.location=file:visual_bootstrap.yml" -"bonus-smart-site.jar --spring.config.location=file:smart_site_bootstrap.yml") +jars=("bonus-auth-${jar_version}-smart-canteen.jar --spring.config.location=file:auth_bootstrap.yml" +"bonus-gateway-${jar_version}-smart-canteen.jar --spring.config.location=file:gateway_bootstrap.yml" +"bonus-system-${jar_version}-smart-canteen.jar --spring.config.location=file:system_bootstrap.yml" +"bonus-job-${jar_version}-smart-canteen.jar --spring.config.location=file:job_bootstrap.yml" +"bonus-file-${jar_version}-smart-canteen.jar --spring.config.location=file:file_bootstrap.yml" +"bonus-visual-monitor-${jar_version}-smart-canteen.jar --spring.config.location=file:visual_bootstrap.yml" +"bonus-smart-canteen.jar --spring.config.location=file:smart_canteen_bootstrap.yml" +"bonus-cust-auth.jar --spring.config.location=file:cust_auth_bootstrap.yml") # 遍历数组并检查每个JAR文件的进程 for jar_with_args in "${jars[@]}"; do diff --git a/scripts_244/file_bootstrap.yml b/scripts_244/file_bootstrap.yml index f2fc2099..0ac2a662 100644 --- a/scripts_244/file_bootstrap.yml +++ b/scripts_244/file_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28683 + port: 38383 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-file profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts_244/gateway_bootstrap.yml b/scripts_244/gateway_bootstrap.yml index 03257d77..50d064ae 100644 --- a/scripts_244/gateway_bootstrap.yml +++ b/scripts_244/gateway_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28680 + port: 38380 servlet: context-path: zhgd # Spring @@ -10,7 +10,7 @@ spring: name: bonus-gateway profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -18,11 +18,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 @@ -41,7 +41,7 @@ spring: username: nacos password: bonus@Admin123 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen dataId: sentinel-bonus-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/scripts_244/gen_bootstrap.yml b/scripts_244/gen_bootstrap.yml index ce8f1084..489dfeab 100644 --- a/scripts_244/gen_bootstrap.yml +++ b/scripts_244/gen_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28684 + port: 38384 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-gen profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts_244/job_bootstrap.yml b/scripts_244/job_bootstrap.yml index 9428bc23..f9c10b7d 100644 --- a/scripts_244/job_bootstrap.yml +++ b/scripts_244/job_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28685 + port: 38385 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-job profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts_244/kill-ps.sh b/scripts_244/kill-ps.sh index 2a021beb..ea10c818 100644 --- a/scripts_244/kill-ps.sh +++ b/scripts_244/kill-ps.sh @@ -1,10 +1,11 @@ -AUTH_RESOURCE_NAME=bonus-auth-24.10.0-SNAPSHOT-smart-site.jar -GATEWAY_RESOURCE_NAME=bonus-gateway-24.10.0-SNAPSHOT-smart-site.jar -SYS_RESOURCE_NAME=bonus-system-24.10.0-SNAPSHOT-smart-site.jar -JOB_RESOURCE_NAME=bonus-job-24.10.0-SNAPSHOT-smart-site.jar -FILE_RESOURCE_NAME=bonus-file-24.10.0-SNAPSHOT-smart-site.jar -MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.10.0-SNAPSHOT-smart-site.jar -SMART_SITE_RESOURCE_NAME=bonus-smart-site.jar +AUTH_RESOURCE_NAME=bonus-auth-24.10.0-SNAPSHOT-smart-canteen.jar +GATEWAY_RESOURCE_NAME=bonus-gateway-24.10.0-SNAPSHOT-smart-canteen.jar +SYS_RESOURCE_NAME=bonus-system-24.10.0-SNAPSHOT-smart-canteen.jar +JOB_RESOURCE_NAME=bonus-job-24.10.0-SNAPSHOT-smart-canteen.jar +FILE_RESOURCE_NAME=bonus-file-24.10.0-SNAPSHOT-smart-canteen.jar +MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.10.0-SNAPSHOT-smart-canteen.jar +SMART_CANTEEN_RESOURCE_NAME=bonus-smart-canteen.jar +BONUS_CUST_AUTH_RESOURCE_NAME=bonus-cust-auth.jar tpid=`ps -ef|grep $AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` @@ -97,13 +98,27 @@ echo 'Stop Success!' fi -tpid=`ps -ef|grep $SMART_SITE_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +tpid=`ps -ef|grep $SMART_CANTEEN_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` if [ ${tpid} ]; then echo 'Stop Process...' kill -15 $tpid fi sleep 5 -tpid=`ps -ef|grep $SMART_SITE_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +tpid=`ps -ef|grep $SMART_CANTEEN_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +if [ ${tpid} ]; then +echo 'Kill Process!' +kill -9 $tpid +else +echo 'Stop Success!' +fi + +tpid=`ps -ef|grep $BONUS_CUST_AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +if [ ${tpid} ]; then +echo 'Stop Process...' +kill -15 $tpid +fi +sleep 5 +tpid=`ps -ef|grep $BONUS_CUST_AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` if [ ${tpid} ]; then echo 'Kill Process!' kill -9 $tpid diff --git a/scripts_244/pipeline.sh b/scripts_244/pipeline.sh index 5480ef7d..bd4228cb 100644 --- a/scripts_244/pipeline.sh +++ b/scripts_244/pipeline.sh @@ -17,7 +17,7 @@ pipeline { doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '']], submoduleCfg: [], - userRemoteConfigs: [[url: 'http://192.168.0.244:3000/bonus/Bonus-Cloud-Smart-Site.git']] + userRemoteConfigs: [[url: 'http://192.168.0.244:3000/bonus/Bonus-Cloud-Smart-Canteen.git']] ]) } } diff --git a/scripts_244/smart_canteen_bootstrap.yml b/scripts_244/smart_canteen_bootstrap.yml new file mode 100644 index 00000000..a5c157c0 --- /dev/null +++ b/scripts_244/smart_canteen_bootstrap.yml @@ -0,0 +1,51 @@ +# Tomcat +server: + port: 38388 +# Spring +spring: + servlet: + multipart: + # 文件最大 + max-file-size: 20MB + # 设置总上传数据总大小 + max-request-size: 20MB + application: + # 应用名称 + name: bonus-smart-canteen + profiles: + # 环境配置 + active: smart_canteen_test + cloud: + nacos: + username: nacos + password: bonus@Admin123 + discovery: + # 服务注册地址 + server-addr: 192.168.0.244:8848 + namespace: smart_canteen + config: + # 配置中心地址 + server-addr: 192.168.0.244:8848 + namespace: smart_canteen + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +alipay: + URL: https://openapi.alipay.com/gateway.do + PID: 2088041561080184 + APPID: 2021002125609361 + PRIVATE_KEY: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCpBulkHcSEQvo0GmPyYmyNOWjlCxTn/r/zrOLoXlLN44ZECgdn+Kn9E0EFjwenc/xz4H3V89KrwCA0kNX3m5Hs5qfbKIaycIQf7MvBQHPeUxQ+HeiBwg8b5vcaNy9RtS+wEuU21GF2ZU4QFpk9wYU/MWtvyt/vtj/HCL3/IGvVhcQcbumGlmBEYfoFZLez/7PfIY0SOZ7jdxCS/XGOwwBx2hMTCsMS05VPEaEwDYV5U2WN8FDDXCt6NvHPPR+BUoDON7xxaalHcN/mokpkyFmTXXAadjLVof9BJFPIYaJKmN/aRG7TWMvvZwEDKmcmeyLGiph9M4UEviiXJus/369TAgMBAAECggEAN1Bqune/YuUkSj7ErIKnMYQzHpmEyvMkUBMo4pBTmss1mjiJ+e13e7l8Utxezd74I9e4dnbnX4ttPqaTTwebNqK5FdBqXCTUKDpu55w3Du+zNSzGdQhTt3bbMLoUgzG/HGjimBHin0NBy6QJnBsjhu2eUiRbKnBC6NikjMRIZcRrAhFx65s6M6X7tRmWCybPDcWyp2Zz+nQZhCaku+qVdNz1+Jt1z3R7RZvcVNMXV0XKTu/TdMGfeGOzmyjwCEQG2iw/e7y7QkJHQDU0dKjeBCcZ9xAeGjY9m2gEK2nk1drPJ4TUEtREbZbS8lVkdjOGFQ0VMEY00KEb4JLRwam16QKBgQDlMyaqhiYAY8o1QxZ/4i2YxNHnP8Q0qQ4lyvTaVjZH3trINIXMjwtlezxwjXoMKvcgYfXFdJ9La88qsBOrqzkgePI5sX3AAGMACgUSfQmbLCfxQ4pzN2/bigWl5apFWWrfi7vmUlE+xUZmbv+HePLVslOS8RmCE79sHjwIEGQghQKBgQC8yo1xCdripF8aLMZVFDBabi3i8n6jJFzEJvY74HqoIegjSAUkmivSvw/VkGdg+bGoAinza/4zUAF7oCn/z+Q422ZQ6ldHetDioxxtumUU1Zt6ilwdpiQzMGj9B9+fHtpEaXZJjjcUQCKUMOBegcki4H4WkHcyqkLHk7TY8DPD9wKBgQDV0LwXhIHbBzzSJz3MG2HSDHqMsm4FelhaZVW6gYat0XZkIqtXQ3KsPyUJEtJym3pjWT9/7uXT5EUlW5FeKqNmaa3+qFfZUAMLPE2zC7Z0beLtLcbw6RyOv9m5A+GuRFZxKNgna0+jsUGVuaLj7K8NMAjLIeRb9rQy1pnGJBRkSQKBgFyr6OY1+jYKjYxhsjGNKXcaYnfmpPccIFVA8tnNhSgHDNZUwgGHlD9s/i7NJZHav7RC66jLuAokGbY/lp41xEeMmxrZDWLPDL5TZt8OAhRKDnoGdNUw+tAN0Vtzg/etw2KVijTtFGhiWxb3Lwv1FXCDViFpZLmADiu9e6aJsj9dAoGBAK2IuG617pbbFq6vl9lYyYxT5wBYWQ47uHu8vKTfKnZ6zkGecZssiLdSKMwmAB0oJOXPc9QcWe3MYAnFEBw2DygmluxDlE5hK36Nb2Tvs75MD7Bj0noQ4pCC12v1KF57zzhaU9PqkAM8VouLLWe7eOa6ScBZn+3P9Q0EijuPesn/ + FORMAT: JSON + CHARSET: UTF-8 + SIGN_TYPE: RSA2 + ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApnqCjevyilI4LcWsrUI7d6zSSc/+xqKO6U0Bmf3yCKRNPNubqHeOQ7Wd9+63lswObGNa6sHYkoZEmoO3WhIRu1ruV1gG3dqnuZ93PNHtoG22S6fPoSwJyB1i1N61dPHV7ikU5Ljq/VJhP05cYH+MiZOb5sx47Ub4KqKghVkyZu6mSlVWu/ojipd0H3kl88QXnF1W3QT1B9DSkODg94u4A28SrJHT+8nkPhOsD8cs5NmwmZJUieFiHh69hEgR+Af2xl1G+LNRWN4vTZ4sWcAnQp+ + +system: + sysfile: + prefixOffline: http://localhost:9000/lnyst + prefixOnline: http://localhost:9000/lnyst + bucket: /lnyst + diff --git a/scripts_244/stopServices.sh b/scripts_244/stopServices.sh index 8db2a92c..b7826f33 100644 --- a/scripts_244/stopServices.sh +++ b/scripts_244/stopServices.sh @@ -1,6 +1,6 @@ -P_ID=$(pgrep -f BonusSmartSiteApplication) +P_ID=$(pgrep -f BonusSmartCanteenApplication) if [ -z "$P_ID" ]; then - echo "BonusSmartSiteApplication is not running" + echo "BonusSmartCanteenApplication is not running" else kill -9 "$P_ID" fi diff --git a/scripts_244/system_bootstrap.yml b/scripts_244/system_bootstrap.yml index 10330792..a315f32f 100644 --- a/scripts_244/system_bootstrap.yml +++ b/scripts_244/system_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28682 + port: 38382 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-system profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts_244/visual_bootstrap.yml b/scripts_244/visual_bootstrap.yml index ed152de6..fa7c6dbe 100644 --- a/scripts_244/visual_bootstrap.yml +++ b/scripts_244/visual_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28686 + port: 38386 # Spring spring: @@ -9,7 +9,7 @@ spring: name: bonus-monitor profiles: # 环境配置 - active: smart_site_test + active: smart_canteen_test cloud: nacos: username: nacos @@ -17,11 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen config: # 配置中心地址 server-addr: 192.168.0.244:8848 - namespace: smart_site + namespace: smart_canteen # 配置文件格式 file-extension: yml # 共享配置