submit

run-prod.sh

@@ -2,23 +2,23 @@
 # 定义应用组名
 group_admin_name='zhongzheng'
 # 定义应用名称
-app_admin_name='zhongzheng-saas-admin-top'
+app_admin_name='zhongzheng-saas-admin'
 # 定义应用版本
 app_admin_version='1.0-SNAPSHOT'
 # 定义应用环境
 profile_active='prod'
-echo '----copy jar admin top----'
+echo '----copy jar admin----'
 docker stop ${app_admin_name}
-echo '----stop container admin top----'
+echo '----stop container admin----'
 docker rm ${app_admin_name}
-echo '----rm container admin top----'
+echo '----rm container admin----'
 docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin top----'
+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 top----'
+docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin----'
 docker run \
--p 7077:7077 \
+-p 5030:5030 \
 --name ${app_admin_name} \
 --restart=always \
 --log-opt max-size=50m \
@@ -27,11 +27,11 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin_top:/logs \
+-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----'
+echo '----start container admin----'
 
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -32,7 +32,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     List<User> selectList(UserQueryBo bo);
 
-    @InterceptorIgnore(tenantLine = "true")
+//    @InterceptorIgnore(tenantLine = "true")
     List<User> selectListNoTenant(UserQueryBo bo);
 
     List<UserStudyRecordVo> selectStudyRecordList(UserStudyRecordQueryBo bo);