Merge pull request '疑修列表入参丰富' (#973) from wanjia9506/microservices:dev_issues_transform into master

# Conflicts:
#	microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html

.gitignore

@@ -47,4 +47,3 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/ruoyi-react/

README.md

@@ -0,0 +1,36 @@
+## 系统模块
+
+~~~
+com.microservices     
+├── microservices-ui              // 前端框架 
+├── microservices-gateway         // 网关模块 
+├── microservices-auth            // 认证中心 
+├── microservices-api             // 接口模块
+│       └── microservices-api-system                          // 系统接口
+├── microservices-common          // 通用模块
+│       └── microservices-common-async                        // 异步线程池配置
+│       └── microservices-common-core                         // 核心模块
+│       └── microservices-common-datascope                    // 权限范围
+│       └── microservices-common-datasource                   // 多数据源
+│       └── microservices-common-httpClient                   // http调用
+│       └── microservices-common-log                          // 日志记录
+│       └── microservices-common-redis                        // 缓存服务
+│       └── microservices-common-seata                        // seata分布式事务
+│       └── microservices-common-security                     // 安全模块
+│       └── microservices-common-swagger                      // 系统接口
+├── microservices-modules         // 业务模块
+│       └── microservices-cms                                 // 内容管理模块
+│       └── microservices-dms                                 // 数据管理体系模块
+│       └── microservices-dss                                 // 数据统计系统模块
+│       └── microservices-file                                // 文件服务
+│       └── microservices-gen                                 // 代码生成
+│       └── microservices-job                                 // 定时任务
+│       └── microservices-pms                                 // 项目管理系统模块
+│       └── microservices-system                              // 系统模块
+│       └── microservices-wiki                                // Wiki模块
+│       └── microservices-zone                                // 特色专区系统模块
+├── microservices-visual          // 图形化管理模块
+│       └── microservices-visual-monitor                      // 监控中心
+├──pom.xml                // 公共依赖
+~~~
+

bin/clean.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause

bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
-pause

bin/run-auth.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Auth工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar
-
-cd bin
-pause

bin/run-gateway.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Gateway工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar
-
-cd bin
-pause

bin/run-modules-file.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-File工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar
-
-cd bin
-pause

bin/run-modules-gen.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-Gen工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar
-
-cd bin
-pause

bin/run-modules-job.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-Job工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar
-
-cd bin
-pause

bin/run-modules-system.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-System工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-system/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
-
-cd bin
-pause

bin/run-monitor.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Monitor工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-visual/ruoyi-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar
-
-cd bin
-pause

docker-gitlink/173_test_config.profile

@@ -1,63 +0,0 @@
-## 部署环境
-deploy_env=test
-## 基础镜像版本
-base_image_version=1.0.0
-## Nacos数据库连接
-nacos_db_url=gitlink-mysql:3306
-nacos_db_name=gitlink-nacos-config
-nacos_db_username=root
-nacos_db_password=Trust_#%01
-## 连接Nacos配置
-nacos_ip=gitlink-nacos
-nacos_port=8848
-## 连接Redis配置
-redis_ip=gitlink-redis
-redis_port=6379
-## 业务库数据源配置
-mysql_root_password=Trust_#%01
-db_url=gitlink-mysql:3306
-db_name=ruoyi-gitlink
-db_username=root
-db_password=Trust_#%01
-mapping_mysql_port=24306
-## GitLink库数据源配置
-gitlink_db_url=173.15.15.82:23306
-gitlink_db_name=test-gitlink-user
-gitlink_db_username=root
-gitlink_db_password=123456
-## 文件服务访问地址
-file_url=http://173.15.15.82:24080/file
-# 容器内文件上传路径
-file_path=/home/gitlink/uploadPath
-## 内容管理系统配置
-# 自动提取概要最大长度
-cms_summaryMaxLength=100
-# 特色专区项目组织名称
-cms_gitLinkOrganization=prefecture
-# GitLink访问地址
-cms_gitLinkUrl=https://testforgeplus.trustie.net/
-## skywalking配置
-skywalking_backend_service=111.8.36.180:95
-## Docker数据路径
-docker_data=/data/docker-data
-## Nacos映射端口
-mapping_nacos_port=24848
-## Redis映射端口
-mapping_redis_port=24379
-## Gateway映射端口
-mapping_gateway_port=24080
-## 邀请链接有效时长（单位：天）
-invitationLinkExpirationTime=10
-## 邀请确认页面
-invitationPagePath=/index
-## 消息模板
-messageTemplate=1428
-## 专区管理地址
-zoneAdminUrl=http://127.0.0.1/zone/list
-## 项目聚合中，GitLink项目Id
-gitlinkProjectId=546714
-## 会员聚合中，gitlink用户名
-gitLinkUserName1=floraachy
-gitLinkUserName2=innov
-gitLinkUserName3=ttt77777
-gitLinkUserName4=OTTO

docker-gitlink/auto_redeploy.sh

@@ -1,323 +0,0 @@
-#!/bin/sh
-
-# 获取当前路径
-orgin_path=`pwd`
-current_env=$1
-server_name=$3
-
-
-# 使用说明，用来提示输入参数
-usage() {
-  echo -e "\e[91m错误：必须传入环境参数 \e[0m"
-	echo "Usage: sh auto_redeploy.sh [test|prod] [modules|zone_front]"
-	exit 1
-}
-
-check_success(){
-  # 打印提示信息
-  echo "服务开始启动，监听服务是否启动完成，容器名称：$1"
-  # 开始监听容器日志
-  docker logs -f $1 | while read -r log_line
-  do
-    # 检查日志中是否包含"启动成功"
-    if [ -n "$(echo "$log_line" | grep "启动成功")" ]; then
-      # 打印包含"启动成功"的日志
-      echo "$log_line"
-      # 获取docker logs进程ID并终止
-      logs_pid=$(pgrep -P $$ -o -f "docker logs -f $1")
-      [ -n "$logs_pid" ] && kill "$logs_pid"
-      break
-    fi
-  done
-}
-
-modules(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_jar
-
-  echo "生成Dockerfile"
-  ./build.sh "$current_env" gen_dockerfile
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules
-
-  check_success gitlink-auth
-  check_success gitlink-gateway
-  check_success gitlink-modules-cms
-  check_success gitlink-modules-system
-  check_success gitlink-modules-file
-  check_success gitlink-modules-zone
-}
-
-zone_front(){
-  echo "自动部署前端"
-    echo "进行前端编译"
-    ./build.sh "$current_env" build_zone_front
-    echo "拷贝前端文件"
-    ./copy.sh "$current_env" copy_zone_front
-    docker restart gitlink-nginx
-}
-zone(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-modules/ruoyi-zone
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_zone
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-modules-zone
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-modules-zone
-
-  sleep 2
-  echo "检查zone服务是否已停止"
-  docker ps -a|grep "gitlink-modules-zone"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-modules-zone
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-modules-zone
-
-  check_success gitlink-modules-zone
-
-}
-file(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-modules/ruoyi-file
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_file
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-modules-file
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-modules-file
-
-  sleep 2
-  echo "检查file服务是否已停止"
-  docker ps -a|grep "gitlink-modules-file"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-modules-file
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-modules-file
-
-  check_success gitlink-modules-file
-}
-system(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-modules/ruoyi-system
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_system
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-modules-system
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-modules-system
-
-  sleep 2
-  echo "检查system服务是否已停止"
-  docker ps -a|grep "gitlink-modules-system"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-modules-system
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-modules-system
-
-  check_success gitlink-modules-system
-
-}
-cms(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-modules/ruoyi-cms
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_cms
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-modules-cms
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-modules-cms
-
-  sleep 2
-  echo "检查cms服务是否已停止"
-  docker ps -a|grep "gitlink-modules-cms"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-modules-cms
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-modules-cms
-
-  check_success gitlink-modules-cms
-
-}
-gateway(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-gateway
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_gateway
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-gateway
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-gateway
-
-  sleep 2
-  echo "检查gateway服务是否已停止"
-  docker ps -a|grep "gitlink-gateway"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-gateway
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-gateway
-
-  check_success gitlink-gateway
-
-}
-auth(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-auth
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_auth
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-auth
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-auth
-
-  sleep 2
-  echo "检查auth服务是否已停止"
-  docker ps -a|grep "gitlink-auth"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-auth
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-auth
-
-  check_success gitlink-auth
-
-}
-pms(){
-  echo "拉取最新代码"
-  git pull
-
-  echo "进行Maven编译"
-  ./build.sh "$current_env" build_maven ruoyi-modules/ruoyi-pms
-
-  echo "拷贝Jar包"
-  ./copy.sh "$current_env" copy_pms
-
-  echo "重新编译modules"
-  ./deploy.sh "$current_env" build_modules gitlink-modules-pms
-
-  echo "停止modules服务"
-  ./deploy.sh "$current_env" stop_modules gitlink-modules-pms
-
-  sleep 2
-  echo "检查pms服务是否已停止"
-  docker ps -a|grep "gitlink-modules-pms"
-
-  echo "删除已停止的服务"
-  ./deploy.sh "$current_env" rm gitlink-modules-pms
-
-  echo "启动modules服务"
-  ./deploy.sh "$current_env" modules gitlink-modules-pms
-
-  check_success gitlink-modules-pms
-
-}
-
-case "$current_env" in
-  "test")
-  # 获取测试环境配置文件中的安装信息
-    . ./test_config.profile
-  ;;
-  "prod")
-    . ./prod_config.profile
-  ;;
-  *)
-  	usage
-  ;;
-esac
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$2" in
-"modules")
-	modules
-;;
-"zone_front")
-	zone_front
-;;
-"zone")
-	zone
-;;
-"system")
-	system
-;;
-"cms")
-	cms
-;;
-"pms")
-	pms
-;;
-"file")
-	file
-;;
-"gateway")
-	gateway
-;;
-"auth")
-	auth
-;;
-*)
-	usage
-;;
-esac

docker-gitlink/build.sh

@@ -1,247 +0,0 @@
-#!/bin/sh
-
-# 获取当前路径
-orgin_path=`pwd`
-server_name=$3
-env=$1
-
-# 使用说明，用来提示输入参数
-usage() {
-  echo -e "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
-	echo "Usage: sh build.sh [test|prod] [build_base_image|gen_nacos_config|gen_nginx_config|gen_nacos_sql|gen_gitlink_sql|gen_docker_compose|gen_dockerfile|build_maven|build_zone_front]"
-	exit 1
-}
-
-# 编译基础镜像
-build_base_image(){
-      cd "${orgin_path}"/gitlink/base
-      docker build -t gitlink-java:"${base_image_version}" .
-}
-
-gen_nginx_config(){
-    # 修改nacos配置
-    cd "${orgin_path}"/nginx/conf
-    # 删除历史配置文件
-    rm -f nginx.conf
-    cp default_nginx.conf nginx.conf
-    # 替换配置
-    sed -i "s|#mapping_gateway_port|${mapping_gateway_port}|g" nginx.conf
-    sed -i "s|#mapping_nacos_port|${mapping_nacos_port}|g" nginx.conf
-}
-
-gen_nacos_sql(){
-  # 修改nacos SQL
-  cd "${orgin_path}"/nacos/sql
-  # 删除历史sql
-  rm -f gitlink-nacos-config.sql
-  cp default_gitlink-nacos-config.sql gitlink-nacos-config.sql
-  # 替换配置
-  sed -i "s|#redis_ip|${redis_ip}|g" gitlink-nacos-config.sql
-  sed -i "s|#redis_port|${redis_port}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#db_url|${db_url}|g" gitlink-nacos-config.sql
-  sed -i "s|#db_name|${db_name}|g" gitlink-nacos-config.sql
-  sed -i "s|#db_username|${db_username}|g" gitlink-nacos-config.sql
-  sed -i "s|#db_password|${db_password}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#gitlink_db_url|${gitlink_db_url}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlink_db_name|${gitlink_db_name}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlink_db_username|${gitlink_db_username}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlink_db_password|${gitlink_db_password}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#file_url|${file_url}|g" gitlink-nacos-config.sql
-  sed -i "s|#file_path|${file_path}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#cms_summaryMaxLength|${cms_summaryMaxLength}|g" gitlink-nacos-config.sql
-  sed -i "s|#cms_gitLinkOrganization|${cms_gitLinkOrganization}|g" gitlink-nacos-config.sql
-  sed -i "s|#cms_gitLinkUrl|${cms_gitLinkUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#cmsDetailPath|${cmsDetailPath}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#invitationLinkExpirationTime|${invitationLinkExpirationTime}|g" gitlink-nacos-config.sql
-  sed -i "s|#invitationPagePath|${invitationPagePath}|g" gitlink-nacos-config.sql
-  sed -i "s|#messageTemplate|${messageTemplate}|g" gitlink-nacos-config.sql
-  sed -i "s|#memberMessageTemplate|${memberMessageTemplate}|g" gitlink-nacos-config.sql
-  sed -i "s|#zoneAdminUrl|${zoneAdminUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#zoneHomepagePath|${zoneHomepagePath}|g" gitlink-nacos-config.sql
-  sed -i "s|#zoneMemberPath|${zoneMemberPath}|g" gitlink-nacos-config.sql
-  sed -i "s|#zoneConfigurationUrl|${zoneConfigurationUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#docManageUrl|${docManageUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#resourceManageUrl|${resourceManageUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlinkProjectId|${gitlinkProjectId}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitLinkUserName1|${gitLinkUserName1}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitLinkUserName2|${gitLinkUserName2}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitLinkUserName3|${gitLinkUserName3}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitLinkUserName4|${gitLinkUserName4}|g" gitlink-nacos-config.sql
-
-  sed -i "s|#gatewayUrl|${gatewayUrl}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlinkAdminUsername|${gitlinkAdminUsername}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlinkAdminPassword|${gitlinkAdminPassword}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlinkClientId|${gitlinkClientId}|g" gitlink-nacos-config.sql
-  sed -i "s|#gitlinkClientSecret|${gitlinkClientSecret}|g" gitlink-nacos-config.sql
-
-  sed -i "1 i DROP DATABASE IF EXISTS \`${nacos_db_name}\`;" gitlink-nacos-config.sql
-  sed -i "2 i CREATE DATABASE \`${nacos_db_name}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" gitlink-nacos-config.sql
-  sed -i "3 i USE \`${nacos_db_name}\`;" gitlink-nacos-config.sql
-
-}
-
-gen_gitlink_sql(){
-  # 修改nacos SQL
-  cd "${orgin_path}"/gitlink/sql
-  # 删除历史sql
-  rm -f ruoyi-gitlink.sql
-  cp init-ruoyi-gitlink.sql ruoyi-gitlink.sql
-  # 替换配置
-
-  sed -i "1 i DROP DATABASE IF EXISTS \`${db_name}\`;" ruoyi-gitlink.sql
-  sed -i "2 i CREATE DATABASE \`${db_name}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" ruoyi-gitlink.sql
-  sed -i "3 i USE \`${db_name}\`;" ruoyi-gitlink.sql
-}
-
-gen_docker_compose(){
-  # 替换docker-compose配置
-  cd "${orgin_path}"
-  # 删除历史docker-compose
-  rm -f docker-compose.yml
-  cp default_docker-compose.yml docker-compose.yml
-  sed -i "s|#docker_data|${docker_data}|g" docker-compose.yml
-  sed -i "s|#file_path|${file_path}|g" docker-compose.yml
-  sed -i "s|#mapping_nacos_port|${mapping_nacos_port}|g" docker-compose.yml
-  sed -i "s|#mapping_redis_port|${mapping_redis_port}|g" docker-compose.yml
-  sed -i "s|#mapping_gateway_port|${mapping_gateway_port}|g" docker-compose.yml
-  sed -i "s|#db_password|${db_password}|g" docker-compose.yml
-  sed -i "s|#db_name|${db_name}|g" docker-compose.yml
-  sed -i "s|#mapping_mysql_port|${mapping_mysql_port}|g" docker-compose.yml
-  # Nacos配置
-  sed -i "s|#NACOS_MYSQL_SERVICE_HOST|${NACOS_MYSQL_SERVICE_HOST}|g" docker-compose.yml
-  sed -i "s|#NACOS_SPRING_DATASOURCE_PLATFORM|${NACOS_SPRING_DATASOURCE_PLATFORM}|g" docker-compose.yml
-  sed -i "s|#NACOS_MYSQL_SERVICE_PORT|${NACOS_MYSQL_SERVICE_PORT}|g" docker-compose.yml
-  sed -i "s|#NACOS_MYSQL_SERVICE_DB_NAME|${NACOS_MYSQL_SERVICE_DB_NAME}|g" docker-compose.yml
-  sed -i "s|#NACOS_MYSQL_SERVICE_USER|${NACOS_MYSQL_SERVICE_USER}|g" docker-compose.yml
-  sed -i "s|#NACOS_MYSQL_SERVICE_PASSWORD|${NACOS_MYSQL_SERVICE_PASSWORD}|g" docker-compose.yml
-  sed -i "s|#NACOS_AUTH_ENABLE|${NACOS_AUTH_ENABLE}|g" docker-compose.yml
-  sed -i "s|#NACOS_AUTH_TOKEN|${NACOS_AUTH_TOKEN}|g" docker-compose.yml
-  sed -i "s|#NACOS_AUTH_IDENTITY_KEY|${NACOS_AUTH_IDENTITY_KEY}|g" docker-compose.yml
-  sed -i "s|#NACOS_AUTH_IDENTITY_VALUE|${NACOS_AUTH_IDENTITY_VALUE}|g" docker-compose.yml
-}
-
-gen_dockerfile(){
-  # 替换auth dockerfile配置
-  cd "${orgin_path}"/gitlink/auth
-  replace_dockerfile_config
-  # 替换gateway dockerfile配置
-  cd "${orgin_path}"/gitlink/gateway
-  replace_dockerfile_config
-  # 替换cms dockerfile配置
-  cd "${orgin_path}"/gitlink/modules/cms
-  replace_dockerfile_config
-  # 替换zone dockerfile配置
-  cd "${orgin_path}"/gitlink/modules/zone
-  replace_dockerfile_config
-  # 替换file dockerfile配置
-  cd "${orgin_path}"/gitlink/modules/file
-  replace_dockerfile_config
-  # 替换job dockerfile配置
-  cd "${orgin_path}"/gitlink/modules/job
-  replace_dockerfile_config
-  # 替换system dockerfile配置
-  cd "${orgin_path}"/gitlink/modules/system
-  replace_dockerfile_config
-}
-
-replace_dockerfile_config(){
-    # 删除历史docker-compose
-    rm -f dockerfile
-    cp default_dockerfile dockerfile
-    sed -i "s|#skywalking_backend_service|${skywalking_backend_service}|g" dockerfile
-    sed -i "s|#nacos_ip|${nacos_ip}|g" dockerfile
-    sed -i "s|#nacos_port|${nacos_port}|g" dockerfile
-    sed -i "s|#nacos_username|${nacos_username}|g" dockerfile
-    sed -i "s|#nacos_password|${nacos_password}|g" dockerfile
-    sed -i "s|#base_image_version|${base_image_version}|g" dockerfile
-    sed -i "s|#deploy_env|${deploy_env}|g" dockerfile
-    sed -i "s|#nacos_username|${nacos_username}|g" dockerfile
-    sed -i "s|#nacos_password|${nacos_password}|g" dockerfile
-}
-
-# 微服务模块编译
-build_maven(){
-      cd "${orgin_path}"/..
-        if [ -z "$server_name" ]; then
-          mvn clean
-          mvn package install -DskipTests
-        else
-          mvn clean install -pl  "$server_name" -am
-        fi
-
-}
-
-# 微服务模块编译
-build_zone_front(){
-      cd "${orgin_path}"/..
-      #判断前端项目文件夹是否已创建
-      if [ ! -d "ruoyi-react" ]; then
-        git clone git@code.gitlink.org.cn:Gitlink/ruoyi-react.git
-      fi
-      cd ./ruoyi-react
-        if [ "$env" = 'test' ]; then
-          echo "切换到develop分支"
-          git checkout  develop
-          git branch --set-upstream-to=origin/develop develop
-        else
-          echo "切换到master分支"
-          git checkout  master
-        fi
-      git pull
-      npm config set registry https://registry.npmmirror.com
-      npm install
-      npm run build
-}
-
-case "$env" in
-  "test")
-  # 获取测试环境配置文件中的安装信息
-  . ./test_config.profile
-  ;;
-  "prod")
-  . ./prod_config.profile
-  ;;
-  *)
-  	usage
-  ;;
-esac
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$2" in
-"build_base_image")
-	build_base_image
-;;
-"gen_gitlink_sql")
-	gen_gitlink_sql
-;;
-"gen_nacos_sql")
-	gen_nacos_sql
-;;
-"gen_nginx_config")
-	gen_nginx_config
-;;
-"gen_docker_compose")
-	gen_docker_compose
-;;
-"gen_dockerfile")
-	gen_dockerfile
-;;
-"build_maven")
-	build_maven
-;;
-"build_zone_front")
-	build_zone_front
-;;
-"test")
-	test1
-;;
-*)
-	usage
-;;
-esac
-

docker-gitlink/copy.sh

@@ -1,144 +0,0 @@
-#!/bin/sh
-current_env=$1
-# 复制项目的文件到对应docker路径，便于一键生成镜像。
-usage() {
-	echo "Usage: sh copy.sh [test|prod] [copy_jar|copy_config|copy_sql|copy_zone_front|copy_all]"
-	exit 1
-}
-
-copy_gateway(){
-  echo "begin copy ruoyi-gateway "
-  cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./gitlink/gateway/jar
-}
-copy_auth(){
-  echo "begin copy ruoyi-auth "
-  cp ../ruoyi-auth/target/ruoyi-auth.jar ./gitlink/auth/jar
-}
-copy_system(){
-  echo "begin copy ruoyi-modules-system "
-  cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./gitlink/modules/system/jar
-}
-copy_cms(){
-  echo "begin copy ruoyi-modules-cms "
-  cp ../ruoyi-modules/ruoyi-cms/target/ruoyi-modules-cms.jar ./gitlink/modules/cms/jar
-}
-copy_zone(){
-  echo "begin copy ruoyi-modules-zone "
-  cp ../ruoyi-modules/ruoyi-zone/target/ruoyi-modules-zone.jar ./gitlink/modules/zone/jar
-}
-copy_file(){
-  echo "begin copy ruoyi-modules-file "
-  cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./gitlink/modules/file/jar
-}
-copy_job(){
-  echo "begin copy ruoyi-modules-job "
-  cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./gitlink/modules/job/jar
-}
-
-
-copy_jar(){
-  # copy jar
-  copy_gateway
-  copy_auth
-  copy_system
-  copy_cms
-  copy_zone
-  copy_file
-  copy_job
-  copy_config
-  copy_sql
-}
-copy_config(){
-    # copy 配置文件
-    echo "begin copy config file "
-    rm -f "${docker_data}"/gitlink/nacos/conf/application.properties
-    mkdir -p "${docker_data}"/gitlink/nacos/conf/
-    cp ./nacos/conf/application.properties "${docker_data}"/gitlink/nacos/conf/application.properties
-
-    rm -f "${docker_data}"/gitlink/redis/conf/redis.conf
-    mkdir -p "${docker_data}"/gitlink/redis/conf/
-    cp ./redis/conf/redis.conf "${docker_data}"/gitlink/redis/conf/redis.conf
-
-    rm -f "${docker_data}"/gitlink/nginx/conf/nginx.conf
-    mkdir -p "${docker_data}"/gitlink/nginx/conf/
-    cp ./nginx/conf/nginx.conf "${docker_data}"/gitlink/nginx/conf/nginx.conf
-}
-copy_sql(){
-    # copy sql
-    echo "begin copy sql file "
-    rm -f "${docker_data}"/gitlink/mysql/ruoyi-gitlink.sql
-    mkdir -p "${docker_data}"/gitlink/mysql/
-    cp ./gitlink/sql/ruoyi-gitlink.sql "${docker_data}"/gitlink/mysql/ruoyi-gitlink.sql
-
-    rm -f "${docker_data}"/gitlink/mysql/gitlink-nacos-config.sql
-    mkdir -p "${docker_data}"/gitlink/mysql/
-    cp ./nacos/sql/gitlink-nacos-config.sql "${docker_data}"/gitlink/mysql/gitlink-nacos-config.sql
-}
-copy_zone_front(){
-  # copy 前端文件
-  echo "begin copy zone front file "
-  rm -rf "${docker_data}"/gitlink/nginx/html/zone_admin
-  mkdir -p "${docker_data}"/gitlink/nginx/html/
-  cp -r ../ruoyi-react/dist "${docker_data}"/gitlink/nginx/html/zone_admin
-}
-copy_all(){
-  copy_jar
-  copy_zone_front
-}
-
-case "$current_env" in
-  "test")
-  # 获取测试环境配置文件中的安装信息
-    . ./test_config.profile
-  ;;
-  "prod")
-    . ./prod_config.profile
-  ;;
-  *)
-  	usage
-  ;;
-esac
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$2" in
-"copy_gateway")
-	copy_gateway
-;;
-"copy_auth")
-	copy_auth
-;;
-"copy_system")
-	copy_system
-;;
-"copy_cms")
-	copy_cms
-;;
-"copy_zone")
-	copy_zone
-;;
-"copy_file")
-	copy_file
-;;
-"copy_job")
-	copy_job
-;;
-"copy_jar")
-	copy_jar
-;;
-"copy_config")
-	copy_config
-;;
-"copy_sql")
-	copy_sql
-;;
-"copy_zone_front")
-	copy_zone_front
-;;
-"copy_all")
-	copy_all
-;;
-*)
-	usage
-;;
-esac
-

docker-gitlink/default_docker-compose.yml

@@ -1,222 +0,0 @@
-version: '3.8'
-services:
-  gitlink-mysql:
-    image: mysql:5.7
-    container_name: gitlink-mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=#db_password
-      - MYSQL_DATABASE=#db_name
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/mysql/data:/var/lib/mysql
-      - #docker_data/gitlink/mysql/ruoyi-gitlink.sql:/docker-entrypoint-initdb.d/0001.sql
-      - #docker_data/gitlink/mysql/gitlink-nacos-config.sql:/docker-entrypoint-initdb.d/0002.sql
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    ports:
-      - "#mapping_mysql_port:3306"
-    restart: always
-  gitlink-nacos:
-    container_name: gitlink-nacos
-    image: nacos/nacos-server:v2.3.1
-    build:
-      context: ./nacos
-    environment:
-      - MODE=standalone
-      - TZ=Asia/Shanghai
-      - NACOS_AUTH_ENABLE=#NACOS_AUTH_ENABLE
-      - SPRING_DATASOURCE_PLATFORM=#NACOS_SPRING_DATASOURCE_PLATFORM
-      - MYSQL_SERVICE_HOST=#NACOS_MYSQL_SERVICE_HOST
-      - MYSQL_SERVICE_PORT=#NACOS_MYSQL_SERVICE_PORT
-      - MYSQL_SERVICE_DB_NAME=#NACOS_MYSQL_SERVICE_DB_NAME
-      - MYSQL_SERVICE_USER=#NACOS_MYSQL_SERVICE_USER
-      - MYSQL_SERVICE_PASSWORD=#NACOS_MYSQL_SERVICE_PASSWORD
-      - NACOS_AUTH_TOKEN=#NACOS_AUTH_TOKEN
-      - NACOS_AUTH_IDENTITY_KEY=#NACOS_AUTH_IDENTITY_KEY
-      - NACOS_AUTH_IDENTITY_VALUE=#NACOS_AUTH_IDENTITY_VALUE
-    volumes:
-      - #docker_data/gitlink/nacos/logs/:/home/nacos/logs
-    deploy:
-      resources:
-        limits:
-          memory: 1500m
-    links:
-      - gitlink-mysql
-    depends_on:
-      - gitlink-mysql
-    restart: always
-  gitlink-redis:
-    container_name: gitlink-redis
-    image: redis:5.0
-    build:
-      context: ./redis
-    environment:
-      - TZ=Asia/Shanghai
-    ports:
-      - "#mapping_redis_port:6379"
-    volumes:
-      - #docker_data/gitlink/redis/conf/redis.conf:/home/gitlink/redis/redis.conf
-      - #docker_data/gitlink/redis/data:/data
-    command: redis-server /home/gitlink/redis/redis.conf
-    deploy:
-      resources:
-        limits:
-          memory: 100m
-    restart: always
-  gitlink-nginx:
-    container_name: gitlink-nginx
-    image: nginx
-    build:
-      context: ./nginx
-    environment:
-      - TZ=Asia/Shanghai
-    ports:
-      - "#mapping_gateway_port:#mapping_gateway_port"
-      - "#mapping_nacos_port:8848"
-    volumes:
-      - #docker_data/gitlink/nginx/html/:/home/gitlink/projects/
-      - #docker_data/gitlink/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - #docker_data/gitlink/nginx/logs:/var/log/nginx
-      - #docker_data/gitlink/nginx/conf.d:/etc/nginx/conf.d
-    depends_on:
-      - gitlink-gateway
-    links:
-      - gitlink-gateway
-    deploy:
-      resources:
-        limits:
-          memory: 100m
-    restart: always
-  gitlink-gateway:
-    container_name: gitlink-gateway
-    build:
-      context: gitlink/gateway
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always
-  gitlink-auth:
-    container_name: gitlink-auth
-    build:
-      context: gitlink/auth
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always
-  gitlink-modules-system:
-    container_name: gitlink-modules-system
-    build:
-      context: gitlink/modules/system
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always
-  gitlink-modules-cms:
-    container_name: gitlink-modules-cms
-    build:
-      context: gitlink/modules/cms
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/uploadPath:#file_path
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always
-  gitlink-modules-zone:
-    container_name: gitlink-modules-zone
-    build:
-      context: gitlink/modules/zone
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always
-  gitlink-modules-file:
-    container_name: gitlink-modules-file
-    build:
-      context: gitlink/modules/file
-      dockerfile: dockerfile
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - #docker_data/gitlink/uploadPath:#file_path
-      - #docker_data/gitlink/logs:/home/gitlink/logs
-    depends_on:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    links:
-      - gitlink-redis
-      - gitlink-nacos
-      - gitlink-mysql
-    deploy:
-      resources:
-        limits:
-          memory: 700m
-    restart: always

docker-gitlink/deploy.sh

@@ -1,148 +0,0 @@
-#!/bin/sh
-
-server_name=$3
-
-# 使用说明，用来提示输入参数
-usage() {
-  echo -e "\e[91m错误：必须传入环境和方法两个参数 \e[0m"
-	echo "Usage: sh deploy.sh [test|prod] [port|build_base|mysql|base|build_modules|modules|build_nginx|nginx|stop|rm]"
-	exit 1
-}
-
-# 开启所需端口
-port(){
-	firewall-cmd --add-port=80/tcp --permanent
-	firewall-cmd --add-port=8080/tcp --permanent
-	firewall-cmd --add-port=8848/tcp --permanent
-	firewall-cmd --add-port=9848/tcp --permanent
-	firewall-cmd --add-port=9849/tcp --permanent
-	firewall-cmd --add-port=6379/tcp --permanent
-	firewall-cmd --add-port=3306/tcp --permanent
-	firewall-cmd --add-port=9110/tcp --permanent
-	firewall-cmd --add-port=9112/tcp --permanent
-	firewall-cmd --add-port=9113/tcp --permanent
-	firewall-cmd --add-port=9114/tcp --permanent
-	firewall-cmd --add-port=9115/tcp --permanent
-	firewall-cmd --add-port=9116/tcp --permanent
-	service firewalld restart
-}
-
-mysql(){
-  docker-compose  --compatibility up -d gitlink-mysql
-}
-
-# 编译基础环境（必须）
-build_base(){
-	docker-compose build --no-cache gitlink-redis gitlink-nacos
-}
-
-# 启动基础环境（必须）
-base(){
-	docker-compose  --compatibility up -d gitlink-redis gitlink-nacos
-}
-
-# 编译程序模块（必须）
-build_modules(){
-  if [ -z "$server_name" ]; then
-    docker-compose build --no-cache gitlink-gateway gitlink-auth gitlink-modules-system gitlink-modules-cms gitlink-modules-zone gitlink-modules-file
-  else
-    docker-compose build --no-cache "$server_name"
-  fi
-
-}
-
-# 启动程序模块（必须）
-modules(){
-    if [ -z "$server_name" ]; then
-      docker-compose --compatibility up -d gitlink-gateway gitlink-auth gitlink-modules-system gitlink-modules-cms gitlink-modules-zone gitlink-modules-file
-    else
-      docker-compose --compatibility up -d "$server_name"
-    fi
-}
-
-# 编译前端运行环境（必须）
-build_nginx(){
-	docker-compose build --no-cache gitlink-nginx
-}
-
-# 启动前端运行环境（必须）
-nginx(){
-	docker-compose --compatibility up -d gitlink-nginx
-}
-
-# 关闭所有环境/模块
-stop(){
-	docker-compose stop
-}
-# 关闭所有环境/模块
-stop_modules(){
-    if [ -z "$server_name" ]; then
-      docker-compose stop gitlink-gateway gitlink-auth gitlink-modules-system gitlink-modules-cms gitlink-modules-zone gitlink-modules-file
-    else
-      docker-compose stop  "$server_name"
-    fi
-
-}
-
-# 删除所有环境/模块
-rm(){
-    if [ -z "$server_name" ]; then
-      docker-compose rm -f
-    else
-      docker-compose rm  -f  "$server_name"
-    fi
-
-}
-# 根据输入参数，使用不同环境的配置文件
-case "$1" in
-  "test")
-  # 获取测试环境配置文件中的安装信息
-  . ./test_config.profile
-  ;;
-  "prod")
-  . ./prod_config.profile
-  ;;
-  *)
-  	usage
-  ;;
-esac
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$2" in
-"port")
-	port
-;;
-"mysql")
-	mysql
-;;
-"base")
-	base
-;;
-"build_base")
-	build_base
-;;
-"build_modules")
-	build_modules
-;;
-"modules")
-	modules
-;;
-"build_nginx")
-	build_nginx
-;;
-"nginx")
-	nginx
-;;
-"stop_modules")
-stop_modules
-;;
-"stop")
-	stop
-;;
-"rm")
-	rm
-;;
-*)
-	usage
-;;
-esac

docker-gitlink/dev_config.profile

@@ -1,96 +0,0 @@
-## 部署环境
-deploy_env=dev
-## 基础镜像版本
-base_image_version=1.0.0
-## Nacos数据库连接
-NACOS_SPRING_DATASOURCE_PLATFORM=mysql
-NACOS_MYSQL_SERVICE_HOST=127.0.0.1
-NACOS_MYSQL_SERVICE_PORT=3306
-NACOS_MYSQL_SERVICE_DB_NAME=gitlink-nacos-config
-NACOS_MYSQL_SERVICE_USER=root
-NACOS_MYSQL_SERVICE_PASSWORD=123456
-NACOS_AUTH_ENABLE=true
-NACOS_AUTH_TOKEN=RHBxaW5kTllsQ1dIUlJ6ZXM0ajdzUmgxbXJIMzVaZFFmbXlqNkw5c1dCNnBFd082V21EeFBtME5NazFYYnQwWW43ekZXQQ==
-NACOS_AUTH_IDENTITY_KEY=gitlink_key
-NACOS_AUTH_IDENTITY_VALUE=gitlink_value
-nacos_db_username=root
-nacos_db_password=123456
-## 连接Nacos配置
-nacos_ip=127.0.0.1
-nacos_port=8848
-nacos_username=nacos
-nacos_password=nacos
-## 连接Redis配置
-redis_ip=127.0.0.1
-redis_port=6379
-## 业务库数据源配置
-mysql_root_password=123456
-db_url=127.0.0.1:3306
-db_host=127.0.0.1
-db_name=ruoyi-gitlink
-db_username=root
-db_password=123456
-mapping_mysql_port=3306
-## GitLink库数据源配置
-gitlink_db_url=127.0.0.1:3306
-gitlink_db_name=test_gitlink_user
-gitlink_db_username=root
-gitlink_db_password=123456
-## 文件服务访问地址
-file_url=https://10.47.38.116:8080/file
-# 容器内文件上传路径
-file_path=/home/gitlink/uploadPath
-## 内容管理系统配置
-# 自动提取概要最大长度
-cms_summaryMaxLength=100
-# 特色专区项目组织名称
-cms_gitLinkOrganization=prefecture
-# 专区资讯详情路由
-cmsDetailPath=/newdetail
-# GitLink访问地址
-cms_gitLinkUrl=https://testforgeplus.trustie.net/
-## skywalking配置
-skywalking_backend_service=172.20.32.205:11800
-## Docker数据路径
-docker_data=/data/docker-data
-## Nacos映射端口
-mapping_nacos_port=8848
-## Redis映射端口
-mapping_redis_port=26379
-## Gateway映射端口
-mapping_gateway_port=8080
-## 专区相关配置
-# 邀请链接有效时长（单位：天）
-invitationLinkExpirationTime=10
-# 邀请确认页面
-invitationPagePath=/index
-# 消息模板
-messageTemplate=1428
-# 会员加入失败消息模板
-memberMessageTemplate=1428
-# 专区管理地址
-zoneAdminUrl=https://testgetway.trustie.net/zone/list
-# 专区首页前缀
-zoneHomepagePath=/zone
-# 专区会员后缀
-zoneMemberPath=/VIP
-# 专区配置地址
-zoneConfigurationUrl=http://127.0.0.1/zone/configuration
-# 专区资讯管理地址
-docManageUrl=http://127.0.0.1/zone/content/doc
-# 专区资源管理地址
-resourceManageUrl=http://127.0.0.1/zone/resource/resource
-# 项目聚合中，GitLink项目Id
-gitlinkProjectId=546714
-# 会员聚合中，gitlink用户名
-gitLinkUserName1=floraachy
-gitLinkUserName2=innov
-gitLinkUserName3=ttt77777
-gitLinkUserName4=OTTO
-## 网关地址
-gatewayUrl=http://127.0.0.1:8080
-## 内置gitlink管理员账号
-gitlinkAdminUsername=innov
-gitlinkAdminPassword=12345678
-gitlinkClientId=yllzwpMD2U5sAKHVnWbUiIZVpbp63DL7FleZi49uUXY
-gitlinkClientSecret=AdfaPHO_RJf3Tnz3n9xuCuYKpCt9Nioy9bYY6EJY7TI

docker-gitlink/gitlink/auth/default_dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-
-# 复制jar文件到路径
-COPY ./jar/ruoyi-auth.jar /home/gitlink/ruoyi-auth.jar
-# 启动认证服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-auth \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-auth.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/auth/jar/readme.txt

@@ -1 +0,0 @@
-存放认证中心打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/base/dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER gitlink
-# 挂载目录
-VOLUME /home/gitlink
-# 创建目录
-RUN mkdir -p /home/gitlink
-# 指定路径
-WORKDIR /home/gitlink
-# 复制skywalking-agent文件到路径
-ADD skywalking/skywalking-agent.tar.gz /home/gitlink/
-# 启动bash
-CMD ["/bin/bash"]

docker-gitlink/gitlink/gateway/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-gateway.jar /home/gitlink/ruoyi-gateway.jar
-# 启动网关服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-gateway \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-gateway.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/gateway/jar/readme.txt

@@ -1 +0,0 @@
-存放网关中心打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/modules/cms/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-modules-cms.jar /home/gitlink/ruoyi-modules-cms.jar
-# 启动系统服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-cms \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-modules-cms.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/modules/cms/jar/readme.txt

@@ -1 +0,0 @@
-存放内容管理服务打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/modules/file/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-modules-file.jar /home/gitlink/ruoyi-modules-file.jar
-# 启动文件服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-file \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-modules-file.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/modules/file/jar/readme.txt

@@ -1 +0,0 @@
-存放文件服务打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/modules/job/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-modules-job.jar /home/gitlink/ruoyi-modules-job.jar
-# 启动定时任务服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-job \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-modules-job.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/modules/job/jar/readme.txt

@@ -1 +0,0 @@
-存放定时任务服务打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/modules/system/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-modules-system.jar /home/gitlink/ruoyi-modules-system.jar
-# 启动系统服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-system \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-modules-system.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/modules/system/jar/readme.txt

@@ -1 +0,0 @@
-存放系统服务打包好的jar文件，用于docker启动应用。

docker-gitlink/gitlink/modules/zone/default_dockerfile

@@ -1,14 +0,0 @@
-# 基础镜像
-FROM  gitlink-java:#base_image_version
-# 复制jar文件到路径
-COPY ./jar/ruoyi-modules-zone.jar /home/gitlink/ruoyi-modules-zone.jar
-# 启动系统服务
-ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
-    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-zone \
-    -Dskywalking.collector.backend_service=#skywalking_backend_service \
-    -jar ruoyi-modules-zone.jar \
-    --nacos_ip=#nacos_ip \
-    --nacos_port=#nacos_port \
-    --nacos_username=#nacos_username \
-    --nacos_password=#nacos_password \
-    --spring.profiles.active=prod

docker-gitlink/gitlink/modules/zone/jar/readme.txt

@@ -1 +0,0 @@
-存放内容管理服务打包好的jar文件，用于docker启动应用。

docker-gitlink/nacos/dockerfile

@@ -1,4 +0,0 @@
-# 基础镜像
-FROM nacos/nacos-server:v2.3.1
-# author
-MAINTAINER gitlink

docker-gitlink/nacos/sql/default_gitlink-nacos-config.sql

@@ -1,424 +0,0 @@
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for config_info
--- ----------------------------
-DROP TABLE IF EXISTS `config_info`;
-CREATE TABLE `config_info`
-(
-    `id`                 bigint(20)                                       NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `data_id`            varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id',
-    `group_id`           varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL,
-    `content`            longtext CHARACTER SET utf8 COLLATE utf8_bin     NOT NULL COMMENT 'content',
-    `md5`                varchar(32) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL COMMENT 'md5',
-    `gmt_create`         datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `gmt_modified`       datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `src_user`           text CHARACTER SET utf8 COLLATE utf8_bin         NULL COMMENT 'source user',
-    `src_ip`             varchar(50) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL COMMENT 'source ip',
-    `app_name`           varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL,
-    `tenant_id`          varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT '' COMMENT '租户字段',
-    `c_desc`             varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL,
-    `c_use`              varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL,
-    `effect`             varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL,
-    `type`               varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL,
-    `c_schema`           text CHARACTER SET utf8 COLLATE utf8_bin         NULL,
-    `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin         NULL COMMENT '秘钥',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_configinfo_datagrouptenant` (`data_id`, `group_id`, `tenant_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 55
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = 'config_info'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of config_info
--- ----------------------------
-INSERT INTO `config_info`
-VALUES (1, 'application-prod.yml', 'DEFAULT_GROUP',
-        'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n\nhttp:\n  #最大连接数\n  maxTotal: 100\n  #并发数\n  defaultMaxPerRoute: 20\n  #创建连接的最长时间\n  connectTimeout: 1000\n  #从连接池中获取到连接的最长时间\n  connectionRequestTimeout: 500\n  #数据传输的最长时间\n  socketTimeout: 10000\n  #提交请求前测试连接是否可用\n  staleConnectionCheckEnabled: true\n  #gitlink请求地址\n  gitLinkUrl: #cms_gitLinkUrl\n  #网关请求地址\n  gatewayUrl: #gatewayUrl\n\nswagger:\n  host: #gatewayUrl/api\n\ngitlink:\n  admin_user:\n    username: #gitlinkAdminUsername\n    password: #gitlinkAdminPassword\n    client_id: #gitlinkClientId\n    client_secret: #gitlinkClientSecret\n',
-        '5f9b789aa22c2418a629ca812a0b6176', '2020-05-20 12:00:00', '2023-12-08 09:24:50', 'nacos', '172.18.0.1', '', '',
-        '通用配置', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (2, 'ruoyi-gateway-prod.yml', 'DEFAULT_GROUP',
-        'spring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  cloud:\n    gateway:\n      globalcors: #跨域问题\n        cors-configurations:\n          \'[/**]\':\n            allowedOriginPatterns:\n              - \"*\"\n            allowedHeaders:\n              - \"*\"\n            allowCredentials: true\n            maxAge: 360000\n            allowedMethods:\n              - GET\n              - POST\n              - DELETE\n              - PUT\n              - OPTIONS\n              - HEAD\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: ruoyi-auth\n          uri: lb://ruoyi-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: ruoyi-gen\n          uri: lb://ruoyi-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: ruoyi-job\n          uri: lb://ruoyi-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: ruoyi-system\n          uri: lb://ruoyi-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: ruoyi-file\n          uri: lb://ruoyi-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 内容管理服务\n        - id: ruoyi-cms\n          uri: lb://ruoyi-cms\n          predicates:\n            - Path=/cms/**\n          filters:\n            - StripPrefix=1\n            \n        # 特色专区服务\n        - id: ruoyi-zone\n          uri: lb://ruoyi-zone\n          predicates:\n            - Path=/zone/**\n          filters:\n            - StripPrefix=1\n\n        # 项目管理服务\n        - id: ruoyi-pms\n          uri: lb://ruoyi-pms\n          predicates:\n            - Path=/pms/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n      - /profile/**\n      - /cms/blog/cms/**\n      - /cms/message/cms/**\n      - /cms/comment/cms/**\n      - /file/statics/**\n      - /cms/doc/open/**\n      - /zone/open/**\n      - /file/open/**\n',
-        '22aff6c040e82ae8ad57a83170ffc15d', '2020-05-14 14:17:55', '2023-12-07 15:06:06', 'nacos', '172.18.0.1', '', '',
-        '网关模块', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (3, 'ruoyi-auth-prod.yml', 'DEFAULT_GROUP',
-        'spring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n',
-        'fa91c345f1bf98f36d1f4d6fe24cb925', '2020-11-20 00:00:00', '2023-04-26 16:27:42', 'nacos', '172.18.0.1', '', '',
-        '认证中心', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (5, 'ruoyi-system-prod.yml', 'DEFAULT_GROUP',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n          # 从库数据源\n          slave:\n            username: #gitlink_db_username\n            password: #gitlink_db_password\n            url: jdbc:mysql://#gitlink_db_url/#gitlink_db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            driver-class-name: com.mysql.cj.jdbc.Driver\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip',
-        '0530f34dae0dd2f3d905b66334e438a2', '2020-11-20 00:00:00', '2023-04-26 16:28:09', 'nacos', '172.18.0.1', '', '',
-        '系统模块', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (7, 'ruoyi-job-prod.yml', 'DEFAULT_GROUP',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password: \n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: #db_username\n    password: #db_password\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.job.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 定时任务接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip\n',
-        '70213ed62c6a9fc42cd652c11556483e', '2020-11-20 00:00:00', '2023-04-26 16:28:25', 'nacos', '172.18.0.1', '', '',
-        '定时任务', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (8, 'ruoyi-file-prod.yml', 'DEFAULT_GROUP',
-        '# 本地文件上传    \nfile:\n    domain: #file_url\n    path: #file_path\n    prefix: /statics\n    # 允许的文件后缀(该格式允许通过静态资源直接访问)\n    allowedExtension: gif,jfif,svg,webp,bmp,gif,jpg,jpeg,png\n    # cms允许的文件后缀\n    cmsAllowedExtension: gif,jfif,svg,webp,bmp,gif,jpg,jpeg,png,mp4,avi,rmvb,mov,wmv,flv,webm,mkv\n    # 允许的最大文件大小（单位MB）\n    maxSize: 200\n    # 文件名最大长度\n    maxNameSize: 100\n\n# FastDFS配置\nfdfs:\n  domain: http://8.129.231.12\n  soTimeout: 3000\n  connectTimeout: 2000\n  trackerList: 8.129.231.12:22122\n\n# Minio配置\nminio:\n  url: http://8.129.231.12:9000\n  accessKey: minioadmin\n  secretKey: minioadmin\n  bucketName: test\n# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.file\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl',
-        'a63f9934c3961d24333cb58592457d6a', '2020-11-20 00:00:00', '2023-12-07 15:08:54', 'nacos', '172.18.0.1', '', '',
-        '文件服务', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (9, 'sentinel-ruoyi-gateway', 'DEFAULT_GROUP',
-        '[\r\n    {\r\n        \"resource\": \"ruoyi-auth\",\r\n        \"count\": 500,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"ruoyi-system\",\r\n        \"count\": 1000,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"ruoyi-gen\",\r\n        \"count\": 200,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"ruoyi-job\",\r\n        \"count\": 300,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    }\r\n]',
-        '9f3a3069261598f74220bc47958ec252', '2020-11-20 00:00:00', '2020-11-20 00:00:00', NULL, '0:0:0:0:0:0:0:1', '',
-        '', '限流策略', 'null', 'null', 'json', NULL, '');
-INSERT INTO `config_info`
-VALUES (14, 'ruoyi-cms-prod.yml', 'DEFAULT_GROUP',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n          # 从库数据源\n          # slave:\n          #   username: root\n          #   password: Trust_#%01\n          #   url: jdbc:mysql://173.15.15.83:3306/testjunkenewweb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n          #   driver-class-name: com.mysql.cj.jdbc.Driver\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.cms\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n\n# swagger配置\nswagger:\n  title: 内容管理模块接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip\n\ncms:\n  summaryMaxLength: #cms_summaryMaxLength\n  gitLinkOrganization: #cms_gitLinkOrganization\n  #专区资讯详情路由\n  detailPath: #cmsDetailPath\n',
-        '7107b9b8e369432a754cfd7ac8d0fdcd', '2023-03-21 14:26:45', '2023-12-07 15:09:25', 'nacos', '172.18.0.1', '', '',
-        '', '', '', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (45, 'ruoyi-zone-prod.yml', 'DEFAULT_GROUP',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.zone\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n\n# swagger配置\nswagger:\n  title: 内容管理模块接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip\n\nzone:\n  #邀请链接有效时长（单位：天）\n  invitationLinkExpirationTime: #invitationLinkExpirationTime\n  #邀请确认页面\n  invitationPagePath: #invitationPagePath\n  #消息模板\n  messageTemplate: #messageTemplate\n  #会员加入失败消息模板\n  memberMessageTemplate: #memberMessageTemplate\n  #专区管理地址\n  zoneAdminUrl: #zoneAdminUrl\n  #专区首页前缀\n  zoneHomepagePath: #zoneHomepagePath\n  #专区会员后缀\n  zoneMemberPath: #zoneMemberPath\n  #后台管理地址\n  adminUrl: #adminUrl\n  #专区配置地址\n  zoneConfigurationUrl: #zoneConfigurationUrl\n  #专区资讯管理地址\n  docManageUrl: #docManageUrl\n  #专区资源管理地址\n  resourceManageUrl: #resourceManageUrl\n  #专区初始化数据\n  initData:\n    #项目聚合中，GitLink项目Id\n    gitlinkProjectId: #gitlinkProjectId\n    #会员聚合中，gitlink用户名\n    gitLinkUserName1: #gitLinkUserName1\n    gitLinkUserName2: #gitLinkUserName2\n    gitLinkUserName3: #gitLinkUserName3\n    gitLinkUserName4: #gitLinkUserName4',
-        'd54d4255749d67f314e3985176e26624', '2023-05-16 09:05:57', '2023-12-07 15:12:49', 'nacos', '172.18.0.1', '', '',
-        '', '', '', 'yaml', '', '');
-INSERT INTO `config_info`
-VALUES (52, 'ruoyi-pms-prod.yml', 'DEFAULT_GROUP',
-        '# spring配置\r\nspring:\r\n  redis:\r\n    host: #redis_ip\r\n    port: #redis_port\r\n    password:\r\n  datasource:\r\n    druid:\r\n      stat-view-servlet:\r\n        enabled: true\r\n        loginUsername: admin\r\n        loginPassword: 123456\r\n    dynamic:\r\n      druid:\r\n        initial-size: 5\r\n        min-idle: 5\r\n        maxActive: 20\r\n        maxWait: 60000\r\n        timeBetweenEvictionRunsMillis: 60000\r\n        minEvictableIdleTimeMillis: 300000\r\n        validationQuery: SELECT 1 FROM DUAL\r\n        testWhileIdle: true\r\n        testOnBorrow: false\r\n        testOnReturn: false\r\n        poolPreparedStatements: true\r\n        maxPoolPreparedStatementPerConnectionSize: 20\r\n        filters: stat,slf4j\r\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n      datasource:\r\n          # 主库数据源\r\n          master:\r\n            driver-class-name: com.mysql.cj.jdbc.Driver\r\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n            username: #db_username\r\n            password: #db_password\r\n\r\n# mybatis配置\r\nmybatis:\r\n    # 搜索指定包别名\r\n    typeAliasesPackage: com.ruoyi.pms\r\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n    mapperLocations: classpath:mapper/**/*.xml\r\n    configuration:\r\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\r\n\r\n# swagger配置\r\nswagger:\r\n  title: 项目管理模块接口文档\r\n  license: Powered By ruoyi\r\n  licenseUrl: https://ruoyi.vip',
-        '375d4b57eaf365c384f8baedc0c15092', '2023-12-07 15:16:03', '2023-12-07 15:16:03', NULL, '172.18.0.1', '', '',
-        NULL, NULL, NULL, 'yaml', NULL, '');
-
--- ----------------------------
--- Table structure for config_info_aggr
--- ----------------------------
-DROP TABLE IF EXISTS `config_info_aggr`;
-CREATE TABLE `config_info_aggr`
-(
-    `id`           bigint(20)                                       NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `data_id`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id',
-    `group_id`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id',
-    `datum_id`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'datum_id',
-    `content`      longtext CHARACTER SET utf8 COLLATE utf8_bin     NOT NULL COMMENT '内容',
-    `gmt_modified` datetime                                         NOT NULL COMMENT '修改时间',
-    `app_name`     varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-    `tenant_id`    varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_configinfoaggr_datagrouptenantdatum` (`data_id`, `group_id`, `tenant_id`, `datum_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = '增加租户字段'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of config_info_aggr
--- ----------------------------
-
--- ----------------------------
--- Table structure for config_info_beta
--- ----------------------------
-DROP TABLE IF EXISTS `config_info_beta`;
-CREATE TABLE `config_info_beta`
-(
-    `id`                 bigint(20)                                        NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `data_id`            varchar(255) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL COMMENT 'data_id',
-    `group_id`           varchar(128) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL COMMENT 'group_id',
-    `app_name`           varchar(128) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL COMMENT 'app_name',
-    `content`            longtext CHARACTER SET utf8 COLLATE utf8_bin      NOT NULL COMMENT 'content',
-    `beta_ips`           varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL COMMENT 'betaIps',
-    `md5`                varchar(32) CHARACTER SET utf8 COLLATE utf8_bin   NULL     DEFAULT NULL COMMENT 'md5',
-    `gmt_create`         datetime                                          NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `gmt_modified`       datetime                                          NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `src_user`           text CHARACTER SET utf8 COLLATE utf8_bin          NULL COMMENT 'source user',
-    `src_ip`             varchar(50) CHARACTER SET utf8 COLLATE utf8_bin   NULL     DEFAULT NULL COMMENT 'source ip',
-    `tenant_id`          varchar(128) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT '' COMMENT '租户字段',
-    `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin          NULL COMMENT '秘钥',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_configinfobeta_datagrouptenant` (`data_id`, `group_id`, `tenant_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = 'config_info_beta'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of config_info_beta
--- ----------------------------
-
--- ----------------------------
--- Table structure for config_info_tag
--- ----------------------------
-DROP TABLE IF EXISTS `config_info_tag`;
-CREATE TABLE `config_info_tag`
-(
-    `id`           bigint(20)                                       NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `data_id`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id',
-    `group_id`     varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id',
-    `tenant_id`    varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT '' COMMENT 'tenant_id',
-    `tag_id`       varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'tag_id',
-    `app_name`     varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL COMMENT 'app_name',
-    `content`      longtext CHARACTER SET utf8 COLLATE utf8_bin     NOT NULL COMMENT 'content',
-    `md5`          varchar(32) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL COMMENT 'md5',
-    `gmt_create`   datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `gmt_modified` datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `src_user`     text CHARACTER SET utf8 COLLATE utf8_bin         NULL COMMENT 'source user',
-    `src_ip`       varchar(50) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL COMMENT 'source ip',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_configinfotag_datagrouptenanttag` (`data_id`, `group_id`, `tenant_id`, `tag_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = 'config_info_tag'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of config_info_tag
--- ----------------------------
-
--- ----------------------------
--- Table structure for config_tags_relation
--- ----------------------------
-DROP TABLE IF EXISTS `config_tags_relation`;
-CREATE TABLE `config_tags_relation`
-(
-    `id`        bigint(20)                                       NOT NULL COMMENT 'id',
-    `tag_name`  varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'tag_name',
-    `tag_type`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NULL DEFAULT NULL COMMENT 'tag_type',
-    `data_id`   varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'data_id',
-    `group_id`  varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'group_id',
-    `tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_id',
-    `nid`       bigint(20)                                       NOT NULL AUTO_INCREMENT,
-    PRIMARY KEY (`nid`) USING BTREE,
-    UNIQUE INDEX `uk_configtagrelation_configidtag` (`id`, `tag_name`, `tag_type`) USING BTREE,
-    INDEX `idx_tenant_id` (`tenant_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = 'config_tag_relation'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of config_tags_relation
--- ----------------------------
-
--- ----------------------------
--- Table structure for group_capacity
--- ----------------------------
-DROP TABLE IF EXISTS `group_capacity`;
-CREATE TABLE `group_capacity`
-(
-    `id`                bigint(20) UNSIGNED                              NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `group_id`          varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群',
-    `quota`             int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '配额，0表示使用默认值',
-    `usage`             int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '使用量',
-    `max_size`          int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
-    `max_aggr_count`    int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数，，0表示使用默认值',
-    `max_aggr_size`     int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
-    `max_history_count` int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '最大变更历史数量',
-    `gmt_create`        datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `gmt_modified`      datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_group_id` (`group_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = '集群、各Group容量信息表'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of group_capacity
--- ----------------------------
-
--- ----------------------------
--- Table structure for his_config_info
--- ----------------------------
-DROP TABLE IF EXISTS `his_config_info`;
-CREATE TABLE `his_config_info`
-(
-    `id`                 bigint(64) UNSIGNED                              NOT NULL,
-    `nid`                bigint(20) UNSIGNED                              NOT NULL AUTO_INCREMENT,
-    `data_id`            varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-    `group_id`           varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-    `app_name`           varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT NULL COMMENT 'app_name',
-    `content`            longtext CHARACTER SET utf8 COLLATE utf8_bin     NOT NULL,
-    `md5`                varchar(32) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL,
-    `gmt_create`         datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `gmt_modified`       datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `src_user`           text CHARACTER SET utf8 COLLATE utf8_bin         NULL,
-    `src_ip`             varchar(50) CHARACTER SET utf8 COLLATE utf8_bin  NULL     DEFAULT NULL,
-    `op_type`            char(10) CHARACTER SET utf8 COLLATE utf8_bin     NULL     DEFAULT NULL,
-    `tenant_id`          varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL     DEFAULT '' COMMENT '租户字段',
-    `encrypted_data_key` text CHARACTER SET utf8 COLLATE utf8_bin         NULL COMMENT '秘钥',
-    PRIMARY KEY (`nid`) USING BTREE,
-    INDEX `idx_gmt_create` (`gmt_create`) USING BTREE,
-    INDEX `idx_gmt_modified` (`gmt_modified`) USING BTREE,
-    INDEX `idx_did` (`data_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 10
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = '多租户改造'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of his_config_info
--- ----------------------------
-INSERT INTO `his_config_info`
-VALUES (1, 1, 'application-prod.yml', 'DEFAULT_GROUP', '',
-        'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n\n\nhttp:\n  #最大连接数\n  maxTotal: 100\n  #并发数\n  defaultMaxPerRoute: 20\n  #创建连接的最长时间\n  connectTimeout: 1000\n  #从连接池中获取到连接的最长时间\n  connectionRequestTimeout: 500\n  #数据传输的最长时间\n  socketTimeout: 10000\n  #提交请求前测试连接是否可用\n  staleConnectionCheckEnabled: true\n  #gitlink请求地址\n  gitLinkUrl: #cms_gitLinkUrl\n',
-        '0466a4b215975b0659266be39de36b15', '2023-12-07 15:02:44', '2023-12-07 15:02:45', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (2, 2, 'ruoyi-gateway-prod.yml', 'DEFAULT_GROUP', '',
-        'spring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  cloud:\n    gateway:\n      globalcors: #跨域问题\n        cors-configurations:\n          \'[/**]\':\n            allowedOriginPatterns:\n              - \"*\"\n            allowedHeaders:\n              - \"*\"\n            allowCredentials: true\n            maxAge: 360000\n            allowedMethods:\n              - GET\n              - POST\n              - DELETE\n              - PUT\n              - OPTIONS\n              - HEAD\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: ruoyi-auth\n          uri: lb://ruoyi-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: ruoyi-gen\n          uri: lb://ruoyi-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: ruoyi-job\n          uri: lb://ruoyi-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: ruoyi-system\n          uri: lb://ruoyi-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: ruoyi-file\n          uri: lb://ruoyi-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 内容管理服务\n        - id: ruoyi-cms\n          uri: lb://ruoyi-cms\n          predicates:\n            - Path=/cms/**\n          filters:\n            - StripPrefix=1\n        # 特色专区服务\n        - id: ruoyi-zone\n          uri: lb://ruoyi-zone\n          predicates:\n            - Path=/zone/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n      - /profile/**\n      - /cms/blog/cms/**\n      - /cms/message/cms/**\n      - /cms/comment/cms/**\n      - /file/statics/**\n      - /cms/doc/open/**\n      - /zone/open/**\n',
-        'dedf84995bd0ece580befa5ca05e79d0', '2023-12-07 15:06:05', '2023-12-07 15:06:06', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (1, 3, 'application-prod.yml', 'DEFAULT_GROUP', '',
-        'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n\n\nhttp:\n  #最大连接数\n  maxTotal: 100\n  #并发数\n  defaultMaxPerRoute: 20\n  #创建连接的最长时间\n  connectTimeout: 1000\n  #从连接池中获取到连接的最长时间\n  connectionRequestTimeout: 500\n  #数据传输的最长时间\n  socketTimeout: 10000\n  #提交请求前测试连接是否可用\n  staleConnectionCheckEnabled: true\n  #gitlink请求地址\n  gitLinkUrl: #cms_gitLinkUrl\n  #网关请求地址\n  gatewayUrl: #gatewayUrl\n\ngitlink:\n  admin_user:\n    username: #gitlinkAdminUsername\n    password: #gitlinkAdminPassword\n    client_id: #gitlinkClientId\n    client_secret: #gitlinkClientSecret\n',
-        'ac2b302f7b4f774a8458905b84dac26a', '2023-12-07 15:06:33', '2023-12-07 15:06:34', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (8, 4, 'ruoyi-file-prod.yml', 'DEFAULT_GROUP', '',
-        '# 本地文件上传    \nfile:\n    domain: #file_url\n    path: #file_path\n    prefix: /statics\n\n# FastDFS配置\nfdfs:\n  domain: http://8.129.231.12\n  soTimeout: 3000\n  connectTimeout: 2000\n  trackerList: 8.129.231.12:22122\n\n# Minio配置\nminio:\n  url: http://8.129.231.12:9000\n  accessKey: minioadmin\n  secretKey: minioadmin\n  bucketName: test',
-        '1ca67f615144b6dae3d1fcc437c1e681', '2023-12-07 15:08:53', '2023-12-07 15:08:54', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (14, 5, 'ruoyi-cms-prod.yml', 'DEFAULT_GROUP', '',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n          # 从库数据源\n          # slave:\n          #   username: root\n          #   password: Trust_#%01\n          #   url: jdbc:mysql://173.15.15.83:3306/testjunkenewweb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n          #   driver-class-name: com.mysql.cj.jdbc.Driver\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.cms\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n\n# swagger配置\nswagger:\n  title: 内容管理模块接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip\n\ncms:\n  summaryMaxLength: #cms_summaryMaxLength\n  gitLinkOrganization: #cms_gitLinkOrganization\n',
-        '9966bd2f7023b0c8fdb01d2f57e484e3', '2023-12-07 15:09:24', '2023-12-07 15:09:25', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (45, 6, 'ruoyi-zone-prod.yml', 'DEFAULT_GROUP', '',
-        '# spring配置\nspring:\n  redis:\n    host: #redis_ip\n    port: #redis_port\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: #db_username\n            password: #db_password\n          # 从库数据源\n          # slave:\n          #   username: root\n          #   password: Trust_#%01\n          #   url: jdbc:mysql://173.15.15.83:3306/testjunkenewweb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n          #   driver-class-name: com.mysql.cj.jdbc.Driver\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.zone\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n    configuration:\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n\n# swagger配置\nswagger:\n  title: 内容管理模块接口文档\n  license: Powered By ruoyi\n  licenseUrl: https://ruoyi.vip\n\nzone:\n  #邀请链接有效时长（单位：天）\n  invitationLinkExpirationTime: #invitationLinkExpirationTime\n  #邀请确认页面\n  invitationPagePath: #invitationPagePath\n  #消息模板\n  messageTemplate: #messageTemplate\n  #专区管理地址\n  zoneAdminUrl: #zoneAdminUrl\n  #专区初始化数据\n  initData:\n    #项目聚合中，GitLink项目Id\n    gitlinkProjectId: #gitlinkProjectId\n    #会员聚合中，gitlink用户名\n    gitLinkUserName1: #gitLinkUserName1\n    gitLinkUserName2: #gitLinkUserName2\n    gitLinkUserName3: #gitLinkUserName3\n    gitLinkUserName4: #gitLinkUserName4',
-        'd4b72950712cff61d20a4739ec617c16', '2023-12-07 15:12:49', '2023-12-07 15:12:49', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (0, 7, 'ruoyi-pms-prod.yml', 'DEFAULT_GROUP', '',
-        '# spring配置\r\nspring:\r\n  redis:\r\n    host: #redis_ip\r\n    port: #redis_port\r\n    password:\r\n  datasource:\r\n    druid:\r\n      stat-view-servlet:\r\n        enabled: true\r\n        loginUsername: admin\r\n        loginPassword: 123456\r\n    dynamic:\r\n      druid:\r\n        initial-size: 5\r\n        min-idle: 5\r\n        maxActive: 20\r\n        maxWait: 60000\r\n        timeBetweenEvictionRunsMillis: 60000\r\n        minEvictableIdleTimeMillis: 300000\r\n        validationQuery: SELECT 1 FROM DUAL\r\n        testWhileIdle: true\r\n        testOnBorrow: false\r\n        testOnReturn: false\r\n        poolPreparedStatements: true\r\n        maxPoolPreparedStatementPerConnectionSize: 20\r\n        filters: stat,slf4j\r\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n      datasource:\r\n          # 主库数据源\r\n          master:\r\n            driver-class-name: com.mysql.cj.jdbc.Driver\r\n            url: jdbc:mysql://#db_url/#db_name?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n            username: #db_username\r\n            password: #db_password\r\n\r\n# mybatis配置\r\nmybatis:\r\n    # 搜索指定包别名\r\n    typeAliasesPackage: com.ruoyi.pms\r\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n    mapperLocations: classpath:mapper/**/*.xml\r\n    configuration:\r\n      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\r\n\r\n# swagger配置\r\nswagger:\r\n  title: 项目管理模块接口文档\r\n  license: Powered By ruoyi\r\n  licenseUrl: https://ruoyi.vip',
-        '375d4b57eaf365c384f8baedc0c15092', '2023-12-07 15:16:03', '2023-12-07 15:16:03', NULL, '172.18.0.1', 'I', '',
-        '');
-INSERT INTO `his_config_info`
-VALUES (1, 8, 'application-prod.yml', 'DEFAULT_GROUP', '',
-        'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n\nhttp:\n  #最大连接数\n  maxTotal: 100\n  #并发数\n  defaultMaxPerRoute: 20\n  #创建连接的最长时间\n  connectTimeout: 1000\n  #从连接池中获取到连接的最长时间\n  connectionRequestTimeout: 500\n  #数据传输的最长时间\n  socketTimeout: 10000\n  #提交请求前测试连接是否可用\n  staleConnectionCheckEnabled: true\n  #gitlink请求地址\n  gitLinkUrl: #cms_gitLinkUrl\n  #网关请求地址\n  gatewayUrl: #gatewayUrl\n\ngitlink:\n  admin_user:\n    username: #gitlinkAdminUsername\n    password: #gitlinkAdminPassword\n    client_id: #gitlinkClientId\n    client_secret: #gitlinkClientSecret\n',
-        '37eac228d7bf07256764e6c374a6abea', '2023-12-08 09:24:43', '2023-12-08 09:24:43', 'nacos', '172.18.0.1', 'U',
-        '', '');
-INSERT INTO `his_config_info`
-VALUES (1, 9, 'application-prod.yml', 'DEFAULT_GROUP', '',
-        'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n  servlet:\n    multipart:\n      max-file-size: 100MB\n      max-request-size: 100MB\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n\nhttp:\n  #最大连接数\n  maxTotal: 100\n  #并发数\n  defaultMaxPerRoute: 20\n  #创建连接的最长时间\n  connectTimeout: 1000\n  #从连接池中获取到连接的最长时间\n  connectionRequestTimeout: 500\n  #数据传输的最长时间\n  socketTimeout: 10000\n  #提交请求前测试连接是否可用\n  staleConnectionCheckEnabled: true\n  #gitlink请求地址\n  gitLinkUrl: #cms_gitLinkUrl\n  #网关请求地址\n  gatewayUrl: #gatewayUrl\n\nswagger:\n  host: #gatewayUrl/api\n\ngitlink:\n  admin_user:\n    username: #gitlinkAdminUsername\n    password: #gitlinkAdminPassword\n    client_id: #gitlinkClientId\n    client_secret: #gitlinkClientSecret\n',
-        '5f9b789aa22c2418a629ca812a0b6176', '2023-12-08 09:24:50', '2023-12-08 09:24:50', 'nacos', '172.18.0.1', 'U',
-        '', '');
-
--- ----------------------------
--- Table structure for permissions
--- ----------------------------
-DROP TABLE IF EXISTS `permissions`;
-CREATE TABLE `permissions`
-(
-    `role`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL,
-    `resource` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    `action`   varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NOT NULL,
-    UNIQUE INDEX `uk_role_permission` (`role`, `resource`, `action`) USING BTREE
-) ENGINE = InnoDB
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_general_ci
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of permissions
--- ----------------------------
-
--- ----------------------------
--- Table structure for roles
--- ----------------------------
-DROP TABLE IF EXISTS `roles`;
-CREATE TABLE `roles`
-(
-    `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    `role`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    UNIQUE INDEX `idx_user_role` (`username`, `role`) USING BTREE
-) ENGINE = InnoDB
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_general_ci
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of roles
--- ----------------------------
-INSERT INTO `roles`
-VALUES ('nacos', 'ROLE_ADMIN');
-
--- ----------------------------
--- Table structure for tenant_capacity
--- ----------------------------
-DROP TABLE IF EXISTS `tenant_capacity`;
-CREATE TABLE `tenant_capacity`
-(
-    `id`                bigint(20) UNSIGNED                              NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `tenant_id`         varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Tenant ID',
-    `quota`             int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '配额，0表示使用默认值',
-    `usage`             int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '使用量',
-    `max_size`          int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
-    `max_aggr_count`    int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '聚合子配置最大个数',
-    `max_aggr_size`     int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
-    `max_history_count` int(10) UNSIGNED                                 NOT NULL DEFAULT 0 COMMENT '最大变更历史数量',
-    `gmt_create`        datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `gmt_modified`      datetime                                         NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_tenant_id` (`tenant_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = '租户容量信息表'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of tenant_capacity
--- ----------------------------
-
--- ----------------------------
--- Table structure for tenant_info
--- ----------------------------
-DROP TABLE IF EXISTS `tenant_info`;
-CREATE TABLE `tenant_info`
-(
-    `id`            bigint(20)                                       NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `kp`            varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'kp',
-    `tenant_id`     varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_id',
-    `tenant_name`   varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT 'tenant_name',
-    `tenant_desc`   varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'tenant_desc',
-    `create_source` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin  NULL DEFAULT NULL COMMENT 'create_source',
-    `gmt_create`    bigint(20)                                       NOT NULL COMMENT '创建时间',
-    `gmt_modified`  bigint(20)                                       NOT NULL COMMENT '修改时间',
-    PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `uk_tenant_info_kptenantid` (`kp`, `tenant_id`) USING BTREE,
-    INDEX `idx_tenant_id` (`tenant_id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 1
-  CHARACTER SET = utf8
-  COLLATE = utf8_bin COMMENT = 'tenant_info'
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of tenant_info
--- ----------------------------
-
--- ----------------------------
--- Table structure for users
--- ----------------------------
-DROP TABLE IF EXISTS `users`;
-CREATE TABLE `users`
-(
-    `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL,
-    `password` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    `enabled`  tinyint(1)                                                    NOT NULL,
-    PRIMARY KEY (`username`) USING BTREE
-) ENGINE = InnoDB
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_general_ci
-  ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of users
--- ----------------------------
-INSERT INTO `users`
-VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1);
-
-SET FOREIGN_KEY_CHECKS = 1;

docker-gitlink/nginx/conf/default_nginx.conf

@@ -1,48 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-    client_max_body_size 500m;
-
-    server {
-        listen       #mapping_gateway_port;
-        server_name  localhost;
-
-                location / {
-                root   /home/gitlink/projects/zone_admin;
-                try_files $uri $uri/ /index.html;
-                index  index.html index.htm;
-        }
-
-                location /api/{
-                        proxy_set_header Host $http_host;
-                        proxy_set_header X-Real-IP $remote_addr;
-                        proxy_set_header REMOTE-HOST $remote_addr;
-                        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                        proxy_pass http://gitlink-gateway:8080/;
-                }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-    server {
-        listen       #mapping_nacos_port;
-        server_name  localhost;
-        location / {
-                proxy_set_header Host $http_host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header REMOTE-HOST $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_pass http://gitlink-nacos:8848;
-        }
-    }
-}

docker-gitlink/nginx/dockerfile

@@ -1,11 +0,0 @@
-# 基础镜像
-FROM nginx
-# author
-MAINTAINER gitlink
-
-# 挂载目录
-VOLUME /home/gitlink/projects
-# 创建目录
-RUN mkdir -p /home/gitlink/projects
-# 指定路径
-WORKDIR /home/gitlink/projects

docker-gitlink/prod_config.profile

@@ -1,95 +0,0 @@
-## 部署环境
-deploy_env=prod
-## 基础镜像版本
-base_image_version=1.0.0
-## Nacos数据库连接
-NACOS_SPRING_DATASOURCE_PLATFORM=mysql
-NACOS_MYSQL_SERVICE_HOST=gitlink-mysql
-NACOS_MYSQL_SERVICE_PORT=3306
-NACOS_MYSQL_SERVICE_DB_NAME=gitlink-nacos-config
-NACOS_MYSQL_SERVICE_USER=root
-NACOS_MYSQL_SERVICE_PASSWORD=Trust_#%01
-NACOS_AUTH_ENABLE=true
-NACOS_AUTH_TOKEN=RHBxaW5kTllsQ1dIUlJ6ZXM0ajdzUmgxbXJIMzVaZFFmbXlqNkw5c1dCNnBFd082V21EeFBtME5NazFYYnQwWW43ekZXQQ==
-NACOS_AUTH_IDENTITY_KEY=gitlink_key
-NACOS_AUTH_IDENTITY_VALUE=gitlink_value
-nacos_db_username=root
-nacos_db_password=hnxjy2024#
-## 连接Nacos配置
-nacos_ip=gitlink-nacos
-nacos_port=8848
-nacos_username=nacos
-nacos_password=gitlink-nacos
-## 连接Redis配置
-redis_ip=gitlink-redis
-redis_port=6379
-## 业务库数据源配置
-mysql_root_password=Trust_#%01
-db_url=gitlink-mysql:3306
-db_host=127.0.0.1
-db_name=ruoyi-gitlink
-db_username=root
-db_password=Trust_#%01
-mapping_mysql_port=22306
-## GitLink库数据源配置
-gitlink_db_url=10.9.60.75:3306
-gitlink_db_name=forgeplus
-gitlink_db_username=root
-gitlink_db_password=Trust_#%01
-## 文件服务访问地址
-file_url=https://gateway.gitlink.org.cn/api/file
-# 容器内文件上传路径
-file_path=/home/gitlink/uploadPath
-## 内容管理系统配置
-# 自动提取概要最大长度
-cms_summaryMaxLength=100
-# 特色专区项目组织名称
-cms_gitLinkOrganization=prefecture
-# 专区资讯详情路由
-cmsDetailPath=/newdetail
-# GitLink访问地址
-cms_gitLinkUrl=https://www.gitlink.org.cn/
-## skywalking配置
-skywalking_backend_service=111.8.36.180:95
-## Docker数据路径
-docker_data=/data/docker-data
-## Nacos映射端口
-mapping_nacos_port=8848
-## Redis映射端口
-mapping_redis_port=26379
-## Gateway映射端口
-mapping_gateway_port=8080
-## 邀请链接有效时长（单位：天）
-invitationLinkExpirationTime=10
-## 邀请确认页面
-invitationPagePath=/index
-## 消息模板
-messageTemplate=1428
-# 会员加入失败消息模板
-memberMessageTemplate=1428
-## 专区管理地址
-zoneAdminUrl=https://gateway.gitlink.org.cn/zone/list
-# 专区首页前缀
-zoneHomepagePath=/zone
-# 专区会员后缀
-zoneMemberPath=/VIP
-# 专区配置地址
-zoneConfigurationUrl=https://gateway.gitlink.org.cn/zone/configuration
-# 专区资讯管理地址
-docManageUrl=https://gateway.gitlink.org.cn/zone/content/doc
-# 专区资源管理地址
-resourceManageUrl=https://gateway.gitlink.org.cn/zone/resource/resource
-## 项目聚合中，GitLink项目Id
-gitlinkProjectId=5988
-## 会员聚合中，gitlink用户名
-gitLinkUserName1=maxj
-gitLinkUserName2=maxj1
-gitLinkUserName3=maxmaxj
-gitLinkUserName4=maxmaxj1
-## 网关地址
-gatewayUrl=https://gateway.gitlink.org.cn
-## 内置gitlink管理员账号
-gitlinkAdminUsername=xxx
-gitlinkAdminPassword=xxx
-gitlinkClientId=xxx
-gitlinkClientSecret=xxx

docker-gitlink/redis/conf/redis.conf

@@ -1 +0,0 @@
-# requirepass 123456

docker-gitlink/redis/dockerfile

@@ -1,13 +0,0 @@
-# 基础镜像
-FROM redis:5.0
-# author
-MAINTAINER gitlink
-
-# 挂载目录
-VOLUME /home/gitlink/redis
-# 创建目录
-RUN mkdir -p /home/gitlink/redis
-# 指定路径
-WORKDIR /home/gitlink/redis
-# 复制conf文件到路径
-COPY ./conf/redis.conf /home/gitlink/redis/redis.conf

docker-gitlink/test_config.profile

@@ -1,96 +0,0 @@
-## 部署环境
-deploy_env=test
-## 基础镜像版本
-base_image_version=1.0.0
-## Nacos数据库连接
-NACOS_SPRING_DATASOURCE_PLATFORM=mysql
-NACOS_MYSQL_SERVICE_HOST=gitlink-mysql
-NACOS_MYSQL_SERVICE_PORT=3306
-NACOS_MYSQL_SERVICE_DB_NAME=gitlink-nacos-config
-NACOS_MYSQL_SERVICE_USER=root
-NACOS_MYSQL_SERVICE_PASSWORD=Trust_#%01
-NACOS_AUTH_ENABLE=true
-NACOS_AUTH_TOKEN=RHBxaW5kTllsQ1dIUlJ6ZXM0ajdzUmgxbXJIMzVaZFFmbXlqNkw5c1dCNnBFd082V21EeFBtME5NazFYYnQwWW43ekZXQQ==
-NACOS_AUTH_IDENTITY_KEY=gitlink_key
-NACOS_AUTH_IDENTITY_VALUE=gitlink_value
-nacos_username=nacos
-nacos_password=hnxjy2023
-## 连接Nacos配置
-nacos_ip=gitlink-nacos
-nacos_port=8848
-nacos_username=nacos
-nacos_password=hnxjy2023
-## 连接Redis配置
-redis_ip=gitlink-redis
-redis_port=6379
-## 业务库数据源配置
-mysql_root_password=Trust_#%01
-db_url=gitlink-mysql:3306
-db_host=127.0.0.1
-db_name=ruoyi-gitlink
-db_username=root
-db_password=Trust_#%01
-mapping_mysql_port=22306
-## GitLink库数据源配置
-gitlink_db_url=10.9.70.25:3306
-gitlink_db_name=testforgeplus
-gitlink_db_username=root
-gitlink_db_password=Trust_#%01
-## 文件服务访问地址
-file_url=https://testgetway.trustie.net/api/file
-# 容器内文件上传路径
-file_path=/home/gitlink/uploadPath
-## 内容管理系统配置
-# 自动提取概要最大长度
-cms_summaryMaxLength=100
-# 特色专区项目组织名称
-cms_gitLinkOrganization=prefecture
-# 专区资讯详情路由
-cmsDetailPath=/newdetail
-# GitLink访问地址
-cms_gitLinkUrl=https://testforgeplus.trustie.net/
-## skywalking配置
-skywalking_backend_service=111.8.36.180:95
-## Docker数据路径
-docker_data=/data/docker-data
-## Nacos映射端口
-mapping_nacos_port=8848
-## Redis映射端口
-mapping_redis_port=26379
-## Gateway映射端口
-mapping_gateway_port=8080
-## 专区相关配置
-## 邀请链接有效时长（单位：天）
-invitationLinkExpirationTime=10
-## 邀请确认页面
-invitationPagePath=/index
-## 消息模板
-messageTemplate=1428
-# 会员加入失败消息模板
-memberMessageTemplate=1428
-## 专区管理地址
-zoneAdminUrl=https://testgetway.trustie.net/zone/list
-# 专区首页前缀
-zoneHomepagePath=/zone
-# 专区会员后缀
-zoneMemberPath=/VIP
-# 专区配置地址
-zoneConfigurationUrl=https://testgetway.trustie.net/zone/configuration
-# 专区资讯管理地址
-docManageUrl=https://testgetway.trustie.net/zone/content/doc
-# 专区资源管理地址
-resourceManageUrl=https://testgetway.trustie.net/zone/resource/resource
-## 项目聚合中，GitLink项目Id
-gitlinkProjectId=546714
-## 会员聚合中，gitlink用户名
-gitLinkUserName1=floraachy
-gitLinkUserName2=innov
-gitLinkUserName3=ttt77777
-gitLinkUserName4=OTTO
-## 网关地址
-gatewayUrl=https://testgetway.trustie.net
-## 内置gitlink管理员账号
-gitlinkAdminUsername=innov
-gitlinkAdminPassword=12345678
-gitlinkClientId=yllzwpMD2U5sAKHVnWbUiIZVpbp63DL7FleZi49uUXY
-gitlinkClientSecret=AdfaPHO_RJf3Tnz3n9xuCuYKpCt9Nioy9bYY6EJY7TI

docker-gitlink/update_db.sh

@@ -1,182 +0,0 @@
-#!/bin/bash
-
-# 获取当前路径
-origin_path=$(pwd)
-current_env=$1
-server_name=$3
-
-# 使用说明，用来提示输入参数
-usage() {
-  echo -e "\e[91m错误：必须传入环境参数 \e[0m"
-	echo "Usage: sh update_db.sh [dev|test|prod] [gen_time_string|exec_update_sql]"
-	exit 1
-}
-gen_time_string(){
-    local TIME_STRING=$(date +'%Y%m%d%H%M%S')
-    echo "$TIME_STRING"
-}
-
-update_sql_config(){
-  # 进入sql所在目录
-  cd "${origin_path}"/../sql/update
-  # 检查是否存在"replace_config"文件夹
-  if [ -d "replace_config" ]; then
-    cd ./replace_config
-    # 获取所有后缀为.replace的文件
-    REPLACE_FILES=$(find . -type f -name "*.replace")
-
-    # 遍历所有.replace文件
-    for REPLACE_FILE in $REPLACE_FILES; do
-      # 将.replace文件复制为.sql文件，并替换其中的占位符
-      SQL_FILE=${REPLACE_FILE%.replace}.sql
-      cp "$REPLACE_FILE" "$SQL_FILE"
-      sed -i "s|#gateway_url|${gateway_url}|g" "$SQL_FILE"
-
-      # 检查.sql文件是否在update文件夹下存在
-      if [ -f "$SQL_FILE" ]; then
-        # 如果存在，则删除update下该sql文件，并将重命名后的.sql文件移动到update文件夹下
-        rm -f ../"$SQL_FILE"
-        mv "$SQL_FILE" ../
-      fi
-    done
-  fi
-}
-
-exec_update_sql(){
-  set -e
-  # 拉取最新代码
-  git pull
-  # 替换sql中变量
-  update_sql_config
-  cd "${origin_path}"/../sql/update
-  # 检查MySQL客户端是否已安装
-  if ! command -v mysql &> /dev/null; then
-    echo "错误：未找到MySQL客户端。请先安装MySQL客户端，并确保其在环境变量中可用。"
-    exit 1
-  fi
-
-  # MySQL连接信息
-  DB_HOST="${db_host}"
-  DB_PORT="${mapping_mysql_port}"
-  DB_USER="${db_username}"
-  DB_PASS="${db_password}"
-  DB_NAME="${db_name}"
-
-  # 版本表信息
-  VERSION_TABLE="sys_version"
-  VERSION_FIELD="current_version"
-  REMARKS_FIELD="remarks"
-
-  # 检查并过滤符合命名规则的SQL文件
-  validate_sql_file() {
-    local file="$1"
-    local filename=$(basename "$file")
-    local regex='^[0-9]{14}_.*\.sql$'
-
-    if [[ ! $filename =~ $regex ]]; then
-      echo "错误：$filename 不是有效的SQL文件。跳过执行。"
-      return 1
-    fi
-  }
-
-  # 获取所有未在版本库中记录的SQL文件名，并按照从小到大的顺序排序
-  UNEXECUTED_SQL_FILES=$(comm -23 <(ls *.sql | sort) <(mysql -N --default-character-set=utf8mb4 -h $DB_HOST -P $DB_PORT -u $DB_USER -p$DB_PASS -D $DB_NAME -e "SELECT $VERSION_FIELD FROM $VERSION_TABLE;" | sort))
-
-  # 将未执行的SQL文件名按照日期和版本号的顺序排序
-  SORTED_SQL_FILES=$(echo "$UNEXECUTED_SQL_FILES" | sort)
-
-  # 创建已成功执行的SQL文件列表和未能执行的SQL文件列表
-  SUCCESSFUL_SQL_FILES=""
-  FAILED_SQL_FILES=""
-
-  # 开始事务
-  mysql --default-character-set=utf8mb4  -h "$DB_HOST" -P "$DB_PORT" -u "$DB_USER" -p"$DB_PASS" -D "$DB_NAME" -e "START TRANSACTION;"
-
-  # 循环执行排序后的未执行SQL文件
-  for SQL_FILE in $SORTED_SQL_FILES; do
-    # 检查SQL文件名是否符合规则
-    if ! validate_sql_file "$SQL_FILE"; then
-      FAILED_SQL_FILES+="\n$SQL_FILE"
-      continue
-    fi
-
-    # 提取日期和版本号
-    FILENAME=$(basename "$SQL_FILE")
-    DATE=$(echo "$FILENAME" | cut -c 1-14)
-    VERSION=$(echo "$FILENAME" | cut -c 16- | cut -d'_' -f1)
-
-    # 提取注释内容
-    FIRST_LINE=$(head -n 1 "$SQL_FILE")
-    REMARKS=$(echo "$FIRST_LINE" | sed 's/^--\s*//')
-
-    # 执行SQL文件，捕获错误输出
-    if ! output=$(mysql --default-character-set=utf8mb4  -h $DB_HOST -P $DB_PORT -u $DB_USER -p$DB_PASS -D $DB_NAME < $SQL_FILE 2>&1); then
-      # SQL文件执行失败，打印错误信息并终止脚本
-      echo -e "\n错误：SQL文件 $SQL_FILE 执行失败。错误原因如下："
-      echo "$output"
-
-      # 回滚事务
-      mysql --default-character-set=utf8mb4  -h $DB_HOST -P $DB_PORT -u $DB_USER -p$DB_PASS -D $DB_NAME -e "ROLLBACK;"
-      exit 1
-    fi
-
-        # SQL文件执行成功，将其添加到已成功执行的SQL文件列表中
-        SUCCESSFUL_SQL_FILES+="\n$SQL_FILE"
-
-        # 提取完整的SQL文件名（包含时间戳和版本号）
-        FULL_SQL_FILE_NAME=$(basename "$SQL_FILE")
-
-        # 在版本表中插入记录，包括完整的SQL文件名和备注字段
-        mysql --default-character-set=utf8mb4  -h $DB_HOST -P $DB_PORT -u $DB_USER -p$DB_PASS -D $DB_NAME -e "INSERT INTO $VERSION_TABLE (execute_time, $VERSION_FIELD, $REMARKS_FIELD) VALUES (NOW(), '$FULL_SQL_FILE_NAME', '$REMARKS');"
-
-  done
-
-  # 所有SQL执行成功，提交事务
-  mysql --default-character-set=utf8mb4  -h $DB_HOST -P $DB_PORT -u $DB_USER -p$DB_PASS -D $DB_NAME -e "COMMIT;"
-
-  # 打印已成功执行的SQL文件列表
-  if [ -n "$SUCCESSFUL_SQL_FILES" ]; then
-    echo -e "\n以下SQL文件已成功执行:"
-    echo -e "$SUCCESSFUL_SQL_FILES"
-  fi
-
-  # 打印未能执行的SQL文件列表
-  if [ -n "$FAILED_SQL_FILES" ]; then
-    echo -e "\n以下SQL文件未能执行:"
-    echo -e "$FAILED_SQL_FILES"
-  fi
-
-}
-
-
-
-
-case "$current_env" in
-  "test")
-  # 获取测试环境配置文件中的安装信息
-    . ./test_config.profile
-  ;;
-  "dev")
-  # 获取测试环境配置文件中的安装信息
-    . ./dev_config.profile
-  ;;
-  "prod")
-    . ./prod_config.profile
-  ;;
-  *)
-  	usage
-  ;;
-esac
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$2" in
-"gen_time_string")
-	gen_time_string
-;;
-"exec_update_sql")
-	exec_update_sql
-;;
-*)
-	usage
-;;
-esac

microservices-api/microservices-api-system/pom.xml

@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-api</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>ruoyi-api-system</artifactId>
-
-    <description>
-        ruoyi-api-system系统接口模块
-    </description>
-
-    <dependencies>
-
-        <!-- RuoYi Common Core-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-    </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.microservices</groupId>
+        <artifactId>microservices-api</artifactId>
+        <version>3.6.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <artifactId>microservices-api-system</artifactId>
+
+    <description>
+        microservices-api-system系统接口模块
+    </description>
+
+    <dependencies>
+
+        <!-- Microservices Common Core-->
+        <dependency>
+            <groupId>com.microservices</groupId>
+            <artifactId>microservices-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+    </dependencies>
+
 </project>

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteCmsService.java

@@ -1,17 +1,18 @@
-package com.ruoyi.system.api;
+package com.microservices.system.api;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.factory.RemoteCmsFallbackFactory;
+import com.alibaba.fastjson2.JSONObject;
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysDept;
+import com.microservices.system.api.factory.RemoteCmsFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户服务
  *
- * @author ruoyi
+ * @author microservices
  */
 @FeignClient(contextId = "remoteCmsService", value = ServiceNameConstants.CMS_SERVICE, fallbackFactory = RemoteCmsFallbackFactory.class)
 public interface RemoteCmsService {
@@ -29,6 +30,8 @@ public interface RemoteCmsService {
             @PathVariable("userId") Long userId
             , @RequestParam("oldDeptId") Long oldDeptId
             , @RequestParam("newDeptId") Long newDeptId
+            , @RequestParam("oldRoleId") Long oldRoleId
+            , @RequestParam("newRoleId") Long newRoleId
             , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
@@ -42,6 +45,17 @@ public interface RemoteCmsService {
     public R<Long> getCmsCountByDeptId(@PathVariable(value = "deptId") Long deptId
             , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 通过组织Id获取专区下文章阅读数量
+     *
+     * @param deptId 组织id
+     * @param source 来源
+     * @return 结果
+     */
+    @GetMapping("/doc/getCmsDocVisitsByDeptId/{deptId}")
+    public R<Long> getCmsDocVisitsByDeptId(@PathVariable(value = "deptId") Long deptId
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 通过组织Id获取专区下待审核文章数量
      *
@@ -140,4 +154,8 @@ public interface RemoteCmsService {
     @DeleteMapping("/project/removeByDeptId/{deptId}")
     public R<Boolean> removeByDeptId(@PathVariable(value = "deptId") Long deptId
             , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/doc/getJSONObject/{cmsDocId}")
+    R<JSONObject> selectCmsDocJSONObjectById(@PathVariable(value = "cmsDocId") Long cmsDocId
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteDeptService.java

@@ -0,0 +1,155 @@
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysDept;
+import com.microservices.system.api.domain.SysUserDeptRole;
+import com.microservices.system.api.factory.RemoteDeptFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 部门服务
+ *
+ * @author otto
+ */
+@FeignClient(contextId = "remoteDeptService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeptFallbackFactory.class)
+public interface RemoteDeptService {
+    /**
+     * 通过部门Id列表查询部门列表
+     *
+     * @param ids    部门Id列表
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/dept/listInIds/{ids}")
+    public R<List<SysDept>> getDeptInDeptIds(@PathVariable("ids") List<Long> ids,
+                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过部门Id查询部门信息
+     *
+     * @param deptId 部门Id
+     * @return 结果
+     */
+    @GetMapping("/dept/getDeptByDeptId/{deptId}")
+    public R<SysDept> getDeptByDeptId(@PathVariable("deptId") Long deptId,
+                                      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据专区名称创建部门
+     *
+     * @param zoneName 专区名称
+     * @param source   请求来源
+     * @return 部门Id
+     */
+    @PostMapping("/dept/addDeptByZone")
+    public R<Long> addDeptByZone(@RequestBody String zoneName
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过部门Id获取自身及子部门Id列表
+     *
+     * @param deptId 部门Id
+     * @return 自身及子部门Id列表
+     */
+    @GetMapping("/dept/getSelfAndChildrenDeptIdListByDeptId/{deptId}")
+    public R<List<Long>> getSelfAndChildrenDeptIdListByDeptId(@PathVariable("deptId") Long deptId,
+                                                              @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据企业名称创建部门
+     *
+     * @param pmsEnterpriseName 企业名称
+     * @param source            请求来源
+     * @return 部门Id
+     */
+    @PostMapping("/dept/addDeptByPmsEnterprise")
+    public R<Long> addDeptByPmsEnterprise(@RequestBody String pmsEnterpriseName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据部门Id更新部门名称
+     *
+     * @param deptId   部门id
+     * @param deptName 部门名称
+     * @param source   请求来源
+     * @return 部门Id
+     */
+    @PostMapping("/dept/updateDeptNameByDeptId/{deptId}")
+    public R<Boolean> updateDeptNameByDeptId(@PathVariable("deptId") Long deptId, @RequestBody String deptName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据组织id删除部门
+     *
+     * @param deptId 部门id
+     * @param source            请求来源
+     * @return 是否删除成功
+     */
+    @DeleteMapping("/dept/deleteDeptByDeptId")
+    public R<Boolean> deleteDeptByDeptId(@RequestBody Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据企业名称删除部门
+     *
+     * @param pmsEnterpriseName 企业名称
+     * @param source            请求来源
+     * @return 部门Id
+     */
+    @DeleteMapping("/dept/deleteDeptByPmsEnterprise")
+    public R<Boolean> deleteDeptByPmsEnterprise(@RequestBody String pmsEnterpriseName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过用户名查询用户下组织及组织对应角色列表
+     *
+     * @param deptId 组织ID
+     * @param source   请求来源
+     * @return 用户下组织及组织对应角色列表
+     */
+    @GetMapping("/SysUserDeptRole/userByDeptId/{deptId}/list")
+    public R<List<SysUserDeptRole>> getSysUserDeptRoleListByDeptId(@PathVariable("deptId") Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 查询组织编号下拥有传入角色权限字符串的用户名
+     *
+     * @param deptId 组织编号
+     * @param roleKeys 角色权限字符串
+     * @return 组织下拥有传入角色权限字符串的用户名列表
+     */
+    @GetMapping("/dept/getGitLinkUserNamesByDeptIdAndRoleKeys/{deptId}/list")
+    R<List<String>> getGitLinkUserNamesByDeptIdAndRoleKeys(@PathVariable("deptId") Long deptId, @RequestParam("roleKeys") String roleKeys, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 检查用户是否在指定部门下具有指定角色
+     *
+     * @param currentDeptId 组织编号
+     * @param roleKey 角色权限字符串
+     * @return 组织下拥有传入角色权限字符串的用户名列表
+     */
+    @GetMapping("/SysUserDeptRole/checkUserInDeptHasRole")
+    R<Boolean> checkUserInDeptHasRole(@RequestParam("currentDeptId") Long currentDeptId, @RequestParam("userId") Long userId, @RequestParam("roleKey") String roleKey, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 检查用户是否在指定部门下具有指定菜单权限
+     *
+     * @param currentDeptId 组织id
+     * @param userId        用户id
+     * @param perms         菜单权限
+     * @return 用户是否在指定部门下具有菜单权限 是true 否false
+     */
+    @GetMapping("/SysUserDeptRole/checkUserInDeptHasPerms")
+    R<Boolean> checkUserInDeptHasPerms(@RequestParam("currentDeptId") Long currentDeptId, @RequestParam("userId") Long userId, @RequestParam("perms") String perms, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 检查用户是否在指定部门下
+     *
+     * @param currentDeptId 组织id
+     * @param userId        用户id
+     * @return 用户是否在指定部门下是true 否false
+     */
+    @GetMapping("/SysUserDeptRole/checkUserInDept")
+    R<Boolean> checkUserInDept(@RequestParam("currentDeptId") Long currentDeptId, @RequestParam("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteFileService.java

@@ -0,0 +1,130 @@
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysFile;
+import com.microservices.system.api.domain.SysFileInfo;
+import com.microservices.system.api.factory.RemoteFileFallbackFactory;
+import feign.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 文件服务
+ *
+ * @author microservices
+ */
+@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
+public interface RemoteFileService {
+    /**
+     * 上传文件
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file,
+                             @RequestParam("type") String type,
+                             @RequestParam("hierarchy") String hierarchy,
+                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据文件Id列表获取文件列表
+     *
+     * @param fileIds 文件Id列表
+     * @return 结果
+     */
+    @GetMapping("/open/getFileList/{fileIds}")
+    public R<List<SysFileInfo>> getFileList(@PathVariable("fileIds") String fileIds);
+
+    /**
+     * 根据文件Id获取文件信息
+     *
+     * @param fileId 文件Id
+     * @return 结果
+     */
+    @GetMapping("/open/getFile/{fileId}")
+    public R<SysFileInfo> getFile(@PathVariable("fileId") Long fileId);
+
+    /**
+     * 根据文件Id获取文件信息
+     *
+     * @param fileIdentifier 文件标识
+     * @return 结果
+     */
+    @GetMapping("/common/getFileByFileIdentifier/{fileIdentifier}")
+    public R<SysFileInfo> getFileByFileIdentifier(@PathVariable("fileIdentifier") String fileIdentifier,
+                                                  @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据文件标识列表获取文件详情列表
+     *
+     * @param fileIdentifiers 文件标识列表，逗号分隔
+     * @return 文件详情列表
+     */
+    @GetMapping("/open/getFileListByIdentifier/{fileIdentifiers}")
+    R<List<SysFileInfo>> getFileListByIdentifier(@PathVariable("fileIdentifiers") String fileIdentifiers);
+
+    /**
+     * 通过文件标识列表批量删除文件
+     *
+     * @param fileIdentifiers 文件标识列表，逗号分隔
+     * @return 结果
+     */
+    @DeleteMapping("/common/byIdentifiers/{fileIdentifiers}")
+    R<Boolean> deleteFileByIdentifiers(@PathVariable("fileIdentifiers") String fileIdentifiers,
+                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据文件标识获取文件实体
+     *
+     * @param fileIdentifier 文件标识
+     */
+    @GetMapping("/common/getFileEntityByIdentifier/{fileIdentifier}")
+    Response getFileEntityByIdentifier(@PathVariable("fileIdentifier") String fileIdentifier,
+                                       @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 打包文件
+     *
+     * @param packagedStructure 打包结构<文件包内路径,文件来源（文件标识或文件下载地址）>
+     * @param zipFileName       压缩文件名（不包含文件后缀）
+     * @param type              微服务类型
+     * @param hierarchy         层次结构
+     * @param source            鉴权
+     * @return 压缩包文件标识
+     */
+    @PostMapping(value = "/common/packagedFile")
+    R<String> packagedFile(
+            @RequestBody HashMap<String, String> packagedStructure,
+            @RequestParam("zipFileName") String zipFileName,
+            @RequestParam("type") String type,
+            @RequestParam("hierarchy") String hierarchy,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过Url下载文件到本地
+     */
+    @PostMapping(value = "/common/downloadFileByUrl")
+    R<String> downloadFileByUrl(
+            @RequestParam("fileUrl") String fileUrl
+            , @RequestParam("type") String type
+            , @RequestParam("hierarchy") String hierarchy,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 上传本地文件到Forge
+     *
+     * @param fileIdentifiers 文件标识列表，逗号分隔
+     * @return Forge文件标识列表
+     */
+    @PostMapping(value = "/common/uploadFileToForge/{fileIdentifiers}")
+    R<List<String>> uploadFileToForge(@PathVariable("fileIdentifiers") String fileIdentifiers,
+                                      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteGatewayService.java

@@ -0,0 +1,46 @@
+package com.microservices.system.api;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.system.api.factory.RemoteGatewayFallbackFactory;
+import feign.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * 网关
+ *
+ * @author microservices
+ */
+@Component
+@FeignClient(contextId = "remoteGatewayService", value = ServiceNameConstants.GATEWAY_SERVICE, fallbackFactory = RemoteGatewayFallbackFactory.class)
+public interface RemoteGatewayService {
+    /**
+     * 登录Sentinel
+     *
+     * @return 响应
+     */
+    @PostMapping("/sentinel/auth/login")
+    Response loginSentinel(@RequestParam("username") String username, @RequestParam("password") String password);
+
+    /**
+     * 登录Nacos
+     *
+     * @return 响应
+     */
+    @PostMapping(value = "/nacos/v1/auth/users/login", consumes = {"application/x-www-form-urlencoded"})
+    Response loginNacos(Map<String, ?> formParams);
+
+    /**
+     * 登录Portainer
+     *
+     * @return 响应
+     */
+    @PostMapping("/portainer/api/auth")
+    Response loginPortainer(@RequestBody JSONObject loginBody);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteLogService.java

@@ -0,0 +1,57 @@
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysLogininfor;
+import com.microservices.system.api.domain.SysOperLog;
+import com.microservices.system.api.factory.RemoteLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 日志服务
+ *
+ * @author microservices
+ */
+@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
+public interface RemoteLogService
+{
+    /**
+     * 保存系统日志
+     *
+     * @param sysOperLog 日志实体
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/operlog")
+    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 保存访问记录
+     *
+     * @param sysLogininfor 访问实体
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/logininfor")
+    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 获取操作日志列表
+     *
+     * @param title 日志标题
+     * @param operUrl 操作地址
+     * @param status 操作状态
+     * @param topN 获取最新N条
+     * @return 操作日志列表
+     */
+    @GetMapping("/operlog/latest")
+    R<List<SysOperLog>> getLatestOperLogList(@RequestParam(value = "title", required = false) String title,
+                                             @RequestParam(value = "operUrl", required = false) String operUrl,
+                                             @RequestParam(value = "status", required = false) Integer status,
+                                             @RequestParam(value = "topN") Integer topN,
+                                             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteNoticeService.java

@@ -0,0 +1,27 @@
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysNotice;
+import com.microservices.system.api.factory.RemoteUserFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+@Component
+@FeignClient(contextId = "remoteNoticeService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+public interface RemoteNoticeService {
+
+    @PostMapping("/notice/innerAdd")
+    R<Long> addNotice(@RequestBody SysNotice sysNotice, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/notice/innerGetInfo/{noticeId}")
+    R<SysNotice> getNotice(@PathVariable(value = "noticeId") Long noticeId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PutMapping("/notice/innerEdit")
+    R<Integer> editNotice(@RequestBody SysNotice sysNotice, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @DeleteMapping("/notice/innerRemove/{noticeIds}")
+    R<Integer> deleteNotice(@PathVariable(value = "noticeIds") Long[] noticeIds, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemotePmsService.java

@@ -0,0 +1,35 @@
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.factory.RemotePmsFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Component
+@FeignClient(contextId = "remotePmsService", value = ServiceNameConstants.PMS_SERVICE, fallbackFactory = RemotePmsFallbackFactory.class)
+public interface RemotePmsService {
+    /**
+     * 切换用户在Gitlink组织团队
+     *
+     * @param userId    用户id
+     * @param deptId    组织id
+     * @param oldRoleId 旧角色id
+     * @param newRoleId 新角色id
+     * @param source    来源
+     * @return 结果
+     */
+    @PutMapping("/pmsEnterprise/changeUserGitlinkRole/user/{userId}/dept/{deptId}")
+    public R<Boolean> changeUserGitlinkRole(
+            @PathVariable("userId") Long userId
+            , @PathVariable("deptId") Long deptId
+            , @RequestParam("oldRoleId") Long oldRoleId
+            , @RequestParam("newRoleId") Long newRoleId
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source
+            , @RequestHeader(SecurityConstants.USER_KEY) String userKey);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteUserService.java

@@ -1,187 +1,229 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.domain.SysUserDeptRole;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.model.LoginUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Set;
-
-@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService {
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/info/{username}")
-    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @param source   请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/getSysUserByUserName/{username}")
-    public R<SysUser> getSysUserByUserName(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过用户Id查询用户信息
-     *
-     * @param userId 用户Id
-     * @param source 请求来源
-     * @return 结果
-     */
-    @GetMapping("/user/getSysUserByUserId/{userId}")
-    public R<SysUser> getSysUserByUserId(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 组织下新增用户身份
-     *
-     * @param deptId
-     * @param userId
-     * @param roleKey
-     * @param source  请求来源
-     * @return 结果
-     */
-    @PostMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/role/{roleKey}")
-    public R<Boolean> addUserIdentify(
-            @PathVariable("deptId") Long deptId
-            , @PathVariable("userId") Long userId
-            , @PathVariable("roleKey") String roleKey
-            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 组织下删除用户身份
-     *
-     * @param deptId
-     * @param userId
-     * @param roleKey
-     * @param source  请求来源
-     * @return 结果
-     */
-    @DeleteMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/role/{roleKey}")
-    public R<Boolean> deleteUserIdentify(
-            @PathVariable("deptId") Long deptId,
-            @PathVariable("userId") Long userId,
-            @PathVariable("roleKey") String roleKey,
-            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 注册用户信息
-     *
-     * @param sysUser 用户信息
-     * @param source  请求来源
-     * @return 结果
-     */
-    @PostMapping("/user/register")
-    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 通过GitLinkToken获取本系统Token
-     *
-     * @param cookie
-     * @param source 请求来源
-     * @return 返回本系统Token
-     */
-    @PostMapping("/user/getSysUserTokenByGitLinkCookie")
-    public R<String> getSysUserTokenByGitLinkCookie(@RequestHeader("cookie") String cookie, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过用户名查询用户下组织及组织对应角色列表
-     *
-     * @param userName 用户名
-     * @param source   请求来源
-     * @return 用户下组织及组织对应角色列表
-     */
-    @GetMapping("/SysUserDeptRole/userByUserName/{userName}/list")
-    public R<List<SysUserDeptRole>> getSysUserDeptRoleListByUserName(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-
-    /**
-     * 通过用户名查询用户下第一个身份
-     *
-     * @param userName 用户名
-     * @param source   请求来源
-     * @return 用户下组织及组织对应角色列表
-     */
-    @GetMapping("/SysUserDeptRole/getFirstUserIdentity/{userName}")
-    public R<SysUserDeptRole> getFirstUserIdentity(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过Token判断GItLink用户是否已登录
-     *
-     * @param token  GitLink Token
-     * @param source 请求来源
-     * @return 是否已登录
-     */
-    @GetMapping("/user/checkGitLinkUserLogin/{token}")
-    public R<Boolean> checkGitLinkUserLogin(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过gitLinkUserId获取GitLink用户Token
-     *
-     * @param gitLinkUserId GitLink用户Id
-     * @param source        请求来源
-     * @return GitLink用户Token
-     */
-    @GetMapping("/user/getTokenByGitLinkUserId/{gitLinkUserId}")
-    R<String> getTokenByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过GitLink用户Token获取系统用户名
-     *
-     * @param gitLinkToken GitLinkToken
-     * @param source       请求来源
-     * @return 系统用户名
-     */
-    @GetMapping("/user/getUserNameByGitLinkToken/{gitLinkToken}")
-    public R<String> getUserNameByGitLinkToken(@PathVariable("gitLinkToken") String gitLinkToken
-            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过gitLinkUserId获取系统用户
-     *
-     * @param gitLinkUserId GitLink用户Id
-     * @param source        请求来源
-     * @return 系统用户
-     */
-    @GetMapping("/user/getSysUserByGitLinkUserId/{gitLinkUserId}")
-    public R<SysUser> getSysUserByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 通过GitLink用户Id创建用户
-     *
-     * @param gitLinkUserId GitLink用户Id
-     * @param source        请求来源
-     * @return 系统用户
-     */
-    @PostMapping("/user/createUserByGitLinkUserId/{gitLinkUserId}")
-    public R<SysUser> createUserByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-     * 根据角色Key获取菜单权限集合
-     *
-     * @param roleKey 角色Key
-     * @param source  请求来源
-     * @return 菜单权限集合
-     */
-    @GetMapping("/menu/roleMenuPermissionByRoleKey/{roleKey}")
-    R<Set<String>> selectMenuPermissionByRoleKey(@PathVariable("roleKey") String roleKey
-            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-}
+package com.microservices.system.api;
+
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.web.page.GenericsTableDataInfo;
+import com.microservices.system.api.domain.SysRole;
+import com.microservices.system.api.domain.SysUser;
+import com.microservices.system.api.domain.SysUserDeptRole;
+import com.microservices.system.api.factory.RemoteUserFallbackFactory;
+import com.microservices.system.api.model.LoginUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
+
+@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+public interface RemoteUserService {
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名
+     * @param source   请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/info/{username}")
+    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过角色Id查询角色信息
+     *
+     * @param roleId 角色Id
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/role/inner/{roleId}")
+    public R<SysRole> getRoleInfoByInner(@PathVariable("roleId") Long roleId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名
+     * @param source   请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/getSysUserByUserName/{username}")
+    public R<SysUser> getSysUserByUserName(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过用户Id查询用户信息
+     *
+     * @param userId 用户Id
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/getSysUserByUserId/{userId}")
+    public R<SysUser> getSysUserByUserId(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 组织下新增用户身份
+     *
+     * @param deptId
+     * @param userId
+     * @param roleKey
+     * @param source  请求来源
+     * @return 结果
+     */
+    @PostMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/role/{roleKey}")
+    public R<Boolean> addUserIdentify(
+            @PathVariable("deptId") Long deptId
+            , @PathVariable("userId") Long userId
+            , @PathVariable("roleKey") String roleKey
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 组织下删除用户身份
+     *
+     * @param deptId
+     * @param userId
+     * @param roleKey
+     * @param source  请求来源
+     * @return 结果
+     */
+    @DeleteMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/role/{roleKey}")
+    public R<Boolean> deleteUserIdentify(
+            @PathVariable("deptId") Long deptId,
+            @PathVariable("userId") Long userId,
+            @PathVariable("roleKey") String roleKey,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 注册用户信息
+     *
+     * @param sysUser 用户信息
+     * @param source  请求来源
+     * @return 结果
+     */
+    @PostMapping("/user/register")
+    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 通过GitLinkToken获取本系统Token
+     *
+     * @param cookie
+     * @param source 请求来源
+     * @return 返回本系统Token
+     */
+    @PostMapping("/user/getSysUserTokenByGitLinkCookie")
+    public R<String> getSysUserTokenByGitLinkCookie(@RequestHeader("cookie") String cookie, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过用户名查询用户下组织及组织对应角色列表
+     *
+     * @param userName 用户名
+     * @param source   请求来源
+     * @return 用户下组织及组织对应角色列表
+     */
+    @GetMapping("/SysUserDeptRole/userByUserName/{userName}/list")
+    public R<List<SysUserDeptRole>> getSysUserDeptRoleListByUserName(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    /**
+     * 通过用户名查询用户下第一个身份
+     *
+     * @param userName 用户名
+     * @param source   请求来源
+     * @return 用户下组织及组织对应角色列表
+     */
+    @GetMapping("/SysUserDeptRole/getFirstUserIdentity/{userName}")
+    public R<SysUserDeptRole> getFirstUserIdentity(@PathVariable("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 模糊查询组织下身份列表
+     *
+     * @param deptId   用户名
+     * @param search   模糊搜索
+     * @param pageNum  当前记录起始索引
+     * @param pageSize 每页显示记录数
+     * @param source   请求来源
+     * @return 用户下组织及组织对应角色列表
+     */
+    @GetMapping("/SysUserDeptRole/dept/{deptId}/searchList")
+    public R<GenericsTableDataInfo<SysUserDeptRole>> searchUserIdentifierListByDept(@PathVariable("deptId") Long deptId,
+                                                                                    @RequestParam("search") String search,
+                                                                                    @RequestParam("pageNum") Integer pageNum,
+                                                                                    @RequestParam("pageSize") Integer pageSize,
+                                                                                    @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过Token判断GItLink用户是否已登录
+     *
+     * @param token  GitLink Token
+     * @param source 请求来源
+     * @return 是否已登录
+     */
+    @GetMapping("/user/checkGitLinkUserLogin/{token}")
+    public R<Boolean> checkGitLinkUserLogin(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过gitLinkUserId获取GitLink用户Token
+     *
+     * @param gitLinkUserId GitLink用户Id
+     * @param source        请求来源
+     * @return GitLink用户Token
+     */
+    @GetMapping("/user/getTokenByGitLinkUserId/{gitLinkUserId}")
+    R<String> getTokenByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过GitLink用户Token获取系统用户名
+     *
+     * @param gitLinkToken GitLinkToken
+     * @param source       请求来源
+     * @return 系统用户名
+     */
+    @GetMapping("/user/getUserNameByGitLinkToken/{gitLinkToken}")
+    public R<String> getUserNameByGitLinkToken(@PathVariable("gitLinkToken") String gitLinkToken
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过gitLinkUserId获取系统用户
+     *
+     * @param gitLinkUserId GitLink用户Id
+     * @param source        请求来源
+     * @return 系统用户
+     */
+    @GetMapping("/user/getSysUserByGitLinkUserId/{gitLinkUserId}")
+    public R<SysUser> getSysUserByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 通过GitLink用户Id创建用户
+     *
+     * @param gitLinkUserId GitLink用户Id
+     * @param source        请求来源
+     * @return 系统用户
+     */
+    @PostMapping("/user/createUserByGitLinkUserId/{gitLinkUserId}")
+    public R<SysUser> createUserByGitLinkUserId(@PathVariable("gitLinkUserId") Long gitLinkUserId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据角色Key获取菜单权限集合
+     *
+     * @param roleKey 角色Key
+     * @param source  请求来源
+     * @return 菜单权限集合
+     */
+    @GetMapping("/menu/roleMenuPermissionByRoleKey/{roleKey}")
+    R<Set<String>> selectMenuPermissionByRoleKey(@PathVariable("roleKey") String roleKey
+            , @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 根据部门Id和用户Id获取所有状态的用户身份
+     *
+     * @param deptId 组织Id
+     * @param userId 用户Id
+     * @param source 请求来源
+     * @return 用户身份
+     */
+    @GetMapping("/SysUserDeptRole/dept/{deptId}/user/{userId}/allStatus")
+    R<SysUserDeptRole> getAllStatusUserIdentityByDeptIdAndUserId(
+            @PathVariable("deptId") Long deptId,
+            @PathVariable("userId") Long userId,
+            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/RemoteZoneService.java

@@ -1,10 +1,10 @@
-package com.ruoyi.system.api;
+package com.microservices.system.api;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.factory.RemoteCmsFallbackFactory;
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.ServiceNameConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.domain.SysDept;
+import com.microservices.system.api.factory.RemoteZoneFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,9 +13,9 @@ import java.util.List;
 /**
  * 用户服务
  *
- * @author ruoyi
+ * @author microservices
  */
-@FeignClient(contextId = "remoteZoneService", value = ServiceNameConstants.ZONE_SERVICE, fallbackFactory = RemoteCmsFallbackFactory.class)
+@FeignClient(contextId = "remoteZoneService", value = ServiceNameConstants.ZONE_SERVICE, fallbackFactory = RemoteZoneFallbackFactory.class)
 public interface RemoteZoneService {
     /**
      * 新增组织时自动创建特色专区

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SimpleGitlinkFileInfo.java

@@ -0,0 +1,58 @@
+package com.microservices.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 文件管理对象 sys_file_info
+ *
+ * @author microservices
+ * @date 2021-12-29
+ */
+@Data
+public class SimpleGitlinkFileInfo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件主键id
+     */
+    @ApiModelProperty(value = "文件主键id")
+    private Long id;
+    /**
+     * 文件标识
+     */
+    @ApiModelProperty(value = "文件标识")
+    private String identifier;
+
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty(value = "文件名称")
+    private String title;
+
+    /**
+     * 文件类型，例如txt
+     */
+    @ApiModelProperty(value = "文件类型，例如txt")
+    private String content_type;
+
+    /**
+     * 文件大小
+     */
+    @ApiModelProperty(value = "文件大小")
+    private String filesize;
+
+    /**
+     * 下载地址
+     */
+    @ApiModelProperty(value = "下载地址")
+    private String url;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private Date created_on;
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SimpleGitlinkUser.java

@@ -0,0 +1,43 @@
+package com.microservices.system.api.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Gitlink简单用户对象
+ *
+ * @author microservices
+ */
+
+@Data
+public class SimpleGitlinkUser{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Gitlink用户ID
+     */
+    @ApiModelProperty(value = "Gitlink用户ID")
+    private Long id;
+    /**
+     * GitLink用户头像
+     */
+    private String image_url;
+
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String login;
+
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+
+    /**
+     * 用户类型
+     */
+    @ApiModelProperty(value = "用户类型")
+    private String type="User";
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SimpleSysRole.java

@@ -0,0 +1,45 @@
+package com.microservices.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.microservices.common.core.enums.SystemRole;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author microservices
+ */
+@Data
+public class SimpleSysRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @ApiModelProperty(value = "角色ID")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+
+    /**
+     * 角色标识
+     */
+    @ApiModelProperty(value = "角色标识")
+    private String roleKey;
+
+    public SimpleSysRole() {
+    }
+
+    public SimpleSysRole(SystemRole systemRole) {
+        this.roleName = systemRole.getRoleName();
+        this.roleKey = systemRole.getRoleKey();
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SimpleSysUser.java

@@ -1,17 +1,18 @@
-package com.ruoyi.system.api.domain;
+package com.microservices.system.api.domain;
 
-import com.ruoyi.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 简单用户对象 sys_user
  *
- * @author ruoyi
+ * @author microservices
  */
 
 @Data
-public class SimpleSysUser extends BaseEntity {
+public class SimpleSysUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysDept.java

@@ -1,113 +1,113 @@
-package com.ruoyi.system.api.domain;
-
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 部门表 sys_dept
- * 
- * @author ruoyi
- */
-@Data
-@ApiModel("组织Model")
-public class SysDept extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 部门ID */
-    @ApiModelProperty("部门ID")
-    private Long deptId;
-
-    /** 父部门ID */
-    @ApiModelProperty("父部门ID")
-    private Long parentId;
-
-    /** 祖级列表 */
-    @ApiModelProperty("祖级列表")
-    private String ancestors;
-
-    /** 部门名称 */
-    @ApiModelProperty("部门名称")
-    private String deptName;
-
-    /** 显示顺序 */
-    @ApiModelProperty("显示顺序")
-    private Integer orderNum;
-
-    /** 负责人 */
-    @ApiModelProperty("负责人")
-    private String leader;
-
-    /** 联系电话 */
-    @ApiModelProperty("联系电话")
-    private String phone;
-
-    /** 邮箱 */
-    @ApiModelProperty("邮箱")
-    private String email;
-
-    /** 部门状态:0正常,1停用 */
-    @ApiModelProperty("部门状态:0正常,1停用")
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
-    private String delFlag;
-
-    /**
-     * 父部门名称
-     */
-    @ApiModelProperty("父部门名称")
-    private String parentName;
-
-
-    /**
-     * 组织类型
-     */
-    @ApiModelProperty("组织类型")
-    private Integer deptType;
-
-    /**
-     * 子部门
-     */
-    @ApiModelProperty("子部门")
-    private List<SysDept> children = new ArrayList<SysDept>();
-
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    @NotNull(message = "显示顺序不能为空")
-    public Integer getOrderNum()
-    {
-        return orderNum;
-    }
-
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
-    {
-        return phone;
-    }
-
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-}
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 部门表 sys_dept
+ *
+ * @author microservices
+ */
+@Data
+@ApiModel("组织Model")
+public class SysDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 部门ID */
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    /** 父部门ID */
+    @ApiModelProperty("父部门ID")
+    private Long parentId;
+
+    /** 祖级列表 */
+    @ApiModelProperty("祖级列表")
+    private String ancestors;
+
+    /** 部门名称 */
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    /** 显示顺序 */
+    @ApiModelProperty("显示顺序")
+    private Integer orderNum;
+
+    /** 负责人 */
+    @ApiModelProperty("负责人")
+    private String leader;
+
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String phone;
+
+    /** 邮箱 */
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    /** 部门状态:0正常,1停用 */
+    @ApiModelProperty("部门状态:0正常,1停用")
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    /**
+     * 父部门名称
+     */
+    @ApiModelProperty("父部门名称")
+    private String parentName;
+
+
+    /**
+     * 组织类型
+     */
+    @ApiModelProperty("组织类型")
+    private Integer deptType;
+
+    /**
+     * 子部门
+     */
+    @ApiModelProperty("子部门")
+    private List<SysDept> children = new ArrayList<SysDept>();
+
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    public String getPhone()
+    {
+        return phone;
+    }
+
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysDictData.java

@@ -1,176 +1,177 @@
-package com.ruoyi.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 字典数据表 sys_dict_data
- * 
- * @author ruoyi
- */
-public class SysDictData extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典编码 */
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
-    private Long dictCode;
-
-    /** 字典排序 */
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
-    private Long dictSort;
-
-    /** 字典标签 */
-    @Excel(name = "字典标签")
-    private String dictLabel;
-
-    /** 字典键值 */
-    @Excel(name = "字典键值")
-    private String dictValue;
-
-    /** 字典类型 */
-    @Excel(name = "字典类型")
-    private String dictType;
-
-    /** 样式属性（其他样式扩展） */
-    private String cssClass;
-
-    /** 表格字典样式 */
-    private String listClass;
-
-    /** 是否默认（Y是 N否） */
-    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
-    private String isDefault;
-
-    /** 状态（0正常 1停用） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    public Long getDictCode()
-    {
-        return dictCode;
-    }
-
-    public void setDictCode(Long dictCode)
-    {
-        this.dictCode = dictCode;
-    }
-
-    public Long getDictSort()
-    {
-        return dictSort;
-    }
-
-    public void setDictSort(Long dictSort)
-    {
-        this.dictSort = dictSort;
-    }
-
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
-    {
-        return dictLabel;
-    }
-
-    public void setDictLabel(String dictLabel)
-    {
-        this.dictLabel = dictLabel;
-    }
-
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
-    {
-        return dictValue;
-    }
-
-    public void setDictValue(String dictValue)
-    {
-        this.dictValue = dictValue;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
-    {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass)
-    {
-        this.cssClass = cssClass;
-    }
-
-    public String getListClass()
-    {
-        return listClass;
-    }
-
-    public void setListClass(String listClass)
-    {
-        this.listClass = listClass;
-    }
-
-    public boolean getDefault()
-    {
-        return UserConstants.YES.equals(this.isDefault);
-    }
-
-    public String getIsDefault()
-    {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault)
-    {
-        this.isDefault = isDefault;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
-            .append("dictSort", getDictSort())
-            .append("dictLabel", getDictLabel())
-            .append("dictValue", getDictValue())
-            .append("dictType", getDictType())
-            .append("cssClass", getCssClass())
-            .append("listClass", getListClass())
-            .append("isDefault", getIsDefault())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.constant.UserConstants;
+import com.microservices.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author microservices
+ */
+public class SysDictData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    private Long dictCode;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    private Long dictSort;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    private String dictValue;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 样式属性（其他样式扩展） */
+    private String cssClass;
+
+    /** 表格字典样式 */
+    private String listClass;
+
+    /** 是否默认（Y是 N否） */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    private String isDefault;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictCode()
+    {
+        return dictCode;
+    }
+
+    public void setDictCode(Long dictCode)
+    {
+        this.dictCode = dictCode;
+    }
+
+    public Long getDictSort()
+    {
+        return dictSort;
+    }
+
+    public void setDictSort(Long dictSort)
+    {
+        this.dictSort = dictSort;
+    }
+
+    @NotBlank(message = "字典标签不能为空")
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+    public String getDictLabel()
+    {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel)
+    {
+        this.dictLabel = dictLabel;
+    }
+
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    public String getDictValue()
+    {
+        return dictValue;
+    }
+
+    public void setDictValue(String dictValue)
+    {
+        this.dictValue = dictValue;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+    public String getCssClass()
+    {
+        return cssClass;
+    }
+
+    public void setCssClass(String cssClass)
+    {
+        this.cssClass = cssClass;
+    }
+
+    public String getListClass()
+    {
+        return listClass;
+    }
+
+    public void setListClass(String listClass)
+    {
+        this.listClass = listClass;
+    }
+
+    public boolean getDefault()
+    {
+        return UserConstants.YES.equals(this.isDefault);
+    }
+
+    public String getIsDefault()
+    {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault)
+    {
+        this.isDefault = isDefault;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictCode", getDictCode())
+            .append("dictSort", getDictSort())
+            .append("dictLabel", getDictLabel())
+            .append("dictValue", getDictValue())
+            .append("dictType", getDictType())
+            .append("cssClass", getCssClass())
+            .append("listClass", getListClass())
+            .append("isDefault", getIsDefault())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysDictType.java

@@ -1,96 +1,97 @@
-package com.ruoyi.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 字典类型表 sys_dict_type
- * 
- * @author ruoyi
- */
-public class SysDictType extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典主键 */
-    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
-    private Long dictId;
-
-    /** 字典名称 */
-    @Excel(name = "字典名称")
-    private String dictName;
-
-    /** 字典类型 */
-    @Excel(name = "字典类型")
-    private String dictType;
-
-    /** 状态（0正常 1停用） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    public Long getDictId()
-    {
-        return dictId;
-    }
-
-    public void setDictId(Long dictId)
-    {
-        this.dictId = dictId;
-    }
-
-    @NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
-    {
-        return dictName;
-    }
-
-    public void setDictName(String dictName)
-    {
-        this.dictName = dictName;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
-            .append("dictName", getDictName())
-            .append("dictType", getDictType())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典类型表 sys_dict_type
+ *
+ * @author microservices
+ */
+public class SysDictType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典主键 */
+    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    private Long dictId;
+
+    /** 字典名称 */
+    @Excel(name = "字典名称")
+    private String dictName;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public Long getDictId()
+    {
+        return dictId;
+    }
+
+    public void setDictId(Long dictId)
+    {
+        this.dictId = dictId;
+    }
+
+    @NotBlank(message = "字典名称不能为空")
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+    public String getDictName()
+    {
+        return dictName;
+    }
+
+    public void setDictName(String dictName)
+    {
+        this.dictName = dictName;
+    }
+
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    public String getDictType()
+    {
+        return dictType;
+    }
+
+    public void setDictType(String dictType)
+    {
+        this.dictType = dictType;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictId", getDictId())
+            .append("dictName", getDictName())
+            .append("dictType", getDictType())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFile.java

@@ -0,0 +1,26 @@
+package com.microservices.system.api.domain;
+
+import lombok.Data;
+
+/**
+ * 文件信息
+ *
+ * @author microservices
+ */
+@Data
+public class SysFile
+{
+    /**
+     * 文件标识
+     */
+    private String fileIdentifier;
+    /**
+     * 文件名称
+     */
+    private String name;
+
+    /**
+     * 文件地址
+     */
+    private String url;
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileBytes.java

@@ -0,0 +1,23 @@
+package com.microservices.system.api.domain;
+
+import lombok.Data;
+
+import java.io.InputStream;
+
+/**
+ * 文件流
+ *
+ * @author microservices
+ */
+@Data
+public class SysFileBytes {
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件流
+     */
+    private InputStream fileInputStream;
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileInfo.java

@@ -1,13 +1,17 @@
-package com.ruoyi.system.api.domain;
+package com.microservices.system.api.domain;
 
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.microservices.common.core.utils.file.FileUtils;
+import com.microservices.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.File;
+
 /**
  * 文件管理对象 sys_file_info
  *
- * @author ruoyi
+ * @author microservices
  * @date 2021-12-29
  */
 @Data
@@ -53,6 +57,7 @@ public class SysFileInfo extends BaseEntity {
      * 存储路径
      */
     @ApiModelProperty(value = "存储路径")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String filePath;
 
     /**
@@ -100,4 +105,31 @@ public class SysFileInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "是否部分匹配")
     private Integer isPartialMatch;
+
+    public SysFileInfo() {
+    }
+
+    public SysFileInfo(String fileIdentifier, File file, String filePath) {
+        System.out.println(file.getPath());
+        this.setFileIdentifier(fileIdentifier);
+        this.setFilePath(filePath);
+        this.setFileSizeInfo(FileUtils.calcFileSize(file.length()));
+        this.setFileOriginName(file.getName());
+        this.setDelFlag("N");
+        this.setFileOriginName(file.getName());
+        int separatorIndex = file.getName().lastIndexOf(".");
+        this.setFileSuffix(file.getName().substring(separatorIndex + 1).toLowerCase());
+    }
+
+    public SimpleGitlinkFileInfo toSimpleGitlinkFileInfo(){
+        SimpleGitlinkFileInfo simpleGitlinkFileInfo=new SimpleGitlinkFileInfo();
+        simpleGitlinkFileInfo.setId(this.getFileId());
+        simpleGitlinkFileInfo.setContent_type(this.getFileSuffix());
+        simpleGitlinkFileInfo.setFilesize(this.getFileSizeInfo());
+        simpleGitlinkFileInfo.setCreated_on(this.getCreateTime());
+        simpleGitlinkFileInfo.setUrl(this.getDownloadUrl());
+        simpleGitlinkFileInfo.setTitle(this.getFileOriginName());
+        simpleGitlinkFileInfo.setIdentifier(this.getFileIdentifier());
+        return simpleGitlinkFileInfo;
+    }
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysLogininfor.java

@@ -1,102 +1,103 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 系统访问记录表 sys_logininfor
- * 
- * @author ruoyi
- */
-public class SysLogininfor extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
-
-    /** 用户账号 */
-    @Excel(name = "用户账号")
-    private String userName;
-
-    /** 状态 0成功 1失败 */
-    @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
-    private String status;
-
-    /** 地址 */
-    @Excel(name = "地址")
-    private String ipaddr;
-
-    /** 描述 */
-    @Excel(name = "描述")
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date accessTime;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getAccessTime()
-    {
-        return accessTime;
-    }
-
-    public void setAccessTime(Date accessTime)
-    {
-        this.accessTime = accessTime;
-    }
+package com.microservices.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ *
+ * @author microservices
+ */
+public class SysLogininfor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
+    private Long infoId;
+
+    /** 用户账号 */
+    @Excel(name = "用户账号")
+    private String userName;
+
+    /** 状态 0成功 1失败 */
+    @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
+    private String status;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String ipaddr;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String msg;
+
+    /** 访问时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date accessTime;
+
+    public Long getInfoId()
+    {
+        return infoId;
+    }
+
+    public void setInfoId(Long infoId)
+    {
+        this.infoId = infoId;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getIpaddr()
+    {
+        return ipaddr;
+    }
+
+    public void setIpaddr(String ipaddr)
+    {
+        this.ipaddr = ipaddr;
+    }
+
+    public String getMsg()
+    {
+        return msg;
+    }
+
+    public void setMsg(String msg)
+    {
+        this.msg = msg;
+    }
+
+    public Date getAccessTime()
+    {
+        return accessTime;
+    }
+
+    public void setAccessTime(Date accessTime)
+    {
+        this.accessTime = accessTime;
+    }
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysNotice.java

@@ -1,102 +1,103 @@
-package com.ruoyi.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
-
-/**
- * 通知公告表 sys_notice
- * 
- * @author ruoyi
- */
-public class SysNotice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 公告ID */
-    private Long noticeId;
-
-    /** 公告标题 */
-    private String noticeTitle;
-
-    /** 公告类型（1通知 2公告） */
-    private String noticeType;
-
-    /** 公告内容 */
-    private String noticeContent;
-
-    /** 公告状态（0正常 1关闭） */
-    private String status;
-
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
-
-    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
-    }
-
-    public void setNoticeType(String noticeType)
-    {
-        this.noticeType = noticeType;
-    }
-
-    public String getNoticeType()
-    {
-        return noticeType;
-    }
-
-    public void setNoticeContent(String noticeContent)
-    {
-        this.noticeContent = noticeContent;
-    }
-
-    public String getNoticeContent()
-    {
-        return noticeContent;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.web.domain.BaseEntity;
+import com.microservices.common.core.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 通知公告表 sys_notice
+ *
+ * @author microservices
+ */
+public class SysNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 公告ID */
+    private Long noticeId;
+
+    /** 公告标题 */
+    private String noticeTitle;
+
+    /** 公告类型（1通知 2公告） */
+    private String noticeType;
+
+    /** 公告内容 */
+    private String noticeContent;
+
+    /** 公告状态（0正常 1关闭） */
+    private String status;
+
+    public Long getNoticeId()
+    {
+        return noticeId;
+    }
+
+    public void setNoticeId(Long noticeId)
+    {
+        this.noticeId = noticeId;
+    }
+
+    public void setNoticeTitle(String noticeTitle)
+    {
+        this.noticeTitle = noticeTitle;
+    }
+
+    @Xss(message = "公告标题不能包含脚本字符")
+    @NotBlank(message = "公告标题不能为空")
+    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
+    public String getNoticeTitle()
+    {
+        return noticeTitle;
+    }
+
+    public void setNoticeType(String noticeType)
+    {
+        this.noticeType = noticeType;
+    }
+
+    public String getNoticeType()
+    {
+        return noticeType;
+    }
+
+    public void setNoticeContent(String noticeContent)
+    {
+        this.noticeContent = noticeContent;
+    }
+
+    public String getNoticeContent()
+    {
+        return noticeContent;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("noticeId", getNoticeId())
+            .append("noticeTitle", getNoticeTitle())
+            .append("noticeType", getNoticeType())
+            .append("noticeContent", getNoticeContent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysOperLog.java

@@ -1,255 +1,256 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 操作日志记录表 oper_log
- * 
- * @author ruoyi
- */
-public class SysOperLog extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
-
-    /** 操作模块 */
-    @Excel(name = "操作模块")
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    @Excel(name = "请求方法")
-    private String method;
-
-    /** 请求方式 */
-    @Excel(name = "请求方式")
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Integer operatorType;
-
-    /** 操作人员 */
-    @Excel(name = "操作人员")
-    private String operName;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /** 请求url */
-    @Excel(name = "请求地址")
-    private String operUrl;
-
-    /** 操作地址 */
-    @Excel(name = "操作地址")
-    private String operIp;
-
-    /** 请求参数 */
-    @Excel(name = "请求参数")
-    private String operParam;
-
-    /** 返回参数 */
-    @Excel(name = "返回参数")
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
-    private Integer status;
-
-    /** 错误消息 */
-    @Excel(name = "错误消息")
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    /** 消耗时间 */
-    @Excel(name = "消耗时间", suffix = "毫秒")
-    private Long costTime;
-
-    public Long getOperId()
-    {
-        return operId;
-    }
-
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
-
-    public Long getCostTime()
-    {
-        return costTime;
-    }
-
-    public void setCostTime(Long costTime)
-    {
-        this.costTime = costTime;
-    }
-}
+package com.microservices.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.web.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 操作日志记录表 oper_log
+ *
+ * @author microservices
+ */
+public class SysOperLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 日志主键 */
+    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+    private Long operId;
+
+    /** 操作模块 */
+    @Excel(name = "操作模块")
+    private String title;
+
+    /** 业务类型（0其它 1新增 2修改 3删除） */
+    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+    private Integer businessType;
+
+    /** 业务类型数组 */
+    private Integer[] businessTypes;
+
+    /** 请求方法 */
+    @Excel(name = "请求方法")
+    private String method;
+
+    /** 请求方式 */
+    @Excel(name = "请求方式")
+    private String requestMethod;
+
+    /** 操作类别（0其它 1后台用户 2手机端用户） */
+    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+    private Integer operatorType;
+
+    /** 操作人员 */
+    @Excel(name = "操作人员")
+    private String operName;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    /** 请求url */
+    @Excel(name = "请求地址")
+    private String operUrl;
+
+    /** 操作地址 */
+    @Excel(name = "操作地址")
+    private String operIp;
+
+    /** 请求参数 */
+    @Excel(name = "请求参数")
+    private String operParam;
+
+    /** 返回参数 */
+    @Excel(name = "返回参数")
+    private String jsonResult;
+
+    /** 操作状态（0正常 1异常） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+    private Integer status;
+
+    /** 错误消息 */
+    @Excel(name = "错误消息")
+    private String errorMsg;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date operTime;
+
+    /** 消耗时间 */
+    @Excel(name = "消耗时间", suffix = "毫秒")
+    private Long costTime;
+
+    public Long getOperId()
+    {
+        return operId;
+    }
+
+    public void setOperId(Long operId)
+    {
+        this.operId = operId;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public Integer getBusinessType()
+    {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType)
+    {
+        this.businessType = businessType;
+    }
+
+    public Integer[] getBusinessTypes()
+    {
+        return businessTypes;
+    }
+
+    public void setBusinessTypes(Integer[] businessTypes)
+    {
+        this.businessTypes = businessTypes;
+    }
+
+    public String getMethod()
+    {
+        return method;
+    }
+
+    public void setMethod(String method)
+    {
+        this.method = method;
+    }
+
+    public String getRequestMethod()
+    {
+        return requestMethod;
+    }
+
+    public void setRequestMethod(String requestMethod)
+    {
+        this.requestMethod = requestMethod;
+    }
+
+    public Integer getOperatorType()
+    {
+        return operatorType;
+    }
+
+    public void setOperatorType(Integer operatorType)
+    {
+        this.operatorType = operatorType;
+    }
+
+    public String getOperName()
+    {
+        return operName;
+    }
+
+    public void setOperName(String operName)
+    {
+        this.operName = operName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getOperUrl()
+    {
+        return operUrl;
+    }
+
+    public void setOperUrl(String operUrl)
+    {
+        this.operUrl = operUrl;
+    }
+
+    public String getOperIp()
+    {
+        return operIp;
+    }
+
+    public void setOperIp(String operIp)
+    {
+        this.operIp = operIp;
+    }
+
+    public String getOperParam()
+    {
+        return operParam;
+    }
+
+    public void setOperParam(String operParam)
+    {
+        this.operParam = operParam;
+    }
+
+    public String getJsonResult()
+    {
+        return jsonResult;
+    }
+
+    public void setJsonResult(String jsonResult)
+    {
+        this.jsonResult = jsonResult;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public String getErrorMsg()
+    {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg)
+    {
+        this.errorMsg = errorMsg;
+    }
+
+    public Date getOperTime()
+    {
+        return operTime;
+    }
+
+    public void setOperTime(Date operTime)
+    {
+        this.operTime = operTime;
+    }
+
+    public Long getCostTime()
+    {
+        return costTime;
+    }
+
+    public void setCostTime(Long costTime)
+    {
+        this.costTime = costTime;
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysRole.java

@@ -0,0 +1,123 @@
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.utils.bean.BeanUtils;
+import com.microservices.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author microservices
+ */
+@Data
+public class SysRole extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    private Long roleId;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    /** 角色权限 */
+    @Excel(name = "角色权限")
+    private String roleKey;
+
+    /** 角色排序 */
+    @Excel(name = "角色排序")
+    private Integer roleSort;
+
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+    private String dataScope;
+
+    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    private boolean menuCheckStrictly;
+
+    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    private boolean deptCheckStrictly;
+
+    /** 角色状态（0正常 1停用） */
+    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 用户是否存在此角色标识 默认不存在 */
+    private boolean flag = false;
+
+    /** 菜单组 */
+    private Long[] menuIds;
+
+    /** 部门组（数据权限） */
+    private Long[] deptIds;
+
+    /**
+     * 组织类型
+     */
+    private Integer deptType;
+
+    /**
+     * 是否默认角色
+     */
+    private Boolean isDefault;
+
+    /** 角色菜单权限 */
+    private Set<String> permissions;
+
+    public SysRole() {
+    }
+
+    public SysRole(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.roleId);
+    }
+
+    public static boolean isAdmin(Long roleId)
+    {
+        return roleId != null && 1L == roleId;
+    }
+
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+    public String getRoleName()
+    {
+        return roleName;
+    }
+
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+    public String getRoleKey()
+    {
+        return roleKey;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getRoleSort()
+    {
+        return roleSort;
+    }
+
+    public SimpleSysRole toSimpleSysRole() {
+        SimpleSysRole target = new SimpleSysRole();
+        BeanUtils.copyProperties(this, target);
+        return target;
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUser.java

@@ -1,147 +1,183 @@
-package com.ruoyi.system.api.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
-import com.ruoyi.common.core.utils.html.EscapeUtil;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
-import lombok.Data;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- *
- * @author ruoyi
- */
-
-@Data
-public class SysUser extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
-    /**
-     * GitLink平台用户ID
-     */
-    private Long gitlinkUserId;
-
-    /**
-     * 用户账号
-     */
-    @Excel(name = "登录名称")
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    @Excel(name = "用户名称")
-    private String nickName;
-
-    /** 用户邮箱 */
-    @Excel(name = "用户邮箱")
-    private String email;
-
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    private String phonenumber;
-
-    /** 用户性别 */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String sex;
-
-    /** 用户头像 */
-    private String avatar;
-
-    /** 密码 */
-    private String password;
-
-    /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    private Date loginDate;
-
-    /**
-     * 岗位组
-     */
-    private Long[] postIds;
-
-    /**
-     * 用户身份列表
-     */
-    private List<SysUserDeptRole> userIdentityList;
-
-    public SimpleSysUser toSimpleSysUser(String gitlinkBaseUrl) {
-        SimpleSysUser target = new SimpleSysUser();
-        BeanUtils.copyProperties(this, target);
-        String gitlinkUrl = EscapeUtil.removeExtraSlashOfUrl(gitlinkBaseUrl + "/" + this.userName);
-        target.setGitlinkUrl(gitlinkUrl);
-        return target;
-    }
-
-    public SysUser() {
-
-    }
-
-    public SysUser(Long userId) {
-        this.userId = userId;
-    }
-
-    public boolean isAdmin()
-    {
-        return isAdmin(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
-    }
-
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
-        return nickName;
-    }
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
-        return phonenumber;
-    }
+package com.microservices.system.api.domain;
+
+import com.microservices.common.core.annotation.Excel;
+import com.microservices.common.core.annotation.Excel.ColumnType;
+import com.microservices.common.core.annotation.Excel.Type;
+import com.microservices.common.core.constant.UserConstants;
+import com.microservices.common.core.utils.StringUtils;
+import com.microservices.common.core.utils.bean.BeanUtils;
+import com.microservices.common.core.utils.html.EscapeUtil;
+import com.microservices.common.core.web.domain.BaseEntity;
+import com.microservices.common.core.xss.Xss;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author microservices
+ */
+
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+    /**
+     * GitLink平台用户ID
+     */
+    private Long gitlinkUserId;
+
+    /**
+     * 用户账号
+     */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    @Excel(name = "最后登录IP", type = Type.EXPORT)
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    private Date loginDate;
+
+    /**
+     * 岗位组
+     */
+    private Long[] postIds;
+
+    /**
+     * 用户身份列表
+     */
+    private List<SysUserDeptRole> userIdentityList;
+
+    public SimpleSysUser toSimpleSysUser(String gitlinkBaseUrl) {
+        SimpleSysUser target = new SimpleSysUser();
+        BeanUtils.copyProperties(this, target);
+        if (StringUtils.isNotEmpty(this.userName)) {
+            String gitlinkUrl = EscapeUtil.removeExtraSlashOfUrl(gitlinkBaseUrl + "/" + this.userName);
+            target.setGitlinkUrl(gitlinkUrl);
+        }
+        return target;
+    }
+
+    public SimpleGitlinkUser toSimpleGitlinkUser(){
+        SimpleGitlinkUser simpleGitlinkUser=new SimpleGitlinkUser();
+        simpleGitlinkUser.setId(this.getGitlinkUserId());
+        simpleGitlinkUser.setImage_url(this.getAvatar());
+        simpleGitlinkUser.setLogin(this.getUserName());
+        simpleGitlinkUser.setName(this.getNickName());
+        return simpleGitlinkUser;
+    }
+
+    public SysUser() {
+
+    }
+
+    public SysUser(Long userId) {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getNickName()
+    {
+        return nickName;
+    }
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    /**
+     * 设置已注销账户信息
+     *
+     * @return 已注销用户
+     */
+    public SysUser toDeleteUser() {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(this.userId);
+        sysUser.setGitlinkUserId(this.gitlinkUserId);
+        sysUser.setAvatar(UserConstants.DELETE_USER_AVATAR);
+        sysUser.setNickName(UserConstants.DELETE_USER_NICKNAME);
+        return sysUser;
+    }
+
+    public static SysUser genDeleteUser() {
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(-1L);
+        sysUser.setGitlinkUserId(-1L);
+        sysUser.setAvatar(UserConstants.DELETE_USER_AVATAR);
+        sysUser.setNickName(UserConstants.DELETE_USER_NICKNAME);
+        return sysUser;
+    }
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUserDeptRole.java

@@ -0,0 +1,51 @@
+package com.microservices.system.api.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @author otto
+ */
+@Data
+@ApiModel("用户与部门及部门对应角色的关联对象")
+public class SysUserDeptRole {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    @ApiModelProperty("角色ID")
+    private Long roleId;
+
+    @ApiModelProperty("身份状态")
+    private String state;
+
+    /**
+     * 部门对象
+     */
+    @ApiModelProperty(value = "部门对象", hidden = true)
+    private SysDept sysDept;
+    /**
+     * 用户对象
+     */
+    @ApiModelProperty(value = "用户对象", hidden = true)
+    private SysUser sysUser;
+    /**
+     * 角色对象
+     */
+    @ApiModelProperty(value = "角色对象", hidden = true)
+    private SysRole sysRole;
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteCmsFallbackFactory.java

@@ -1,8 +1,9 @@
-package com.ruoyi.system.api.factory;
+package com.microservices.system.api.factory;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteCmsService;
-import com.ruoyi.system.api.domain.SysDept;
+import com.alibaba.fastjson2.JSONObject;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemoteCmsService;
+import com.microservices.system.api.domain.SysDept;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Component;
 /**
  * 内容管理服务降级处理
  *
- * @author ruoyi
+ * @author microservices
  */
 @Component
 public class RemoteCmsFallbackFactory implements FallbackFactory<RemoteCmsService> {
@@ -21,8 +22,10 @@ public class RemoteCmsFallbackFactory implements FallbackFactory<RemoteCmsServic
     public RemoteCmsService create(Throwable throwable) {
         log.error("Cms服务调用失败:{}", throwable.getMessage());
         return new RemoteCmsService() {
+
+
             @Override
-            public R<Boolean> changeUserRole(Long userId, Long oldDeptId, Long newDeptId, String source) {
+            public R<Boolean> changeUserRole(Long userId, Long oldDeptId, Long newDeptId, Long oldRoleId, Long newRoleId, String source) {
                 return R.fail("修改用户在GitLInk项目中的权限失败:" + throwable.getMessage());
             }
 
@@ -31,6 +34,11 @@ public class RemoteCmsFallbackFactory implements FallbackFactory<RemoteCmsServic
                 return R.fail("通过组织Id获取专区下文章数量失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<Long> getCmsDocVisitsByDeptId(Long deptId, String source) {
+                return R.fail("通过组织Id获取专区下文章阅读数量失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<Long> getNotAuditCmsCountByDeptId(Long deptId, String source) {
                 return R.fail("通过组织Id获取专区下待审核文章数量失败:" + throwable.getMessage());
@@ -70,6 +78,11 @@ public class RemoteCmsFallbackFactory implements FallbackFactory<RemoteCmsServic
             public R<Boolean> removeByDeptId(Long deptId, String source) {
                 return R.fail("删除专区项目失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<JSONObject> selectCmsDocJSONObjectById(Long cmsDocId, String source) {
+                return R.fail("获取文章JSON对象失败:" + throwable.getMessage());
+            }
         };
     }
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteDeptFallbackFactory.java

@@ -1,9 +1,9 @@
-package com.ruoyi.system.api.factory;
+package com.microservices.system.api.factory;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteDeptService;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.domain.SysUserDeptRole;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemoteDeptService;
+import com.microservices.system.api.domain.SysDept;
+import com.microservices.system.api.domain.SysUserDeptRole;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 部门服务降级处理
  *
- * @author ruoyi
+ * @author microservices
  */
 @Component
 public class RemoteDeptFallbackFactory implements FallbackFactory<RemoteDeptService> {
@@ -44,6 +44,26 @@ public class RemoteDeptFallbackFactory implements FallbackFactory<RemoteDeptServ
                 return R.fail("获取自身及子部门Id列表失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<Long> addDeptByPmsEnterprise(String pmsEnterpriseName, String source) {
+                return R.fail("根据企业名称新增部门失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> updateDeptNameByDeptId(Long deptId, String deptName, String source) {
+                return R.fail("根据部门Id更新部门名称失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> deleteDeptByDeptId(Long deptId, String source) {
+                return R.fail("根据部门Id删除部门失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> deleteDeptByPmsEnterprise(String pmsEnterpriseName, String source) {
+                return R.fail("根据企业名称删除部门失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<List<SysUserDeptRole>> getSysUserDeptRoleListByDeptId(Long deptId, String source) {
                 return R.fail("通过组织Id查询组织下用户身份列表失败:" + throwable.getMessage());
@@ -53,6 +73,20 @@ public class RemoteDeptFallbackFactory implements FallbackFactory<RemoteDeptServ
             public R<List<String>> getGitLinkUserNamesByDeptIdAndRoleKeys(Long deptId, String roleKeys, String source) {
                 return R.fail("查询组织编号下拥有传入角色权限字符串的用户名失败:" + throwable.getMessage());
             }
+            @Override
+            public R<Boolean> checkUserInDeptHasRole(Long deptId, Long userId, String roleKey, String source) {
+                return R.fail("查询组织编号下拥有传入角色权限字符串的用户名失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> checkUserInDeptHasPerms(Long currentDeptId, Long userId, String perms, String source) {
+                return R.fail("检查用户是否在指定部门下具有指定菜单权限失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> checkUserInDept(Long currentDeptId, Long userId, String source) {
+                return R.fail("检查用户是否在指定部门下失败:" + throwable.getMessage());
+            }
         };
     }
 }

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteFileFallbackFactory.java

@@ -0,0 +1,85 @@
+package com.microservices.system.api.factory;
+
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.exception.ServiceException;
+import com.microservices.system.api.RemoteFileService;
+import com.microservices.system.api.domain.SysFile;
+import com.microservices.system.api.domain.SysFileInfo;
+import feign.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 文件服务降级处理
+ *
+ * @author microservices
+ */
+@Component
+public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
+
+    @Override
+    public RemoteFileService create(Throwable throwable)
+    {
+        log.error("文件服务调用失败:{}", throwable.getMessage());
+        return new RemoteFileService() {
+
+            @Override
+            public R<SysFile> upload(MultipartFile file, String type, String hierarchy, String source) {
+                return R.fail("上传文件失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<SysFileInfo>> getFileList(String fileIds) {
+                return R.fail("获取文件列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysFileInfo> getFile(Long fileId) {
+                return R.fail("根据文件Id获取文件信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysFileInfo> getFileByFileIdentifier(String fileIdentifier, String source) {
+                return R.fail("根据文件标识获取文件信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<SysFileInfo>> getFileListByIdentifier(String fileIdentifiers) {
+                return R.fail("根据文件标识列表获取文件详情列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> deleteFileByIdentifiers(String fileIdentifiers, String source) {
+                return R.fail("通过文件标识列表批量删除文件失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public Response getFileEntityByIdentifier(String fileIdentifier, String source) {
+                throw new ServiceException("文件获取失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> packagedFile(HashMap<String, String> packagedStructure, String zipFileName, String type, String hierarchy, String source) {
+                return R.fail("打包文件失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> downloadFileByUrl(String fileUrl, String type, String hierarchy, String source) {
+                return R.fail("通过Url下载文件到本地失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<String>> uploadFileToForge(String fileIdentifiers, String source) {
+                return R.fail("上传本地文件到Forge失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteGatewayFallbackFactory.java

@@ -0,0 +1,44 @@
+package com.microservices.system.api.factory;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.microservices.system.api.RemoteGatewayService;
+import feign.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 用户服务降级处理
+ *
+ * @author microservices
+ */
+@Component
+public class RemoteGatewayFallbackFactory implements FallbackFactory<RemoteGatewayService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteGatewayFallbackFactory.class);
+
+    @Override
+    public RemoteGatewayService create(Throwable throwable) {
+        log.error("网关服务调用失败:{}", throwable.getMessage());
+        return new RemoteGatewayService() {
+
+            @Override
+            public Response loginSentinel(String password, String username) {
+                return null;
+            }
+
+            @Override
+            public Response loginNacos(Map<String, ?> formParams) {
+                return null;
+            }
+
+            @Override
+            public Response loginPortainer(JSONObject loginBody) {
+                System.out.println(throwable.getMessage());
+                return null;
+            }
+        };
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,42 +1,50 @@
-package com.ruoyi.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
-
-/**
- * 日志服务降级处理
- * 
- * @author ruoyi
- */
-@Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
-
-    @Override
-    public RemoteLogService create(Throwable throwable)
-    {
-        log.error("日志服务调用失败:{}", throwable.getMessage());
-        return new RemoteLogService()
-        {
-            @Override
-            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
-            {
-                return null;
-            }
-
-            @Override
-            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
-            {
-                return null;
-            }
-        };
-
-    }
-}
+package com.microservices.system.api.factory;
+
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemoteLogService;
+import com.microservices.system.api.domain.SysLogininfor;
+import com.microservices.system.api.domain.SysOperLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 日志服务降级处理
+ *
+ * @author microservices
+ */
+@Component
+public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
+
+    @Override
+    public RemoteLogService create(Throwable throwable)
+    {
+        log.error("日志服务调用失败:{}", throwable.getMessage());
+        return new RemoteLogService()
+        {
+            @Override
+            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
+            {
+                return null;
+            }
+
+            @Override
+            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
+            {
+                return null;
+            }
+
+            @Override
+            public R<List<SysOperLog>> getLatestOperLogList(String title, String operUrl, Integer status, Integer topN, String source)
+            {
+                return R.fail("获取最新操作日志失败:" + throwable.getMessage());
+            }
+        };
+
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteNoticeFallbackFactory.java

@@ -0,0 +1,42 @@
+package com.microservices.system.api.factory;
+
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemoteNoticeService;
+import com.microservices.system.api.domain.SysNotice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteNoticeFallbackFactory implements FallbackFactory<RemoteNoticeService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteNoticeFallbackFactory.class);
+
+    @Override
+    public RemoteNoticeService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteNoticeService()
+        {
+            @Override
+            public R<Long> addNotice(SysNotice sysNotice, String source)
+            {
+                return R.fail("添加公告失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysNotice> getNotice(Long noticeId, String source) {
+                return R.fail("获取公告详情失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> editNotice(SysNotice sysNotice, String source) {
+                return R.fail("编辑公告失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> deleteNotice(Long[] noticeIds, String source) {
+                return R.fail("删除公告失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemotePmsFallbackFactory.java

@@ -0,0 +1,30 @@
+package com.microservices.system.api.factory;
+
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemotePmsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户服务降级处理
+ *
+ * @author microservices
+ */
+@Component
+public class RemotePmsFallbackFactory implements FallbackFactory<RemotePmsService> {
+    private static final Logger log = LoggerFactory.getLogger(RemotePmsFallbackFactory.class);
+
+    @Override
+    public RemotePmsService create(Throwable throwable) {
+        log.error("项目管理服务调用失败:{}", throwable.getMessage());
+        return new RemotePmsService() {
+
+            @Override
+            public R<Boolean> changeUserGitlinkRole(Long userId, Long deptId, Long oldRoleId, Long newRoleId, String source, String userKey) {
+                return R.fail("切换用户在Gitlink组织团队失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,110 +1,127 @@
-package com.ruoyi.system.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.domain.SysUserDeptRole;
-import com.ruoyi.system.api.model.LoginUser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 用户服务降级处理
- * 
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService()
-        {
-            @Override
-            public R<LoginUser> getUserInfo(String username, String source)
-            {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysUser> getSysUserByUserName(String username, String source) {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysUser> getSysUserByUserId(Long userId, String source) {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> addUserIdentify(Long deptId, Long userId, String roleKey, String source) {
-                return R.fail("组织下新增用户身份失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> deleteUserIdentify(Long deptId, Long userId, String roleKey, String source) {
-
-                return R.fail("组织下删除用户身份失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> registerUserInfo(SysUser sysUser, String source) {
-                return R.fail("注册用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<String> getSysUserTokenByGitLinkCookie(String cookie, String source) {
-                return R.fail("获取用户Token失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<List<SysUserDeptRole>> getSysUserDeptRoleListByUserName(String userName, String source) {
-                return R.fail("查询用户下组织及组织对应角色列表失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysUserDeptRole> getFirstUserIdentity(String userName, String source) {
-                return R.fail("查询用户下第一个身份:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> checkGitLinkUserLogin(String token, String source) {
-                return R.fail("查询GitLink用户登录状态失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<String> getTokenByGitLinkUserId(Long gitLinkUserId, String source) {
-                return R.fail("获取GitLink用户Token失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<String> getUserNameByGitLinkToken(String gitLinkToken, String source) {
-                return R.fail("通过GitLink用户Token获取系统用户名失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysUser> getSysUserByGitLinkUserId(Long gitLinkUserId, String source) {
-                return R.fail("通过GitLink用户Id获取系统用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysUser> createUserByGitLinkUserId(Long gitLinkUserId, String source) {
-                return R.fail("通过GitLink用户Id创建用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Set<String>> selectMenuPermissionByRoleKey(String roleKey, String source) {
-                return R.fail("根据角色Key获取菜单权限集合失败:" + throwable.getMessage());
-            }
-        };
-    }
-}
+package com.microservices.system.api.factory;
+
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.web.page.GenericsTableDataInfo;
+import com.microservices.system.api.RemoteUserService;
+import com.microservices.system.api.domain.SysRole;
+import com.microservices.system.api.domain.SysUser;
+import com.microservices.system.api.domain.SysUserDeptRole;
+import com.microservices.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 用户服务降级处理
+ *
+ * @author microservices
+ */
+@Component
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+
+    @Override
+    public RemoteUserService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteUserService()
+        {
+            @Override
+            public R<LoginUser> getUserInfo(String username, String source)
+            {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysRole> getRoleInfoByInner(Long roleId, String source) {
+                return R.fail("获取角色失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUser> getSysUserByUserName(String username, String source) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUser> getSysUserByUserId(Long userId, String source) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> addUserIdentify(Long deptId, Long userId, String roleKey, String source) {
+                return R.fail("组织下新增用户身份失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> deleteUserIdentify(Long deptId, Long userId, String roleKey, String source) {
+
+                return R.fail("组织下删除用户身份失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> registerUserInfo(SysUser sysUser, String source) {
+                return R.fail("注册用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> getSysUserTokenByGitLinkCookie(String cookie, String source) {
+                return R.fail("获取用户Token失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<List<SysUserDeptRole>> getSysUserDeptRoleListByUserName(String userName, String source) {
+                return R.fail("查询用户下组织及组织对应角色列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUserDeptRole> getFirstUserIdentity(String userName, String source) {
+                return R.fail("查询用户下第一个身份失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<GenericsTableDataInfo<SysUserDeptRole>> searchUserIdentifierListByDept(Long deptId, String search, Integer pageNum, Integer pageSize, String source) {
+                return R.fail("模糊查询组织下身份列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> checkGitLinkUserLogin(String token, String source) {
+                return R.fail("查询GitLink用户登录状态失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> getTokenByGitLinkUserId(Long gitLinkUserId, String source) {
+                return R.fail("获取GitLink用户Token失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> getUserNameByGitLinkToken(String gitLinkToken, String source) {
+                return R.fail("通过GitLink用户Token获取系统用户名失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUser> getSysUserByGitLinkUserId(Long gitLinkUserId, String source) {
+                return R.fail("通过GitLink用户Id获取系统用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUser> createUserByGitLinkUserId(Long gitLinkUserId, String source) {
+                return R.fail("通过GitLink用户Id创建用户失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Set<String>> selectMenuPermissionByRoleKey(String roleKey, String source) {
+                return R.fail("根据角色Key获取菜单权限集合失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<SysUserDeptRole> getAllStatusUserIdentityByDeptIdAndUserId(Long deptId, Long userId, String source) {
+                return R.fail("根据部门Id和用户Id获取所有状态的用户身份失败:" + throwable.getMessage());
+            }
+        };
+    }
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/factory/RemoteZoneFallbackFactory.java

@@ -1,8 +1,8 @@
-package com.ruoyi.system.api.factory;
+package com.microservices.system.api.factory;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteZoneService;
-import com.ruoyi.system.api.domain.SysDept;
+import com.microservices.common.core.domain.R;
+import com.microservices.system.api.RemoteZoneService;
+import com.microservices.system.api.domain.SysDept;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 特色专区服务降级处理
  *
- * @author ruoyi
+ * @author microservices
  */
 @Component
 public class RemoteZoneFallbackFactory implements FallbackFactory<RemoteZoneService> {

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/model/LoginUser.java

@@ -1,55 +1,55 @@
-package com.ruoyi.system.api.model;
-
-import com.ruoyi.system.api.domain.SysUser;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 用户信息
- *
- * @author ruoyi
- */
-@Data
-public class LoginUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户唯一标识
-     */
-    private String token;
-    /**
-     * 用户访问Cookie
-     */
-    private String cookie;
-
-    /**
-     * 用户名id
-     */
-    private Long userId;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
-
-    /**
-     * 用户信息
-     */
-    private SysUser sysUser;
-}
+package com.microservices.system.api.model;
+
+import com.microservices.system.api.domain.SysUser;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户信息
+ *
+ * @author microservices
+ */
+@Data
+public class LoginUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户唯一标识
+     */
+    private String token;
+    /**
+     * 用户访问Cookie
+     */
+    private String cookie;
+
+    /**
+     * 用户名id
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 用户信息
+     */
+    private SysUser sysUser;
+}

microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/utils/FeignUtils.java

@@ -1,8 +1,8 @@
-package com.ruoyi.system.api.utils;
+package com.microservices.system.api.utils;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.exception.ServiceException;
+import com.microservices.common.core.utils.StringUtils;
 
 /**
  * @author otto

microservices-api/microservices-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,8 @@
+com.microservices.system.api.factory.RemoteUserFallbackFactory
+com.microservices.system.api.factory.RemoteDeptFallbackFactory
+com.microservices.system.api.factory.RemoteLogFallbackFactory
+com.microservices.system.api.factory.RemoteFileFallbackFactory
+com.microservices.system.api.factory.RemoteCmsFallbackFactory
+com.microservices.system.api.factory.RemoteZoneFallbackFactory
+com.microservices.system.api.factory.RemotePmsFallbackFactory
+com.microservices.system.api.factory.RemoteGatewayFallbackFactory

microservices-api/pom.xml

@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>ruoyi-monitor</module>
-    </modules>
-
-    <artifactId>ruoyi-visual</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        ruoyi-visual图形化管理模块
-    </description>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.microservices</groupId>
+        <artifactId>microservices</artifactId>
+        <version>3.6.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+        <module>microservices-api-system</module>
+    </modules>
+
+    <artifactId>microservices-api</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        microservices-api系统接口
+    </description>
+
+</project>

microservices-auth/pom.xml

@@ -1,74 +1,74 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
-        <version>3.6.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>ruoyi-auth</artifactId>
-	
-    <description>
-        ruoyi-auth认证授权中心
-    </description>
-    
-    <dependencies>
-        
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-		
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-		
-        <!-- RuoYi Common Security-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-        
-    </dependencies>
-	
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-   
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.microservices</groupId>
+        <artifactId>microservices</artifactId>
+        <version>3.6.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <artifactId>microservices-auth</artifactId>
+	
+    <description>
+        microservices-auth认证授权中心
+    </description>
+    
+    <dependencies>
+        
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+		
+        <!-- SpringBoot Web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Microservices Common Security-->
+        <dependency>
+            <groupId>com.microservices</groupId>
+            <artifactId>microservices-common-security</artifactId>
+        </dependency>
+        
+    </dependencies>
+	
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+   
+</project>

microservices-auth/src/main/java/com/microservices/auth/MicroservicesAuthApplication.java

@@ -0,0 +1,20 @@
+package com.microservices.auth;
+
+import com.microservices.common.security.annotation.EnableRyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 认证授权中心
+ *
+ * @author microservices
+ */
+@EnableRyFeignClients
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class MicroservicesAuthApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MicroservicesAuthApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n");
+    }
+}

microservices-auth/src/main/java/com/microservices/auth/controller/TokenController.java

@@ -1,78 +1,79 @@
-package com.ruoyi.auth.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * token 控制
- * 
- * @author ruoyi
- */
-@RestController
-public class TokenController
-{
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private SysLoginService sysLoginService;
-
-    @PostMapping("login")
-    public R<?> login(@RequestBody LoginBody form)
-    {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        // 获取登录token
-        return R.ok(tokenService.createToken(userInfo));
-    }
-
-    @DeleteMapping("logout")
-    public R<?> logout(HttpServletRequest request)
-    {
-        String token = SecurityUtils.getToken(request);
-        if (StringUtils.isNotEmpty(token))
-        {
-            String username = JwtUtils.getUserName(token);
-            // 删除用户缓存记录
-            AuthUtil.logoutByToken(token);
-            // 记录用户退出日志
-            sysLoginService.logout(username);
-        }
-        return R.ok();
-    }
-
-    @PostMapping("refresh")
-    public R<?> refresh(HttpServletRequest request)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
-        {
-            // 刷新令牌有效期
-            tokenService.refreshToken(loginUser);
-            return R.ok();
-        }
-        return R.ok();
-    }
-
-    @PostMapping("register")
-    public R<?> register(@RequestBody RegisterBody registerBody)
-    {
-        // 用户注册
-        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
-        return R.ok();
-    }
-}
+package com.microservices.auth.controller;
+
+import com.microservices.auth.form.LoginBody;
+import com.microservices.auth.form.RegisterBody;
+import com.microservices.auth.service.SysLoginService;
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.utils.JwtUtils;
+import com.microservices.common.core.utils.StringUtils;
+import com.microservices.common.security.auth.AuthUtil;
+import com.microservices.common.security.service.TokenService;
+import com.microservices.common.security.utils.SecurityUtils;
+import com.microservices.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * token 控制
+ *
+ * @author microservices
+ */
+@RestController
+public class TokenController
+{
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private SysLoginService sysLoginService;
+
+    @PostMapping("login")
+    public R<?> login(@RequestBody LoginBody form)
+    {
+        // 用户登录
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        // 获取登录token
+        return R.ok(tokenService.createToken(userInfo));
+    }
+
+    @DeleteMapping("logout")
+    public R<?> logout(HttpServletRequest request)
+    {
+        String token = SecurityUtils.getToken(request);
+        if (StringUtils.isNotEmpty(token))
+        {
+            String username = JwtUtils.getUserName(token);
+            // 删除用户缓存记录
+            AuthUtil.logoutByToken(token);
+            // 记录用户退出日志
+            sysLoginService.logout(username);
+        }
+        return R.ok();
+    }
+
+    @PostMapping("refresh")
+    public R<?> refresh(HttpServletRequest request)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser))
+        {
+            // 刷新令牌有效期
+            tokenService.refreshToken(loginUser);
+            return R.ok();
+        }
+        return R.ok();
+    }
+
+    @PostMapping("register")
+    public R<?> register(@RequestBody RegisterBody registerBody)
+    {
+        // 用户注册
+        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
+        return R.ok();
+    }
+}

microservices-auth/src/main/java/com/microservices/auth/form/LoginBody.java

@@ -1,9 +1,9 @@
-package com.ruoyi.auth.form;
+package com.microservices.auth.form;
 
 /**
  * 用户登录对象
- * 
- * @author ruoyi
+ *
+ * @author microservices
  */
 public class LoginBody
 {

microservices-auth/src/main/java/com/microservices/auth/form/RegisterBody.java

@@ -1,11 +1,11 @@
-package com.ruoyi.auth.form;
-
-/**
- * 用户注册对象
- * 
- * @author ruoyi
- */
-public class RegisterBody extends LoginBody
-{
-
-}
+package com.microservices.auth.form;
+
+/**
+ * 用户注册对象
+ *
+ * @author microservices
+ */
+public class RegisterBody extends LoginBody
+{
+
+}

microservices-auth/src/main/java/com/microservices/auth/service/SysLoginService.java

@@ -1,27 +1,27 @@
-package com.ruoyi.auth.service;
+package com.microservices.auth.service;
 
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.microservices.common.core.constant.CacheConstants;
+import com.microservices.common.core.constant.Constants;
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.constant.UserConstants;
+import com.microservices.common.core.domain.R;
+import com.microservices.common.core.enums.UserStatus;
+import com.microservices.common.core.exception.ServiceException;
+import com.microservices.common.core.text.Convert;
+import com.microservices.common.core.utils.StringUtils;
+import com.microservices.common.core.utils.ip.IpUtils;
+import com.microservices.common.redis.service.RedisService;
+import com.microservices.common.security.utils.SecurityUtils;
+import com.microservices.system.api.RemoteUserService;
+import com.microservices.system.api.domain.SysUser;
+import com.microservices.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
  * 登录校验方法
- * 
- * @author ruoyi
+ *
+ * @author microservices
  */
 @Component
 public class SysLoginService

microservices-auth/src/main/java/com/microservices/auth/service/SysPasswordService.java

@@ -1,19 +1,20 @@
-package com.ruoyi.auth.service;
+package com.microservices.auth.service;
 
-import java.util.concurrent.TimeUnit;
+import com.microservices.common.core.constant.CacheConstants;
+import com.microservices.common.core.constant.Constants;
+import com.microservices.common.core.exception.ServiceException;
+import com.microservices.common.redis.service.RedisService;
+import com.microservices.common.security.utils.SecurityUtils;
+import com.microservices.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysUser;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * 登录密码方法
- * 
- * @author ruoyi
+ *
+ * @author microservices
  */
 @Component
 public class SysPasswordService

microservices-auth/src/main/java/com/microservices/auth/service/SysRecordLogService.java

@@ -1,18 +1,18 @@
-package com.ruoyi.auth.service;
+package com.microservices.auth.service;
 
+import com.microservices.common.core.constant.Constants;
+import com.microservices.common.core.constant.SecurityConstants;
+import com.microservices.common.core.utils.StringUtils;
+import com.microservices.common.core.utils.ip.IpUtils;
+import com.microservices.system.api.RemoteLogService;
+import com.microservices.system.api.domain.SysLogininfor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
 
 /**
  * 记录日志方法
- * 
- * @author ruoyi
+ *
+ * @author microservices
  */
 @Component
 public class SysRecordLogService

microservices-auth/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-                            _                        _    _     
-                           (_)                      | |  | |    
- _ __  _   _   ___   _   _  _  ______   __ _  _   _ | |_ | |__  
-| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ 
-| |   | |_| || (_) || |_| || |        | (_| || |_| || |_ | | | |
-|_|    \__,_| \___/  \__, ||_|         \__,_| \__,_| \__||_| |_|
-                      __/ |                                     
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+                            _                        _    _     
+                           (_)                      | |  | |    
+ _ __  _   _   ___   _   _  _  ______   __ _  _   _ | |_ | |__  
+| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ 
+| |   | |_| || (_) || |_| || |        | (_| || |_| || |_ | | | |
+|_|    \__,_| \___/  \__, ||_|         \__,_| \__,_| \__||_| |_|
+                      __/ |                                     
                      |___/                                      

microservices-auth/src/main/resources/bootstrap-prod.yml

@@ -6,13 +6,16 @@ server:
 spring:
   application:
     # 应用名称
-    name: ruoyi-auth
+    name: microservices-auth
     config:
       activate:
         # 环境配置
         on-profile:
           prod
   cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
     nacos:
       discovery:
         # 服务注册地址

microservices-auth/src/main/resources/bootstrap.yml

@@ -1,29 +1,32 @@
-# Tomcat
-server: 
-  port: 9110
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: ruoyi-auth
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        username: nacos
-        password: nacos
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        username: nacos
-        password: nacos
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+# Tomcat
+server: 
+  port: 9110
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: microservices-auth
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        username: nacos
+        password: nacos
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        username: nacos
+        password: nacos
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

microservices-auth/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ruoyi-auth" />
+    <property name="log.path" value="logs/microservices-auth"/>
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
+    <logger name="com.microservices" level="info"/>
     <!-- Spring日志级别控制  -->
     <logger name="org.springframework" level="warn"/>
 

microservices-common/microservices-common-async/pom.xml

@@ -3,15 +3,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
+        <groupId>com.microservices</groupId>
+        <artifactId>microservices-common</artifactId>
         <version>3.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common-async</artifactId>
+    <artifactId>microservices-common-async</artifactId>
 
     <description>
-        ruoyi-common-async异步
+        microservices-common-async异步
     </description>
 </project>

microservices-common/microservices-common-async/src/main/java/com/microservices/common/async/config/AsyncConfiguration.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.async.config;
+package com.microservices.common.async.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

microservices-common/microservices-common-async/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.microservices.common.async.config.AsyncConfiguration