From efbe27770c96a6d0fa37fdf2c4f6cc0dfb1087f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=9D=BF?= Date: Tue, 1 Dec 2020 11:32:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/views/login/index.vue | 4 ++-- crmeb/pom.xml | 2 +- .../system/service/impl/SystemConfigServiceImpl.java | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/admin/src/views/login/index.vue b/admin/src/views/login/index.vue index ee0b4e43..a3cf41ba 100644 --- a/admin/src/views/login/index.vue +++ b/admin/src/views/login/index.vue @@ -133,8 +133,8 @@ export default { } }, loginForm: { - account: 'demo', // admin - pwd: 'crmeb.com', + account: '', // admin + pwd: '', key: '', code: '', wxCode: '' diff --git a/crmeb/pom.xml b/crmeb/pom.xml index 21835493..3f1a8ce8 100644 --- a/crmeb/pom.xml +++ b/crmeb/pom.xml @@ -161,7 +161,7 @@ io.swagger swagger-models - 1.5.21 + 1.5.22 diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java index 6935a3a7..34e13094 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java @@ -152,13 +152,12 @@ public class SystemConfigServiceImpl extends ServiceImpl forAsyncPram = systemConfigList.stream().map(e -> { - e.setStatus(true); - return e; - }).collect(Collectors.toList()); + //将新的数据写入到redis + List forAsyncPram = systemConfigList.stream() + .peek(e -> e.setStatus(false)).collect(Collectors.toList()); async(forAsyncPram); return true; -- Gitee From c58f5bb35e4b00af70742c7fd268df78010e1a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=9D=BF?= Date: Tue, 8 Dec 2020 17:59:00 +0800 Subject: [PATCH 2/2] prod env --- admin/.env.production | 2 +- crmeb/src/main/resources/application-prod.yml | 16 +++---- crmeb/start.sh | 46 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/admin/.env.production b/admin/.env.production index 2242ce1c..e5d3d9df 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -3,5 +3,5 @@ ENV = 'production' # base api # VUE_APP_BASE_API = '/prod-api' -VUE_APP_BASE_API = 'https://api.java.crmeb.net' +VUE_APP_BASE_API = 'https://wapi.zsun.pro' diff --git a/crmeb/src/main/resources/application-prod.yml b/crmeb/src/main/resources/application-prod.yml index 88352f3d..2de240fb 100644 --- a/crmeb/src/main/resources/application-prod.yml +++ b/crmeb/src/main/resources/application-prod.yml @@ -16,13 +16,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb_java_test?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: youMysqlAccount - password: youMysqlPwd + url: jdbc:mysql://172.17.16.14:3306/crmeb_prod?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: root + password: 7*R#oPy9aVevUk redis: - host: redisPath #地址 + host: 127.0.0.1 #地址 port: 6379 #端口 - password: #密码 + password: 7*R#oPy9aVevUk #密码 timeout: 30000 # 连接超时时间（毫秒） database: 0 #默认数据库 jedis: @@ -52,7 +52,7 @@ mybatis-plus: #swagger 配置 swagger: basic: - enable: true #是否开启界面 + enable: false #是否开启界面 check: true #是否打开验证 - username: crmeb #访问swagger的账号 - password: ZeypRDYBfM #访问swagger的密码 + username: swtest #访问swagger的账号 + password: 7*R#oPy9aVevUk #访问swagger的密码 diff --git a/crmeb/start.sh b/crmeb/start.sh index 968992c2..60115fb2 100755 --- a/crmeb/start.sh +++ b/crmeb/start.sh @@ -4,7 +4,7 @@ startTime=`date +'%Y-%m-%d %H:%M:%S'` #接口项目站点路径（目录按照各自配置） -APP_PATH=/www/wwwroot/api.java.crmeb.net #线上地址 +APP_PATH=/wyw #APP_PATH=/Library/WebServer/Documents/zhongbang/java/crmeb #本地地址 #jar包文件名称 @@ -99,27 +99,27 @@ echo "当前时间："$endTime # } # }' -host="www.xx.net"; #此处填写自己的前端访问域名 -domain="https://www.xx.com"; #此处填写自己的前端访问域名 带http/https -version="crmeb_java_1.0"; #版本号, 此处不需要修改 -ip="111.111.111.111"; #您当前服务器的IP - -if test -e $INSTALL_FILE;then - echo '已经统计过首次安装' -else - #开源不易，首次安装统计 - curl 'http://shop.crmeb.net/index.php/admin/server.upgrade_api/updatewebinfo' \ - -H 'Content-Type: application/json' \ - -d ' - { - "host": "'$host'", - "https": "'$domain'", - "version": "'$version'", - "ip": "'$ip'" - }' - touch $INSTALL_FILE - echo "install" > $INSTALL_FILE -fi +# host="www.xx.net"; #此处填写自己的前端访问域名 +# domain="https://www.xx.com"; #此处填写自己的前端访问域名 带http/https +# version="crmeb_java_1.0"; #版本号, 此处不需要修改 +# ip="111.111.111.111"; #您当前服务器的IP + +# if test -e $INSTALL_FILE;then +# echo '已经统计过首次安装' +# else +# #开源不易，首次安装统计 +# curl 'http://shop.crmeb.net/index.php/admin/server.upgrade_api/updatewebinfo' \ +# -H 'Content-Type: application/json' \ +# -d ' +# { +# "host": "'$host'", +# "https": "'$domain'", +# "version": "'$version'", +# "ip": "'$ip'" +# }' +# touch $INSTALL_FILE +# echo "install" > $INSTALL_FILE +# fi ##实时查看启动日志 # #tail -f $LOG_FILE @@ -148,4 +148,4 @@ else echo '$APP_NAME 文件不存在,请检查。' fi -#在 $APP_NAME 同级目录下运行 ./start.sh 命令即可启动项目。 \ No newline at end of file +#在 $APP_NAME 同级目录下运行 ./start.sh 命令即可启动项目。 -- Gitee