Merge remote-tracking branch 'origin/dev' into dev

run-dev.sh

@@ -70,6 +70,45 @@ 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='dev'
+echo '----copy jar admin----'
+docker stop ${app_admin_name}
+echo '----stop container admin----'
+docker rm ${app_admin_name}
+echo '----rm container admin----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin----'
+docker run \
+-p 7077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+--link mysql:db \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+--add-host=gdxypx.xy.com:192.168.1.210 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/dev_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-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -1,11 +1,13 @@
 package com.zhongzheng.controller.distribution;
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.WxLoginService;
@@ -125,6 +127,9 @@ public class DistributionSellerController extends BaseController {
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         DistributionSellerVo vo = iDistributionSellerService.findDetail(loginUser.getUser().getSellerId());
+        if(Validator.isEmpty(vo)){
+            throw new CustomException("非法用户");
+        }
         vo.setSelfNull();
         return AjaxResult.success(vo);
     }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/DistributionSellerServiceImpl.java

@@ -138,6 +138,8 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             sysUser.setPassword(SecurityUtils.encryptPassword(bo.getPwd()));
             sysUser.setPwdTime(DateUtils.getNowTime());
             sysUser.setSellerId(inertData.getSellerId());
+            sysUser.setCreateTime(DateUtils.getNowDate());
+            sysUser.setUpdateTime(DateUtils.getNowDate());
             SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
                     .eq(SysRole::getRoleKey, "seller")
                     .eq(SysRole::getStatus, 1).last("limit 1"));
@@ -392,6 +394,8 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             sysUser.setPassword(SecurityUtils.encryptPassword(pwd));
             sysUser.setPwdTime(DateUtils.getNowTime());
             sysUser.setSellerId(inertData.getSellerId());
+            sysUser.setCreateTime(DateUtils.getNowDate());
+            sysUser.setUpdateTime(DateUtils.getNowDate());
             SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
                     .eq(SysRole::getRoleKey, "seller")
                     .eq(SysRole::getStatus, 1).last("limit 1"));

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

@@ -409,7 +409,7 @@ public class WxPayServiceImpl implements IWxPayService {
         initData();
         String key = "gzh_ticket";
         String ticket = redisCache.getCacheObject(key);
-        if (!Validator.isEmpty(ticket)||ticket.equals("null")) {
+        if (Validator.isEmpty(ticket)||ticket.equals("null")) {
             String access_token = wx_get_token();
             String param = String.format("access_token=%s&type=jsapi", access_token);
             String resultString = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/ticket/getticket", param);