fix

run-dev.sh

@@ -108,7 +108,7 @@ docker run \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin-top----'
+echo '----start container admin top----'
 
 
 

run-prod.sh

@@ -68,7 +68,43 @@ docker run \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
 
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
 
+#!/usr/bin/env bash
+# 定义应用组名
+group_admin_name='zhongzheng'
+# 定义应用名称
+app_admin_name='zhongzheng-saas-admin-top'
+# 定义应用版本
+app_admin_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar admin top----'
+docker stop ${app_admin_name}
+echo '----stop container admin top----'
+docker rm ${app_admin_name}
+echo '----rm container admin top----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin top----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin top----'
+docker run \
+-p 7077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_admin:/logs \
+-v /mydata/app/${app_admin_name}/logs:/var/logs \
+-v /data/nginx/conf.d:/data/nginx/conf.d \
+-d ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----start container admin top----'
 
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -344,13 +344,11 @@ public class WxPayServiceImpl implements IWxPayService {
     public Map<String, String> shareGzh(String url) {
         initData();
         Map<String, String> map = new HashMap<String, String>();
-        map.put("nonceStr",UUID.randomUUID().toString());
-        map.put("timestamp",String.valueOf(DateUtils.getNowTime()));
-        String signature = wx_config_sign(map, url);
+        map.put("nonceStr",WXPayUtil.generateNonceStr());
+        map.put("timeStamp",String.valueOf(DateUtils.getNowTime()));
         map.put("url", url);
+        String signature = wx_config_sign(map, url);
         map.put("jsapi_ticket", wx_get_jsapi_ticket());
-        map.put("nonceStr", map.get("nonceStr"));
-        map.put("timestamp", map.get("timestamp"));
         map.put("signature", signature);
         map.put("appid",gzhAppid);
         return map;